Upgrade containerd v1.6 (#1447)

Signed-off-by: Artiom Diomin <[email protected]> Signed-off-by: Artiom Diomin <[email protected]> Co-authored-by: Artiom Diomin <[email protected]>
kubermatic · Sep 28, 2022 · 91c8e2d · 91c8e2d
1 parent 12b75bf
commit 91c8e2d
Show file tree

Hide file tree

Showing 45 changed files with 45 additions and 45 deletions.
diff --git a/pkg/containerruntime/containerd.go b/pkg/containerruntime/containerd.go
@@ -28,7 +28,7 @@ import (
 
 const (
 	LegacyContainerdVersion  = "1.4"
-	DefaultContainerdVersion = "1.5"
+	DefaultContainerdVersion = "1.6"
 )
 
 type Containerd struct {

diff --git a/pkg/containerruntime/docker.go b/pkg/containerruntime/docker.go
@@ -28,7 +28,7 @@ import (
 
 const (
 	LegacyDockerContainerdVersion  = "1.4"
-	DefaultDockerContainerdVersion = "1.5"
+	DefaultDockerContainerdVersion = "1.6"
 	DefaultDockerVersion           = "20.10"
 	LegacyDockerVersion            = "19.03"
 )

diff --git a/pkg/userdata/centos/testdata/kubelet-v1.22-aws.yaml b/pkg/userdata/centos/testdata/kubelet-v1.22-aws.yaml
@@ -99,7 +99,7 @@ write_files:
 
     yum install -y \
         docker-ce-cli-20.10* \
-        containerd.io-1.5* \
+        containerd.io-1.6* \
         docker-ce-20.10* \
         yum-plugin-versionlock
     yum versionlock add docker-ce* containerd.io

diff --git a/pkg/userdata/centos/testdata/kubelet-v1.23-aws-external.yaml b/pkg/userdata/centos/testdata/kubelet-v1.23-aws-external.yaml
@@ -99,7 +99,7 @@ write_files:
 
     yum install -y \
         docker-ce-cli-20.10* \
-        containerd.io-1.5* \
+        containerd.io-1.6* \
         docker-ce-20.10* \
         yum-plugin-versionlock
     yum versionlock add docker-ce* containerd.io

diff --git a/pkg/userdata/centos/testdata/kubelet-v1.23-aws.yaml b/pkg/userdata/centos/testdata/kubelet-v1.23-aws.yaml
@@ -99,7 +99,7 @@ write_files:
 
     yum install -y \
         docker-ce-cli-20.10* \
-        containerd.io-1.5* \
+        containerd.io-1.6* \
         docker-ce-20.10* \
         yum-plugin-versionlock
     yum versionlock add docker-ce* containerd.io

diff --git a/pkg/userdata/centos/testdata/kubelet-v1.23-nutanix.yaml b/pkg/userdata/centos/testdata/kubelet-v1.23-nutanix.yaml
@@ -106,7 +106,7 @@ write_files:
 
     yum install -y \
         docker-ce-cli-20.10* \
-        containerd.io-1.5* \
+        containerd.io-1.6* \
         docker-ce-20.10* \
         yum-plugin-versionlock
     yum versionlock add docker-ce* containerd.io

diff --git a/pkg/userdata/centos/testdata/kubelet-v1.23-vsphere-mirrors.yaml b/pkg/userdata/centos/testdata/kubelet-v1.23-vsphere-mirrors.yaml
@@ -112,7 +112,7 @@ write_files:
 
     yum install -y \
         docker-ce-cli-20.10* \
-        containerd.io-1.5* \
+        containerd.io-1.6* \
         docker-ce-20.10* \
         yum-plugin-versionlock
     yum versionlock add docker-ce* containerd.io

diff --git a/pkg/userdata/centos/testdata/kubelet-v1.23-vsphere-proxy.yaml b/pkg/userdata/centos/testdata/kubelet-v1.23-vsphere-proxy.yaml
@@ -112,7 +112,7 @@ write_files:
 
     yum install -y \
         docker-ce-cli-20.10* \
-        containerd.io-1.5* \
+        containerd.io-1.6* \
         docker-ce-20.10* \
         yum-plugin-versionlock
     yum versionlock add docker-ce* containerd.io

diff --git a/pkg/userdata/centos/testdata/kubelet-v1.23-vsphere.yaml b/pkg/userdata/centos/testdata/kubelet-v1.23-vsphere.yaml
@@ -104,7 +104,7 @@ write_files:
 
     yum install -y \
         docker-ce-cli-20.10* \
-        containerd.io-1.5* \
+        containerd.io-1.6* \
         docker-ce-20.10* \
         yum-plugin-versionlock
     yum versionlock add docker-ce* containerd.io

diff --git a/pkg/userdata/centos/testdata/kubelet-v1.24-aws.yaml b/pkg/userdata/centos/testdata/kubelet-v1.24-aws.yaml
@@ -100,7 +100,7 @@ write_files:
     EnvironmentFile=-/etc/environment
     EOF
 
-    yum install -y containerd.io-1.5* yum-plugin-versionlock
+    yum install -y containerd.io-1.6* yum-plugin-versionlock
     yum versionlock add containerd.io
 
     systemctl daemon-reload

diff --git a/pkg/userdata/rhel/testdata/kubelet-v1.22-aws.yaml b/pkg/userdata/rhel/testdata/kubelet-v1.22-aws.yaml
@@ -94,7 +94,7 @@ write_files:
 
     yum install -y \
         docker-ce-cli-20.10* \
-        containerd.io-1.5* \
+        containerd.io-1.6* \
         docker-ce-20.10* \
         yum-plugin-versionlock
     yum versionlock add docker-ce* containerd.io

diff --git a/pkg/userdata/rhel/testdata/kubelet-v1.22-nutanix.yaml b/pkg/userdata/rhel/testdata/kubelet-v1.22-nutanix.yaml
@@ -102,7 +102,7 @@ write_files:
 
     yum install -y \
         docker-ce-cli-20.10* \
-        containerd.io-1.5* \
+        containerd.io-1.6* \
         docker-ce-20.10* \
         yum-plugin-versionlock
     yum versionlock add docker-ce* containerd.io

diff --git a/pkg/userdata/rhel/testdata/kubelet-v1.23-aws-external.yaml b/pkg/userdata/rhel/testdata/kubelet-v1.23-aws-external.yaml
@@ -94,7 +94,7 @@ write_files:
 
     yum install -y \
         docker-ce-cli-20.10* \
-        containerd.io-1.5* \
+        containerd.io-1.6* \
         docker-ce-20.10* \
         yum-plugin-versionlock
     yum versionlock add docker-ce* containerd.io

diff --git a/pkg/userdata/rhel/testdata/kubelet-v1.23-aws.yaml b/pkg/userdata/rhel/testdata/kubelet-v1.23-aws.yaml
@@ -94,7 +94,7 @@ write_files:
 
     yum install -y \
         docker-ce-cli-20.10* \
-        containerd.io-1.5* \
+        containerd.io-1.6* \
         docker-ce-20.10* \
         yum-plugin-versionlock
     yum versionlock add docker-ce* containerd.io

diff --git a/pkg/userdata/rhel/testdata/kubelet-v1.23-vsphere-mirrors.yaml b/pkg/userdata/rhel/testdata/kubelet-v1.23-vsphere-mirrors.yaml
@@ -108,7 +108,7 @@ write_files:
 
     yum install -y \
         docker-ce-cli-20.10* \
-        containerd.io-1.5* \
+        containerd.io-1.6* \
         docker-ce-20.10* \
         yum-plugin-versionlock
     yum versionlock add docker-ce* containerd.io

diff --git a/pkg/userdata/rhel/testdata/kubelet-v1.23-vsphere-proxy.yaml b/pkg/userdata/rhel/testdata/kubelet-v1.23-vsphere-proxy.yaml
@@ -108,7 +108,7 @@ write_files:
 
     yum install -y \
         docker-ce-cli-20.10* \
-        containerd.io-1.5* \
+        containerd.io-1.6* \
         docker-ce-20.10* \
         yum-plugin-versionlock
     yum versionlock add docker-ce* containerd.io

diff --git a/pkg/userdata/rhel/testdata/kubelet-v1.23-vsphere.yaml b/pkg/userdata/rhel/testdata/kubelet-v1.23-vsphere.yaml
@@ -100,7 +100,7 @@ write_files:
 
     yum install -y \
         docker-ce-cli-20.10* \
-        containerd.io-1.5* \
+        containerd.io-1.6* \
         docker-ce-20.10* \
         yum-plugin-versionlock
     yum versionlock add docker-ce* containerd.io

diff --git a/pkg/userdata/rhel/testdata/kubelet-v1.24-aws-external.yaml b/pkg/userdata/rhel/testdata/kubelet-v1.24-aws-external.yaml
@@ -95,7 +95,7 @@ write_files:
     EnvironmentFile=-/etc/environment
     EOF
 
-    yum install -y containerd.io-1.5* yum-plugin-versionlock
+    yum install -y containerd.io-1.6* yum-plugin-versionlock
     yum versionlock add containerd.io
 
     systemctl daemon-reload

diff --git a/pkg/userdata/rhel/testdata/kubelet-v1.24-aws.yaml b/pkg/userdata/rhel/testdata/kubelet-v1.24-aws.yaml
@@ -95,7 +95,7 @@ write_files:
     EnvironmentFile=-/etc/environment
     EOF
 
-    yum install -y containerd.io-1.5* yum-plugin-versionlock
+    yum install -y containerd.io-1.6* yum-plugin-versionlock
     yum versionlock add containerd.io
 
     systemctl daemon-reload

diff --git a/pkg/userdata/rhel/testdata/pod-cidr-azure-rhel.yaml b/pkg/userdata/rhel/testdata/pod-cidr-azure-rhel.yaml
@@ -99,7 +99,7 @@ write_files:
 
     yum install -y \
         docker-ce-cli-20.10* \
-        containerd.io-1.5* \
+        containerd.io-1.6* \
         docker-ce-20.10* \
         yum-plugin-versionlock
     yum versionlock add docker-ce* containerd.io

diff --git a/pkg/userdata/rockylinux/testdata/kubelet-v1.22-aws.yaml b/pkg/userdata/rockylinux/testdata/kubelet-v1.22-aws.yaml
@@ -95,7 +95,7 @@ write_files:
 
     yum install -y \
         docker-ce-cli-20.10* \
-        containerd.io-1.5* \
+        containerd.io-1.6* \
         docker-ce-20.10* \
         yum-plugin-versionlock
     yum versionlock add docker-ce* containerd.io

diff --git a/pkg/userdata/rockylinux/testdata/kubelet-v1.23-aws-external.yaml b/pkg/userdata/rockylinux/testdata/kubelet-v1.23-aws-external.yaml
@@ -95,7 +95,7 @@ write_files:
 
     yum install -y \
         docker-ce-cli-20.10* \
-        containerd.io-1.5* \
+        containerd.io-1.6* \
         docker-ce-20.10* \
         yum-plugin-versionlock
     yum versionlock add docker-ce* containerd.io

diff --git a/pkg/userdata/rockylinux/testdata/kubelet-v1.23-aws.yaml b/pkg/userdata/rockylinux/testdata/kubelet-v1.23-aws.yaml
@@ -95,7 +95,7 @@ write_files:
 
     yum install -y \
         docker-ce-cli-20.10* \
-        containerd.io-1.5* \
+        containerd.io-1.6* \
         docker-ce-20.10* \
         yum-plugin-versionlock
     yum versionlock add docker-ce* containerd.io

diff --git a/pkg/userdata/rockylinux/testdata/kubelet-v1.23-nutanix.yaml b/pkg/userdata/rockylinux/testdata/kubelet-v1.23-nutanix.yaml
@@ -102,7 +102,7 @@ write_files:
 
     yum install -y \
         docker-ce-cli-20.10* \
-        containerd.io-1.5* \
+        containerd.io-1.6* \
         docker-ce-20.10* \
         yum-plugin-versionlock
     yum versionlock add docker-ce* containerd.io

diff --git a/pkg/userdata/rockylinux/testdata/kubelet-v1.23-vsphere-mirrors.yaml b/pkg/userdata/rockylinux/testdata/kubelet-v1.23-vsphere-mirrors.yaml
@@ -108,7 +108,7 @@ write_files:
 
     yum install -y \
         docker-ce-cli-20.10* \
-        containerd.io-1.5* \
+        containerd.io-1.6* \
         docker-ce-20.10* \
         yum-plugin-versionlock
     yum versionlock add docker-ce* containerd.io

diff --git a/pkg/userdata/rockylinux/testdata/kubelet-v1.23-vsphere-proxy.yaml b/pkg/userdata/rockylinux/testdata/kubelet-v1.23-vsphere-proxy.yaml
@@ -108,7 +108,7 @@ write_files:
 
     yum install -y \
         docker-ce-cli-20.10* \
-        containerd.io-1.5* \
+        containerd.io-1.6* \
         docker-ce-20.10* \
         yum-plugin-versionlock
     yum versionlock add docker-ce* containerd.io

diff --git a/pkg/userdata/rockylinux/testdata/kubelet-v1.23-vsphere.yaml b/pkg/userdata/rockylinux/testdata/kubelet-v1.23-vsphere.yaml
@@ -100,7 +100,7 @@ write_files:
 
     yum install -y \
         docker-ce-cli-20.10* \
-        containerd.io-1.5* \
+        containerd.io-1.6* \
         docker-ce-20.10* \
         yum-plugin-versionlock
     yum versionlock add docker-ce* containerd.io

diff --git a/pkg/userdata/rockylinux/testdata/kubelet-v1.24-aws.yaml b/pkg/userdata/rockylinux/testdata/kubelet-v1.24-aws.yaml
@@ -96,7 +96,7 @@ write_files:
     EnvironmentFile=-/etc/environment
     EOF
 
-    yum install -y containerd.io-1.5* yum-plugin-versionlock
+    yum install -y containerd.io-1.6* yum-plugin-versionlock
     yum versionlock add containerd.io
 
     systemctl daemon-reload

diff --git a/pkg/userdata/ubuntu/testdata/containerd.yaml b/pkg/userdata/ubuntu/testdata/containerd.yaml
@@ -103,7 +103,7 @@ write_files:
     EnvironmentFile=-/etc/environment
     EOF
 
-    apt-get install -y --allow-downgrades containerd.io=1.5*
+    apt-get install -y --allow-downgrades containerd.io=1.6*
     apt-mark hold containerd.io
 
     systemctl daemon-reload

diff --git a/pkg/userdata/ubuntu/testdata/digitalocean-dualstack.yaml b/pkg/userdata/ubuntu/testdata/digitalocean-dualstack.yaml
@@ -99,7 +99,7 @@ write_files:
     EOF
 
     apt-get install --allow-downgrades -y \
-        containerd.io=1.5* \
+        containerd.io=1.6* \
         docker-ce-cli=5:20.10* \
         docker-ce=5:20.10*
     apt-mark hold docker-ce* containerd.io

diff --git a/pkg/userdata/ubuntu/testdata/dist-upgrade-on-boot.yaml b/pkg/userdata/ubuntu/testdata/dist-upgrade-on-boot.yaml
@@ -101,7 +101,7 @@ write_files:
     EOF
 
     apt-get install --allow-downgrades -y \
-        containerd.io=1.5* \
+        containerd.io=1.6* \
         docker-ce-cli=5:20.10* \
         docker-ce=5:20.10*
     apt-mark hold docker-ce* containerd.io

diff --git a/pkg/userdata/ubuntu/testdata/docker.yaml b/pkg/userdata/ubuntu/testdata/docker.yaml
@@ -101,7 +101,7 @@ write_files:
     EOF
 
     apt-get install --allow-downgrades -y \
-        containerd.io=1.5* \
+        containerd.io=1.6* \
         docker-ce-cli=5:20.10* \
         docker-ce=5:20.10*
     apt-mark hold docker-ce* containerd.io

diff --git a/pkg/userdata/ubuntu/testdata/kubelet-version-without-v-prefix.yaml b/pkg/userdata/ubuntu/testdata/kubelet-version-without-v-prefix.yaml
@@ -99,7 +99,7 @@ write_files:
     EOF
 
     apt-get install --allow-downgrades -y \
-        containerd.io=1.5* \
+        containerd.io=1.6* \
         docker-ce-cli=5:20.10* \
         docker-ce=5:20.10*
     apt-mark hold docker-ce* containerd.io

diff --git a/pkg/userdata/ubuntu/testdata/multiple-dns-servers.yaml b/pkg/userdata/ubuntu/testdata/multiple-dns-servers.yaml
@@ -99,7 +99,7 @@ write_files:
     EOF
 
     apt-get install --allow-downgrades -y \
-        containerd.io=1.5* \
+        containerd.io=1.6* \
         docker-ce-cli=5:20.10* \
         docker-ce=5:20.10*
     apt-mark hold docker-ce* containerd.io

diff --git a/pkg/userdata/ubuntu/testdata/multiple-ssh-keys.yaml b/pkg/userdata/ubuntu/testdata/multiple-ssh-keys.yaml
@@ -101,7 +101,7 @@ write_files:
     EOF
 
     apt-get install --allow-downgrades -y \
-        containerd.io=1.5* \
+        containerd.io=1.6* \
         docker-ce-cli=5:20.10* \
         docker-ce=5:20.10*
     apt-mark hold docker-ce* containerd.io

diff --git a/pkg/userdata/ubuntu/testdata/nutanix.yaml b/pkg/userdata/ubuntu/testdata/nutanix.yaml
@@ -102,7 +102,7 @@ write_files:
     EOF
 
     apt-get install --allow-downgrades -y \
-        containerd.io=1.5* \
+        containerd.io=1.6* \
         docker-ce-cli=5:20.10* \
         docker-ce=5:20.10*
     apt-mark hold docker-ce* containerd.io

diff --git a/pkg/userdata/ubuntu/testdata/openstack-dualstack.yaml b/pkg/userdata/ubuntu/testdata/openstack-dualstack.yaml
@@ -99,7 +99,7 @@ write_files:
     EOF
 
     apt-get install --allow-downgrades -y \
-        containerd.io=1.5* \
+        containerd.io=1.6* \
         docker-ce-cli=5:20.10* \
         docker-ce=5:20.10*
     apt-mark hold docker-ce* containerd.io

diff --git a/pkg/userdata/ubuntu/testdata/openstack-overwrite-cloud-config.yaml b/pkg/userdata/ubuntu/testdata/openstack-overwrite-cloud-config.yaml
@@ -99,7 +99,7 @@ write_files:
     EOF
 
     apt-get install --allow-downgrades -y \
-        containerd.io=1.5* \
+        containerd.io=1.6* \
         docker-ce-cli=5:20.10* \
         docker-ce=5:20.10*
     apt-mark hold docker-ce* containerd.io

diff --git a/pkg/userdata/ubuntu/testdata/openstack.yaml b/pkg/userdata/ubuntu/testdata/openstack.yaml
@@ -99,7 +99,7 @@ write_files:
     EOF
 
     apt-get install --allow-downgrades -y \
-        containerd.io=1.5* \
+        containerd.io=1.6* \
         docker-ce-cli=5:20.10* \
         docker-ce=5:20.10*
     apt-mark hold docker-ce* containerd.io

diff --git a/pkg/userdata/ubuntu/testdata/version-1.22.7.yaml b/pkg/userdata/ubuntu/testdata/version-1.22.7.yaml
@@ -99,7 +99,7 @@ write_files:
     EOF
 
     apt-get install --allow-downgrades -y \
-        containerd.io=1.5* \
+        containerd.io=1.6* \
         docker-ce-cli=5:20.10* \
         docker-ce=5:20.10*
     apt-mark hold docker-ce* containerd.io

diff --git a/pkg/userdata/ubuntu/testdata/version-1.23.5.yaml b/pkg/userdata/ubuntu/testdata/version-1.23.5.yaml
@@ -99,7 +99,7 @@ write_files:
     EOF
 
     apt-get install --allow-downgrades -y \
-        containerd.io=1.5* \
+        containerd.io=1.6* \
         docker-ce-cli=5:20.10* \
         docker-ce=5:20.10*
     apt-mark hold docker-ce* containerd.io

diff --git a/pkg/userdata/ubuntu/testdata/version-1.24.0.yaml b/pkg/userdata/ubuntu/testdata/version-1.24.0.yaml
@@ -101,7 +101,7 @@ write_files:
     EnvironmentFile=-/etc/environment
     EOF
 
-    apt-get install -y --allow-downgrades containerd.io=1.5*
+    apt-get install -y --allow-downgrades containerd.io=1.6*
     apt-mark hold containerd.io
 
     systemctl daemon-reload

diff --git a/pkg/userdata/ubuntu/testdata/vsphere-mirrors.yaml b/pkg/userdata/ubuntu/testdata/vsphere-mirrors.yaml
@@ -109,7 +109,7 @@ write_files:
     EOF
 
     apt-get install --allow-downgrades -y \
-        containerd.io=1.5* \
+        containerd.io=1.6* \
         docker-ce-cli=5:20.10* \
         docker-ce=5:20.10*
     apt-mark hold docker-ce* containerd.io

diff --git a/pkg/userdata/ubuntu/testdata/vsphere-proxy.yaml b/pkg/userdata/ubuntu/testdata/vsphere-proxy.yaml
@@ -109,7 +109,7 @@ write_files:
     EOF
 
     apt-get install --allow-downgrades -y \
-        containerd.io=1.5* \
+        containerd.io=1.6* \
         docker-ce-cli=5:20.10* \
         docker-ce=5:20.10*
     apt-mark hold docker-ce* containerd.io