feat: use the official Pause image TAG instead of specifying the LTCS Windows version tag (#7675)

Author: djsly

staging/cse/windows/containerd2template.toml

@@ -29,7 +29,7 @@ state = 'C:\ProgramData\containerd\state'
     snapshotter = 'windows'
 
     [plugins.'io.containerd.cri.v1.images'.pinned_images]
-      sandbox = '{{pauseImage}}-windows-{{currentversion}}-amd64'
+      sandbox = '{{pauseImage}}'
 
     [plugins.'io.containerd.cri.v1.images'.registry]
       [plugins.'io.containerd.cri.v1.images'.registry.mirrors]
@@ -51,7 +51,7 @@ state = 'C:\ProgramData\containerd\state'
           [plugins.'io.containerd.cri.v1.runtime'.containerd.runtimes.default_runtime.options]
             Debug = false
             DebugType = 0
-            SandboxImage = '{{pauseImage}}-windows-{{currentversion}}-amd64'
+            SandboxImage = '{{pauseImage}}'
             SandboxPlatform = 'windows/amd64'
             SandboxIsolation = {{sandboxIsolation}}
 
@@ -62,7 +62,7 @@ state = 'C:\ProgramData\containerd\state'
           [plugins.'io.containerd.cri.v1.runtime'.containerd.runtimes.runhcs-wcow-process.options]
             Debug = true
             DebugType = 2
-            SandboxImage = '{{pauseImage}}-windows-{{currentversion}}-amd64'
+            SandboxImage = '{{pauseImage}}'
             SandboxPlatform = 'windows/amd64'
 {{hypervisors}}
     [plugins.'io.containerd.cri.v1.runtime'.cni]
@@ -84,4 +84,4 @@ state = 'C:\ProgramData\containerd\state'
     enable_tls_streaming = false
 
   [plugins.'io.containerd.service.v1.diff-service']
-    default = ['windows']
+    default = ['windows']

staging/cse/windows/containerdfunc.ps1

@@ -104,7 +104,7 @@ function CreateHypervisorRuntimes {
     [Parameter(Mandatory = $true)][string]
     $image
   )
-  
+
   Write-Log "Adding hyperv runtimes $builds"
   $hypervRuntimes = ""
   ForEach ($buildNumber in $builds) {
@@ -130,7 +130,7 @@ function ProcessAndWriteContainerdConfig {
     [Parameter(Mandatory = $true)][string]
     $CNIConfDir
   )
-  
+
   $sandboxIsolation = 0
   if ($global:DefaultContainerdWindowsSandboxIsolation -eq "hyperv") {
     Write-Log "default runtime for containerd set to hyperv"
@@ -139,7 +139,7 @@ function ProcessAndWriteContainerdConfig {
 
   $clusterConfig = ConvertFrom-Json ((Get-Content $global:KubeClusterConfigPath -ErrorAction Stop) | Out-String)
   $pauseImage = $clusterConfig.Cri.Images.Pause
-  
+
   $hypervHandlers = $global:ContainerdWindowsRuntimeHandlers.split(",", [System.StringSplitOptions]::RemoveEmptyEntries)
   $hypervRuntimes = ""
 
@@ -150,15 +150,15 @@ function ProcessAndWriteContainerdConfig {
 
   $templatePath = [Io.Path]::Combine( $global:WindowsDataDir, $templateFilePath)
 
-  $template = Get-Content -Path $templatePath 
+  $template = Get-Content -Path $templatePath
   if ($SandboxIsolation -eq 0 -And $hypervHandlers.Count -eq 0) {
     # Remove the hypervisors placeholder when not needed
     $template = $template | Select-String -Pattern 'hypervisors' -NotMatch
   }
   else {
     $hypervRuntimes = CreateHypervisorRuntimes -builds $hypervHandlers -image $pauseImage
   }
-  
+
   if (([version]$ContainerdVersion).CompareTo([version]"1.7.9") -lt 0) {
     # Remove annotations placeholders for older containerd versions
     $template = $template | Select-String -Pattern 'containerAnnotations' -NotMatch
@@ -171,18 +171,16 @@ function ProcessAndWriteContainerdConfig {
   $formatedconf = $(($CNIConfDir).Replace("\", "/"))
   $containerAnnotations = 'container_annotations = ["io.microsoft.container.processdumplocation", "io.microsoft.wcow.processdumptype", "io.microsoft.wcow.processdumpcount"]'
   $podAnnotations = 'pod_annotations = ["io.microsoft.container.processdumplocation","io.microsoft.wcow.processdumptype", "io.microsoft.wcow.processdumpcount"]'
-  $pauseWindowsVersion = Get-WindowsPauseVersion
 
   # Replace all placeholders
   $processedTemplate = $template.Replace('{{sandboxIsolation}}', $sandboxIsolation).
     Replace('{{pauseImage}}', $pauseImage).
     Replace('{{hypervisors}}', $hypervRuntimes).
     Replace('{{cnibin}}', $formatedBin).
     Replace('{{cniconf}}', $formatedConf).
-    Replace('{{currentversion}}', $pauseWindowsVersion).
     Replace('{{containerAnnotations}}', $containerAnnotations).
     Replace('{{podAnnotations}}', $podAnnotations)
-  
+
   # Write the processed template to the config file
   $configFile = [Io.Path]::Combine($global:ContainerdInstallLocation, "config.toml")
   Write-Log "using template $templatePath to write containerd config to $configFile"
@@ -223,7 +221,7 @@ function Install-Containerd {
   }
 
   # Extract the package
-  # upstream containerd package is a tar 
+  # upstream containerd package is a tar
   $tarfile = [Io.path]::Combine($ENV:TEMP, "containerd.tar.gz")
   DownloadFileOverHttp -Url $ContainerdUrl -DestinationPath $tarfile -ExitCode $global:WINDOWS_CSE_ERROR_DOWNLOAD_CONTAINERD_PACKAGE
   Create-Directory -FullPath $global:ContainerdInstallLocation -DirectoryUsage "storing containerd"
@@ -260,4 +258,4 @@ function Install-Containerd {
 
   RegisterContainerDService -KubeDir $KubeDir
   Enable-Logging
-}
+}

staging/cse/windows/containerdtemplate.toml

@@ -25,7 +25,7 @@ state = "C:\\ProgramData\\containerd\\state"
     stream_server_address = "127.0.0.1"
     stream_server_port = "0"
     enable_selinux = false
-    sandbox_image = "{{pauseImage}}-windows-{{currentversion}}-amd64"
+    sandbox_image = "{{pauseImage}}"
     stats_collect_period = 10
     systemd_cgroup = false
     enable_tls_streaming = false
@@ -42,7 +42,7 @@ state = "C:\\ProgramData\\containerd\\state"
         [plugins.cri.containerd.default_runtime.options]
           Debug = false
           DebugType = 0
-          SandboxImage = "{{pauseImage}}-windows-{{currentversion}}-amd64"
+          SandboxImage = "{{pauseImage}}"
           SandboxPlatform = "windows/amd64"
           SandboxIsolation = {{sandboxIsolation}}
       [plugins.cri.containerd.runtimes]
@@ -53,7 +53,7 @@ state = "C:\\ProgramData\\containerd\\state"
           [plugins.cri.containerd.runtimes.runhcs-wcow-process.options]
             Debug = true
             DebugType = 2
-            SandboxImage = "{{pauseImage}}-windows-{{currentversion}}-amd64"
+            SandboxImage = "{{pauseImage}}"
             SandboxPlatform = "windows/amd64"
 {{hypervisors}}
     [plugins.cri.cni]
@@ -70,4 +70,4 @@ state = "C:\\ProgramData\\containerd\\state"
     deletion_threshold = 0
     mutation_threshold = 100
     schedule_delay = "0s"
-    startup_delay = "100ms"
+    startup_delay = "100ms"