Merge pull request #12073 from hakman/containerd-1.4.9

Update containerd to v1.4.9
kubernetes · Jul 30, 2021 · 8d0b2d3 · 8d0b2d3
2 parents 91ee2e3 + 541d328
commit 8d0b2d3
Show file tree

Hide file tree

Showing 234 changed files with 473 additions and 471 deletions.
diff --git a/pkg/model/components/containerd.go b/pkg/model/components/containerd.go
@@ -47,7 +47,7 @@ func (b *ContainerdOptionsBuilder) BuildOptions(o interface{}) error {
 		// Set version based on Kubernetes version
 		if fi.StringValue(containerd.Version) == "" {
 			if b.IsKubernetesGTE("1.19") {
-				containerd.Version = fi.String("1.4.8")
+				containerd.Version = fi.String("1.4.9")
 			} else {
 				containerd.Version = fi.String("1.3.10")
 			}

diff --git a/tests/integration/update_cluster/apiservernodes/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/apiservernodes/cloudformation.json.extracted.yaml
@@ -131,7 +131,7 @@ Resources.AWSEC2LaunchTemplateapiserverapiserversminimalexamplecom.Properties.La
   containerRuntime: containerd
   containerd:
     logLevel: info
-    version: 1.4.8
+    version: 1.4.9
   docker:
     skipInstall: true
   kubeProxy:
@@ -163,7 +163,7 @@ Resources.AWSEC2LaunchTemplateapiserverapiserversminimalexamplecom.Properties.La
   ConfigBase: memfs://clusters.example.com/minimal.example.com
   InstanceGroupName: apiserver
   InstanceGroupRole: APIServer
-  NodeupConfigHash: jkS1VpRis8JHf0SBzPViuhBUP+xDHHhrzHaTXkG4LP8=
+  NodeupConfigHash: SyVEcfu2eiTjWur95m0UZTCP1DBpaBAOGtd85/Mzg2Q=
 
   __EOF_KUBE_ENV
 
@@ -302,7 +302,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties.
   containerRuntime: containerd
   containerd:
     logLevel: info
-    version: 1.4.8
+    version: 1.4.9
   docker:
     skipInstall: true
   encryptionConfig: null
@@ -416,7 +416,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties.
   ConfigBase: memfs://clusters.example.com/minimal.example.com
   InstanceGroupName: master-us-test-1a
   InstanceGroupRole: Master
-  NodeupConfigHash: 9TvJut2LkDRXMWLOwYIvkOJqEECkhFz8E7hZq9sqGDQ=
+  NodeupConfigHash: f+WbfMckpjsfYZIzXI7EdLJdzoo1ool1Y6C5xNm2NoY=
 
   __EOF_KUBE_ENV
 
@@ -555,7 +555,7 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa
   containerRuntime: containerd
   containerd:
     logLevel: info
-    version: 1.4.8
+    version: 1.4.9
   docker:
     skipInstall: true
   kubeProxy:
@@ -587,7 +587,7 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa
   ConfigBase: memfs://clusters.example.com/minimal.example.com
   InstanceGroupName: nodes
   InstanceGroupRole: Node
-  NodeupConfigHash: 266fTTSaZSr8z6qKYIfYZYZsoVPQFvzOObTJbHVlURU=
+  NodeupConfigHash: 3Haz0ajVJsEz1HWJ4IiHdhy0/7laCtbNz4e7jhMknHA=
 
   __EOF_KUBE_ENV
 

diff --git a/...ntroller/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/...ntroller/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
@@ -130,7 +130,7 @@ cloudConfig:
 containerRuntime: containerd
 containerd:
   logLevel: info
-  version: 1.4.8
+  version: 1.4.9
 docker:
   skipInstall: true
 encryptionConfig: null
@@ -244,7 +244,7 @@ CloudProvider: aws
 ConfigBase: memfs://clusters.example.com/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: Master
-NodeupConfigHash: NIYVAo8LPjyiFGTNNTbyT4MMCp/WINRb4egsNvUR93M=
+NodeupConfigHash: mq7b+e9YN5W4fhhQmQABtOYzkKGtI5Sw954hTtYudjk=
 
 __EOF_KUBE_ENV
 

diff --git a/...te_cluster/aws-lb-controller/data/aws_launch_template_nodes.minimal.example.com_user_data b/...te_cluster/aws-lb-controller/data/aws_launch_template_nodes.minimal.example.com_user_data
@@ -130,7 +130,7 @@ cloudConfig:
 containerRuntime: containerd
 containerd:
   logLevel: info
-  version: 1.4.8
+  version: 1.4.9
 docker:
   skipInstall: true
 kubeProxy:
@@ -162,7 +162,7 @@ CloudProvider: aws
 ConfigBase: memfs://clusters.example.com/minimal.example.com
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: 266fTTSaZSr8z6qKYIfYZYZsoVPQFvzOObTJbHVlURU=
+NodeupConfigHash: 3Haz0ajVJsEz1HWJ4IiHdhy0/7laCtbNz4e7jhMknHA=
 
 __EOF_KUBE_ENV
 

diff --git a/...update_cluster/aws-lb-controller/data/aws_s3_bucket_object_cluster-completed.spec_content b/...update_cluster/aws-lb-controller/data/aws_s3_bucket_object_cluster-completed.spec_content
@@ -24,7 +24,7 @@ spec:
   containerRuntime: containerd
   containerd:
     logLevel: info
-    version: 1.4.8
+    version: 1.4.9
   dnsZone: Z1AFAKE1ZON3YO
   docker:
     skipInstall: true

diff --git a/...luster/aws-lb-controller/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/...luster/aws-lb-controller/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content
@@ -56,7 +56,7 @@ Assets:
   - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet
   - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl
   - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz
-  - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz
+  - 9911479f86012d6eab7e0f532da8f807a8b0f555ee09ef89367d8c31243073bb@https://github.com/containerd/containerd/releases/download/v1.4.9/cri-containerd-cni-1.4.9-linux-amd64.tar.gz
   - f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64
   - 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64
   arm64:
@@ -258,7 +258,7 @@ channels:
 - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml
 containerdConfig:
   logLevel: info
-  version: 1.4.8
+  version: 1.4.9
 etcdManifests:
 - memfs://clusters.example.com/minimal.example.com/manifests/etcd/main.yaml
 - memfs://clusters.example.com/minimal.example.com/manifests/etcd/events.yaml

diff --git a/...ion/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/...ion/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_nodeupconfig-nodes_content
@@ -3,7 +3,7 @@ Assets:
   - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet
   - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl
   - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz
-  - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz
+  - 9911479f86012d6eab7e0f532da8f807a8b0f555ee09ef89367d8c31243073bb@https://github.com/containerd/containerd/releases/download/v1.4.9/cri-containerd-cni-1.4.9-linux-amd64.tar.gz
   arm64:
   - 17832b192be5ea314714f7e16efd5e5f65347974bbbf41def6b02f68931380c4@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubelet
   - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl
@@ -60,4 +60,4 @@ channels:
 - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml
 containerdConfig:
   logLevel: info
-  version: 1.4.8
+  version: 1.4.9
diff --git a/.../data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data b/.../data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data
@@ -130,7 +130,7 @@ cloudConfig:
 containerRuntime: containerd
 containerd:
   logLevel: info
-  version: 1.4.8
+  version: 1.4.9
 docker:
   skipInstall: true
 encryptionConfig: null
@@ -244,7 +244,7 @@ CloudProvider: aws
 ConfigBase: memfs://clusters.example.com/bastionuserdata.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: Master
-NodeupConfigHash: tjagubyg9Ah3cskOiDjoiXpeWUrgt1228QwhF0bw1/E=
+NodeupConfigHash: FBE8yjdRS6iFlra8yT8yCacZVKnL0oZ1qLv9yYkumCU=
 
 __EOF_KUBE_ENV
 

diff --git a/...additional_user-data/data/aws_launch_template_nodes.bastionuserdata.example.com_user_data b/...additional_user-data/data/aws_launch_template_nodes.bastionuserdata.example.com_user_data
@@ -139,7 +139,7 @@ cloudConfig:
 containerRuntime: containerd
 containerd:
   logLevel: info
-  version: 1.4.8
+  version: 1.4.9
 docker:
   skipInstall: true
 kubeProxy:
@@ -171,7 +171,7 @@ CloudProvider: aws
 ConfigBase: memfs://clusters.example.com/bastionuserdata.example.com
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: 4NrGSqBOzuFuadwsdNsW7qTseLUbocizMQMH27emtw8=
+NodeupConfigHash: NYdn9qPYsj63CK1T7JjRAM+uQPyCpxM3zsRBsy3lZpo=
 
 __EOF_KUBE_ENV
 

diff --git a/...ster/bastionadditional_user-data/data/aws_s3_bucket_object_cluster-completed.spec_content b/...ster/bastionadditional_user-data/data/aws_s3_bucket_object_cluster-completed.spec_content
@@ -22,7 +22,7 @@ spec:
   containerRuntime: containerd
   containerd:
     logLevel: info
-    version: 1.4.8
+    version: 1.4.9
   dnsZone: Z1AFAKE1ZON3YO
   docker:
     skipInstall: true

diff --git a/...luster/bastionadditional_user-data/data/aws_s3_bucket_object_nodeupconfig-bastion_content b/...luster/bastionadditional_user-data/data/aws_s3_bucket_object_nodeupconfig-bastion_content
@@ -3,7 +3,7 @@ Assets:
   - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet
   - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl
   - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz
-  - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz
+  - 9911479f86012d6eab7e0f532da8f807a8b0f555ee09ef89367d8c31243073bb@https://github.com/containerd/containerd/releases/download/v1.4.9/cri-containerd-cni-1.4.9-linux-amd64.tar.gz
   arm64:
   - 17832b192be5ea314714f7e16efd5e5f65347974bbbf41def6b02f68931380c4@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubelet
   - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl
@@ -38,4 +38,4 @@ channels:
 - memfs://clusters.example.com/bastionuserdata.example.com/addons/bootstrap-channel.yaml
 containerdConfig:
   logLevel: info
-  version: 1.4.8
+  version: 1.4.9
diff --git a/...tionadditional_user-data/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/...tionadditional_user-data/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content
@@ -56,7 +56,7 @@ Assets:
   - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet
   - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl
   - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz
-  - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz
+  - 9911479f86012d6eab7e0f532da8f807a8b0f555ee09ef89367d8c31243073bb@https://github.com/containerd/containerd/releases/download/v1.4.9/cri-containerd-cni-1.4.9-linux-amd64.tar.gz
   - f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64
   - 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64
   arm64:
@@ -258,7 +258,7 @@ channels:
 - memfs://clusters.example.com/bastionuserdata.example.com/addons/bootstrap-channel.yaml
 containerdConfig:
   logLevel: info
-  version: 1.4.8
+  version: 1.4.9
 etcdManifests:
 - memfs://clusters.example.com/bastionuserdata.example.com/manifests/etcd/main.yaml
 - memfs://clusters.example.com/bastionuserdata.example.com/manifests/etcd/events.yaml

diff --git a/..._cluster/bastionadditional_user-data/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/..._cluster/bastionadditional_user-data/data/aws_s3_bucket_object_nodeupconfig-nodes_content
@@ -3,7 +3,7 @@ Assets:
   - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet
   - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl
   - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz
-  - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz
+  - 9911479f86012d6eab7e0f532da8f807a8b0f555ee09ef89367d8c31243073bb@https://github.com/containerd/containerd/releases/download/v1.4.9/cri-containerd-cni-1.4.9-linux-amd64.tar.gz
   arm64:
   - 17832b192be5ea314714f7e16efd5e5f65347974bbbf41def6b02f68931380c4@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubelet
   - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl
@@ -60,4 +60,4 @@ channels:
 - memfs://clusters.example.com/bastionuserdata.example.com/addons/bootstrap-channel.yaml
 containerdConfig:
   logLevel: info
-  version: 1.4.8
+  version: 1.4.9
diff --git a/tests/integration/update_cluster/complex/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/complex/cloudformation.json.extracted.yaml
@@ -140,7 +140,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscomplexexamplecom.Properties.
   containerRuntime: containerd
   containerd:
     logLevel: info
-    version: 1.4.8
+    version: 1.4.9
   docker:
     skipInstall: true
   encryptionConfig: null
@@ -260,7 +260,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscomplexexamplecom.Properties.
   ConfigBase: memfs://clusters.example.com/complex.example.com
   InstanceGroupName: master-us-test-1a
   InstanceGroupRole: Master
-  NodeupConfigHash: NPa6cEWEOVkO5lvt7jr5LvyaWEcMHl5n8ZeGOsv0k18=
+  NodeupConfigHash: w33vhSKd+cDXrw4jQQRa/AlvqCgBOLwLeLL9/u5QY7M=
 
   __EOF_KUBE_ENV
 
@@ -419,7 +419,7 @@ Resources.AWSEC2LaunchTemplatenodescomplexexamplecom.Properties.LaunchTemplateDa
   containerRuntime: containerd
   containerd:
     logLevel: info
-    version: 1.4.8
+    version: 1.4.9
   docker:
     skipInstall: true
   kubeProxy:
@@ -451,7 +451,7 @@ Resources.AWSEC2LaunchTemplatenodescomplexexamplecom.Properties.LaunchTemplateDa
   ConfigBase: memfs://clusters.example.com/complex.example.com
   InstanceGroupName: nodes
   InstanceGroupRole: Node
-  NodeupConfigHash: Yhi9WSo4zX3cHWrQ+uj6D6QuUlyBDWKjsIXaf8b3wjk=
+  NodeupConfigHash: YBTqfi97dq6C5hPHUcmKz/r7wMVGQOkXV2OaOEPbRAo=
 
   __EOF_KUBE_ENV
 

diff --git a/.../complex/data/aws_launch_template_master-us-test-1a.masters.complex.example.com_user_data b/.../complex/data/aws_launch_template_master-us-test-1a.masters.complex.example.com_user_data
@@ -139,7 +139,7 @@ cloudConfig:
 containerRuntime: containerd
 containerd:
   logLevel: info
-  version: 1.4.8
+  version: 1.4.9
 docker:
   skipInstall: true
 encryptionConfig: null
@@ -259,7 +259,7 @@ CloudProvider: aws
 ConfigBase: memfs://clusters.example.com/complex.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: Master
-NodeupConfigHash: NPa6cEWEOVkO5lvt7jr5LvyaWEcMHl5n8ZeGOsv0k18=
+NodeupConfigHash: w33vhSKd+cDXrw4jQQRa/AlvqCgBOLwLeLL9/u5QY7M=
 
 __EOF_KUBE_ENV
 

diff --git a/...ation/update_cluster/complex/data/aws_launch_template_nodes.complex.example.com_user_data b/...ation/update_cluster/complex/data/aws_launch_template_nodes.complex.example.com_user_data
@@ -139,7 +139,7 @@ cloudConfig:
 containerRuntime: containerd
 containerd:
   logLevel: info
-  version: 1.4.8
+  version: 1.4.9
 docker:
   skipInstall: true
 kubeProxy:
@@ -171,7 +171,7 @@ CloudProvider: aws
 ConfigBase: memfs://clusters.example.com/complex.example.com
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: Yhi9WSo4zX3cHWrQ+uj6D6QuUlyBDWKjsIXaf8b3wjk=
+NodeupConfigHash: YBTqfi97dq6C5hPHUcmKz/r7wMVGQOkXV2OaOEPbRAo=
 
 __EOF_KUBE_ENV
 

diff --git a/...tegration/update_cluster/complex/data/aws_s3_bucket_object_cluster-completed.spec_content b/...tegration/update_cluster/complex/data/aws_s3_bucket_object_cluster-completed.spec_content
@@ -37,7 +37,7 @@ spec:
   containerRuntime: containerd
   containerd:
     logLevel: info
-    version: 1.4.8
+    version: 1.4.9
   dnsZone: Z1AFAKE1ZON3YO
   docker:
     skipInstall: true

diff --git a/...n/update_cluster/complex/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/...n/update_cluster/complex/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content
@@ -62,7 +62,7 @@ Assets:
   - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet
   - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl
   - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz
-  - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz
+  - 9911479f86012d6eab7e0f532da8f807a8b0f555ee09ef89367d8c31243073bb@https://github.com/containerd/containerd/releases/download/v1.4.9/cri-containerd-cni-1.4.9-linux-amd64.tar.gz
   - f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64
   - 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64
   arm64:
@@ -264,7 +264,7 @@ channels:
 - memfs://clusters.example.com/complex.example.com/addons/bootstrap-channel.yaml
 containerdConfig:
   logLevel: info
-  version: 1.4.8
+  version: 1.4.9
 etcdManifests:
 - memfs://clusters.example.com/complex.example.com/manifests/etcd/main.yaml
 - memfs://clusters.example.com/complex.example.com/manifests/etcd/events.yaml

diff --git a/...s/integration/update_cluster/complex/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/...s/integration/update_cluster/complex/data/aws_s3_bucket_object_nodeupconfig-nodes_content
@@ -3,7 +3,7 @@ Assets:
   - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet
   - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl
   - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz
-  - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz
+  - 9911479f86012d6eab7e0f532da8f807a8b0f555ee09ef89367d8c31243073bb@https://github.com/containerd/containerd/releases/download/v1.4.9/cri-containerd-cni-1.4.9-linux-amd64.tar.gz
   arm64:
   - 17832b192be5ea314714f7e16efd5e5f65347974bbbf41def6b02f68931380c4@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubelet
   - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl
@@ -60,4 +60,4 @@ channels:
 - memfs://clusters.example.com/complex.example.com/addons/bootstrap-channel.yaml
 containerdConfig:
   logLevel: info
-  version: 1.4.8
+  version: 1.4.9