fix: specify correct pause image in containerd config for Windows 20h2

Azure · Mar 24, 2021 · 972acb7 · 972acb7
1 parent 41a716a
commit 972acb7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/parts/k8s/windowscontainerdfunc.ps1 b/parts/k8s/windowscontainerdfunc.ps1
@@ -80,6 +80,7 @@ function Select-Windows-Version {
     "18362" { return "1903" }
     "18363" { return "1909" }
     "19041" { return "2004" }
+    "19042" { return "20H2" }
     Default { return "" } 
   }
 }
@@ -143,7 +144,12 @@ function Install-Containerd {
   $formatedbin = $(($CNIBinDir).Replace("\", "/"))
   $formatedconf = $(($CNIConfDir).Replace("\", "/"))
   $sandboxIsolation = 0
-  $windowsVersion = (Get-ItemProperty "HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion").ReleaseId
+  $windowsReleaseId = (Get-ItemProperty "HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion").ReleaseId
+  switch ($windowsReleaseId)
+  {
+    "2009" { $windowsVersion = "20H2"}
+    default  { $windowsVersion = $windowsReleaseId}
+  }
   $hypervRuntimes = ""
   $hypervHandlers = $global:HypervRuntimeHandlers.split(",", [System.StringSplitOptions]::RemoveEmptyEntries)
 

diff --git a/pkg/engine/templates_generated.go b/pkg/engine/templates_generated.go