From a92fed7d5a3af85b60c97e663e91a98cecb6f5a0 Mon Sep 17 00:00:00 2001 From: Kirtana Ashok Date: Tue, 20 Aug 2024 12:29:55 -0700 Subject: [PATCH] temp changes for ritika's testing Signed-off-by: Kirtana Ashok --- cmd/containerd-shim-runhcs-v1/pod.go | 6 +----- hcn/hcnnamespace.go | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/cmd/containerd-shim-runhcs-v1/pod.go b/cmd/containerd-shim-runhcs-v1/pod.go index 97dc25edb0..5939c49bca 100644 --- a/cmd/containerd-shim-runhcs-v1/pod.go +++ b/cmd/containerd-shim-runhcs-v1/pod.go @@ -10,11 +10,7 @@ import ( "strings" "sync" -<<<<<<< HEAD -======= "github.com/Microsoft/hcsshim" - "github.com/Microsoft/hcsshim/internal/layers" ->>>>>>> a527acc55 (Remove pause container creation for process isolated containers) "github.com/Microsoft/hcsshim/internal/log" "github.com/Microsoft/hcsshim/internal/oci" "github.com/Microsoft/hcsshim/internal/uvm" @@ -80,7 +76,7 @@ func isPauseContainerRequired() bool { isPauseContainerNeeded := true hnsGlobals, err := hcsshim.GetHNSGlobals() if err == nil { - if hnsGlobals.Version.Major > 15 || + if (hnsGlobals.Version.Major == 13 && hnsGlobals.Version.Minor == 3) || hnsGlobals.Version.Major > 15 || (hnsGlobals.Version.Major == 15 && hnsGlobals.Version.Minor >= 2) { isPauseContainerNeeded = false } diff --git a/hcn/hcnnamespace.go b/hcn/hcnnamespace.go index 6ff0aaf7b5..7bb3e2e061 100644 --- a/hcn/hcnnamespace.go +++ b/hcn/hcnnamespace.go @@ -317,7 +317,7 @@ func NewNamespace(nsType NamespaceType) *HostComputeNamespace { isReadyOnCreate := false hnsGlobals, err := hcsshim.GetHNSGlobals() if err == nil { - isReadyOnCreate = (hnsGlobals.Version.Major > 15) || + isReadyOnCreate = (hnsGlobals.Version.Major == 13 && hnsGlobals.Version.Minor == 3) || (hnsGlobals.Version.Major > 15) || (hnsGlobals.Version.Major == 15 && hnsGlobals.Version.Minor >= 2) }