chore: update CRI builds

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

@@ -96,6 +96,13 @@ removeContainerd() {
 mobyPkgVersion() {
   dpkg -s "${1}" | grep "Version:" | awk '{ print $2 }' | cut -d '+' -f 1
 }
+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
+  fi
+}
 installMoby() {
   local install_pkgs="" v cli_ver="${MOBY_VERSION}"
   v="$(mobyPkgVersion moby-containerd)"

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

@@ -109,6 +109,7 @@ time_metric "InstallContainerd" installContainerd
 {{else}}
 time_metric "installMoby" installMoby
 {{end}}
+time_metric "installRunc" installRunc
 {{- if HasLinuxMobyURL}}
   LINUX_MOBY_URL={{GetLinuxMobyURL}}
   if [[ -n "${LINUX_MOBY_URL:-}" ]]; then

parts/k8s/kubernetesparams.t

@@ -227,12 +227,13 @@
          "19.03.11",
          "19.03.12",
          "19.03.13",
-         "19.03.14"
+         "19.03.14",
+         "20.10.5"
        ],
       "type": "string"
     },
     "containerdVersion": {
-      "defaultValue": "1.3.9",
+      "defaultValue": "1.4.4",
       "metadata": {
         "description": "The Azure Moby build version"
       },
@@ -244,7 +245,8 @@
          "1.3.6",
          "1.3.7",
          "1.3.8",
-         "1.3.9"
+         "1.3.9",
+         "1.4.4"
        ],
       "type": "string"
     },

pkg/api/const.go

@@ -444,7 +444,7 @@ const (
 	// DefaultMobyVersion specifies the default Azure build version of Moby to install.
 	DefaultMobyVersion = "19.03.14"
 	// DefaultContainerdVersion specifies the default containerd version to install.
-	DefaultContainerdVersion = "1.3.9"
+	DefaultContainerdVersion = "1.4.4"
 	// 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

@@ -1275,7 +1275,7 @@ func TestAzureStackKubernetesConfigDefaults(t *testing.T) {
 
 func TestContainerRuntime(t *testing.T) {
 
-	for _, mobyVersion := range []string{"3.0.1", "3.0.3", "3.0.4", "3.0.5", "3.0.6", "3.0.7", "3.0.8", "3.0.10", "19.03.11", "19.03.12", "19.03.13", "19.03.14"} {
+	for _, mobyVersion := range []string{"3.0.1", "3.0.3", "3.0.4", "3.0.5", "3.0.6", "3.0.7", "3.0.8", "3.0.10", "19.03.11", "19.03.12", "19.03.13", "19.03.14", "20.10.5"} {
 		mockCS := getMockBaseContainerService("1.10.13")
 		properties := mockCS.Properties
 		properties.OrchestratorProfile.KubernetesConfig.MobyVersion = mobyVersion
@@ -6053,9 +6053,9 @@ func ExampleContainerService_setOrchestratorDefaults() {
 
 	// Output:
 	// level=warning msg="Moby will be upgraded to version 19.03.14\n"
-	// level=warning msg="containerd will be upgraded to version 1.3.9\n"
+	// level=warning msg="containerd will be upgraded to version 1.4.4\n"
 	// level=warning msg="Any new nodes will have Moby version 19.03.14\n"
-	// level=warning msg="Any new nodes will have containerd version 1.3.9\n"
+	// level=warning msg="Any new nodes will have containerd version 1.4.4\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"}
-	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"}
+	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"}
 	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]",
+			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]",
 		},
 		"should error when KubernetesConfig has containerdVersion value for docker container runtime": {
 			properties: &Properties{

vhd/packer/install-dependencies.sh

@@ -83,8 +83,9 @@ installBpftrace
 echo "  - bpftrace" >> ${VHD_LOGS_FILEPATH}
 
 MOBY_VERSION="19.03.14"
-CONTAINERD_VERSION="1.3.9"
+CONTAINERD_VERSION="1.4.4"
 installMoby
+installRunc
 systemctl_restart 100 5 30 docker || exit 1
 echo "  - moby v${MOBY_VERSION}" >> ${VHD_LOGS_FILEPATH}
 downloadGPUDrivers