temp changes for ritika's testing

Signed-off-by: Kirtana Ashok <[email protected]>
kiashok · Aug 20, 2024 · a92fed7 · a92fed7
1 parent 65d0aa7
commit a92fed7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git 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
@@ -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)
  }