chore: update containerd to 1.5.11 (#4891)

parts/k8s/cloud-init/artifacts/cse_install.sh

@@ -107,8 +107,8 @@ mobyPkgVersion() {
 installRunc() {
   local v
   v=$(runc --version | head -n 1 | cut -d" " -f3)
-  if [[ $v != "1.0.2" ]]; then
-    apt_get_install 20 30 120 moby-runc=1.0.2* --allow-downgrades || exit 27
+  if [[ $v != "1.0.3" ]]; then
+    apt_get_install 20 30 120 moby-runc=1.0.3* --allow-downgrades || exit 27
   fi
 }
 installMoby() {

parts/k8s/kubernetesparams.t

@@ -238,7 +238,7 @@
       "type": "string"
     },
     "containerdVersion": {
-      "defaultValue": "1.4.11",
+      "defaultValue": "1.5.11",
       "metadata": {
         "description": "The Azure containerd build version"
       },
@@ -256,7 +256,8 @@
          "1.4.7",
          "1.4.8",
          "1.4.9",
-         "1.4.11"
+         "1.4.11",
+         "1.5.11"
        ],
       "type": "string"
     },

pkg/api/const.go

@@ -448,7 +448,7 @@ const (
 	// DefaultMobyVersion specifies the default Azure build version of Moby to install.
 	DefaultMobyVersion = "20.10.11"
 	// DefaultContainerdVersion specifies the default containerd version to install.
-	DefaultContainerdVersion = "1.4.11"
+	DefaultContainerdVersion = "1.5.11"
 	// DefaultDockerBridgeSubnet specifies the default subnet for the docker bridge network for masters and agents.
 	DefaultDockerBridgeSubnet = "172.17.0.1/16"
 	// DefaultKubernetesMaxPodsKubenet is the maximum number of pods to run on a node for Kubenet.

pkg/api/defaults_test.go

@@ -6116,9 +6116,9 @@ func ExampleContainerService_setOrchestratorDefaults() {
 
 	// Output:
 	// level=warning msg="Moby will be upgraded to version 20.10.11\n"
-	// level=warning msg="containerd will be upgraded to version 1.4.11\n"
+	// level=warning msg="containerd will be upgraded to version 1.5.11\n"
 	// level=warning msg="Any new nodes will have Moby version 20.10.11\n"
-	// level=warning msg="Any new nodes will have containerd version 1.4.11\n"
+	// level=warning msg="Any new nodes will have containerd version 1.5.11\n"
 }
 
 func TestCombineValues(t *testing.T) {

pkg/api/vlabs/validate.go

@@ -38,7 +38,7 @@ var (
 		"3.1.0", "3.1.1", "3.1.2", "3.1.2", "3.1.3", "3.1.4", "3.1.5", "3.1.6", "3.1.7", "3.1.8", "3.1.9", "3.1.10",
 		"3.2.0", "3.2.1", "3.2.2", "3.2.3", "3.2.4", "3.2.5", "3.2.6", "3.2.7", "3.2.8", "3.2.9", "3.2.11", "3.2.12",
 		"3.2.13", "3.2.14", "3.2.15", "3.2.16", "3.2.23", "3.2.24", "3.2.25", "3.2.26", "3.3.0", "3.3.1", "3.3.8", "3.3.9", "3.3.10", "3.3.13", "3.3.15", "3.3.18", "3.3.19", "3.3.22", "3.3.25"}
-	containerdValidVersions              = [...]string{"1.3.2", "1.3.3", "1.3.4", "1.3.5", "1.3.6", "1.3.7", "1.3.8", "1.3.9", "1.4.4", "1.4.6", "1.4.7", "1.4.8", "1.4.9", "1.4.11"}
+	containerdValidVersions              = [...]string{"1.3.2", "1.3.3", "1.3.4", "1.3.5", "1.3.6", "1.3.7", "1.3.8", "1.3.9", "1.4.4", "1.4.6", "1.4.7", "1.4.8", "1.4.9", "1.4.11", "1.5.11"}
 	kubernetesImageBaseTypeValidVersions = [...]string{"", common.KubernetesImageBaseTypeGCR, common.KubernetesImageBaseTypeMCR}
 	cachingTypesValidValues              = [...]string{"", string(compute.CachingTypesNone), string(compute.CachingTypesReadWrite), string(compute.CachingTypesReadOnly)}
 	linuxEth0MTUAllowedValues            = [...]int{1500, 3900}

pkg/api/vlabs/validate_test.go

@@ -64,7 +64,7 @@ func Test_OrchestratorProfile_Validate(t *testing.T) {
 					},
 				},
 			},
-			expectedError: "Invalid containerd version \"1.0.0\", please use one of the following versions: [1.3.2 1.3.3 1.3.4 1.3.5 1.3.6 1.3.7 1.3.8 1.3.9 1.4.4 1.4.6 1.4.7 1.4.8 1.4.9 1.4.11]",
+			expectedError: "Invalid containerd version \"1.0.0\", please use one of the following versions: [1.3.2 1.3.3 1.3.4 1.3.5 1.3.6 1.3.7 1.3.8 1.3.9 1.4.4 1.4.6 1.4.7 1.4.8 1.4.9 1.4.11 1.5.11]",
 		},
 		"should error when KubernetesConfig has containerdVersion value for docker container runtime": {
 			properties: &Properties{

pkg/engine/templates_generated.go

@@ -17640,8 +17640,8 @@ mobyPkgVersion() {
 installRunc() {
   local v
   v=$(runc --version | head -n 1 | cut -d" " -f3)
-  if [[ $v != "1.0.2" ]]; then
-    apt_get_install 20 30 120 moby-runc=1.0.2* --allow-downgrades || exit 27
+  if [[ $v != "1.0.3" ]]; then
+    apt_get_install 20 30 120 moby-runc=1.0.3* --allow-downgrades || exit 27
   fi
 }
 installMoby() {
@@ -21091,7 +21091,7 @@ var _k8sKubernetesparamsT = []byte(`    "etcdServerCertificate": {
       "type": "string"
     },
     "containerdVersion": {
-      "defaultValue": "1.4.11",
+      "defaultValue": "1.5.11",
       "metadata": {
         "description": "The Azure containerd build version"
       },
@@ -21109,7 +21109,8 @@ var _k8sKubernetesparamsT = []byte(`    "etcdServerCertificate": {
          "1.4.7",
          "1.4.8",
          "1.4.9",
-         "1.4.11"
+         "1.4.11",
+         "1.5.11"
        ],
       "type": "string"
     },

vhd/packer/install-dependencies.sh

@@ -82,7 +82,7 @@ installBpftrace
 echo "  - bpftrace" >> ${VHD_LOGS_FILEPATH}
 
 MOBY_VERSION="20.10.11"
-CONTAINERD_VERSION="1.4.11"
+CONTAINERD_VERSION="1.5.11"
 installMoby
 installRunc
 systemctl_restart 100 5 30 docker || exit 1