windows change, update runc

Azure · Jul 6, 2021 · 129a134 · 129a134
1 parent 3f7c528
commit 129a134
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/parts/k8s/cloud-init/artifacts/cse_install.sh b/parts/k8s/cloud-init/artifacts/cse_install.sh
@@ -93,8 +93,8 @@ mobyPkgVersion() {
 installRunc() {
   local v
   v=$(runc --version | head -n 1 | cut -d" " -f3)
-  if [[ $v != "1.0.0-rc92" ]]; then
-    apt_get_install 20 30 120 moby-runc=1.0.0~rc92* --allow-downgrades || exit 27
+  if [[ $v != "1.0.0" ]]; then
+    apt_get_install 20 30 120 moby-runc=1.0.0* --allow-downgrades || exit 27
   fi
 }
 installMoby() {

diff --git a/pkg/api/const.go b/pkg/api/const.go
@@ -31,7 +31,7 @@ const (
 
 const (
 	// KubernetesWindowsDockerVersion is the default version for docker on Windows nodes in kubernetes
-	KubernetesWindowsDockerVersion = "20.10.7"
+	KubernetesWindowsDockerVersion = "20.10.6"
 	// KubernetesDefaultWindowsSku is the default SKU for Windows VMs in kubernetes
 	KubernetesDefaultWindowsSku = "Datacenter-Core-1809-with-Containers-smalldisk"
 	// KubernetesDefaultWindowsRuntimeHandler is the default containerd handler for windows pods

diff --git a/pkg/engine/templates_generated.go b/pkg/engine/templates_generated.go
diff --git a/vhd/packer/configure-windows-vhd.ps1 b/vhd/packer/configure-windows-vhd.ps1
@@ -174,7 +174,7 @@ function Install-ContainerD {
 }
 
 function Install-Docker {
-    $defaultDockerVersion = "20.10.7"
+    $defaultDockerVersion = "20.10.6"
 
     Write-Log "Attempting to install Docker version $defaultDockerVersion"
     Install-PackageProvider -Name DockerMsftProvider -Force -ForceBootstrap | Out-Null