Repository: kubermatic/machine-controller
Pull request #1439 (2022-09-22 08:16:56)

Upgrade containerd v1.6
**What this PR does / why we need it**:
To keep up with containerd releases

**What type of PR is this?**
/kind chore

**Does this PR introduce a user-facing change? Then add your Release Note here**:
```release-note
Upgrade containerd to v1.6
```

**Documentation**:
```documentation
NONE
```

kubermatic-bot: [APPROVALNOTIFIER] This PR is **NOT APPROVED**

This pull-request has been approved by: *<a href="https://github.com/kubermatic/machine-controller/pull/1439#" title="Author self-approved">kron4eg</a>*
To complete the [pull request process](https://git.k8s.io/community/contributors/guide/owners.md#the-code-review-process), please assign **ahmedwaleedmalik** after the PR has been reviewed.
You can assign the PR to them by writing `/assign @ahmedwaleedmalik` in a comment when ready.

The full list of commands accepted by this bot can be found [here](https://go.k8s.io/bot-commands?repo=kubermatic%2Fmachine-controller).

<details open>
Needs approval from an approver in each of these files:

- ~~[OWNERS](https://github.com/kubermatic/machine-controller/blob/master/OWNERS)~~ [kron4eg]
- **[pkg/userdata/OWNERS](https://github.com/kubermatic/machine-controller/blob/master/pkg/userdata/OWNERS)**

Approvers can indicate their approval by writing `/approve` in a comment
Approvers can cancel approval by writing `/approve cancel` in a comment
</details>
<!-- META={"approvers":["ahmedwaleedmalik"]} -->
kubermatic-bot: @kron4eg: The following tests **failed**, say `/retest` to rerun all failed tests or `/retest-required` to rerun all mandatory failed tests:

Test name | Commit | Details | Required | Rerun command
--- | --- | --- | --- | ---
pull-machine-controller-e2e-vmware-cloud-director | 0485b2fbdde07af357d0b8f0e72d06c2463479bd | [link](https://public-prow.loodse.com/view/gs/prow-dev-public-data/pr-logs/pull/kubermatic_machine-controller/1439/pull-machine-controller-e2e-vmware-cloud-director/1572862538872262656) | true | `/test pull-machine-controller-e2e-vmware-cloud-director`
pull-machine-controller-e2e-azure | 0485b2fbdde07af357d0b8f0e72d06c2463479bd | [link](https://public-prow.loodse.com/view/gs/prow-dev-public-data/pr-logs/pull/kubermatic_machine-controller/1439/pull-machine-controller-e2e-azure/1572862531322515456) | true | `/test pull-machine-controller-e2e-azure`

[Full PR test history](https://public-prow.loodse.com/pr-history?org=kubermatic&repo=machine-controller&pr=1439)

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
</details>
<!-- test report -->
kubermatic-bot: @kron4eg: The following tests **failed**, say `/retest` to rerun all failed tests or `/retest-required` to rerun all mandatory failed tests:

Test name | Commit | Details | Required | Rerun command
--- | --- | --- | --- | ---
pull-machine-controller-e2e-vmware-cloud-director | 0485b2fbdde07af357d0b8f0e72d06c2463479bd | [link](https://public-prow.loodse.com/view/gs/prow-dev-public-data/pr-logs/pull/kubermatic_machine-controller/1439/pull-machine-controller-e2e-vmware-cloud-director/1572862538872262656) | true | `/test pull-machine-controller-e2e-vmware-cloud-director`
pull-machine-controller-e2e-azure | 0485b2fbdde07af357d0b8f0e72d06c2463479bd | [link](https://public-prow.loodse.com/view/gs/prow-dev-public-data/pr-logs/pull/kubermatic_machine-controller/1439/pull-machine-controller-e2e-azure/1572862531322515456) | true | `/test pull-machine-controller-e2e-azure`
pull-machine-controller-e2e-azure-custom-image-reference | 0485b2fbdde07af357d0b8f0e72d06c2463479bd | [link](https://public-prow.loodse.com/view/gs/prow-dev-public-data/pr-logs/pull/kubermatic_machine-controller/1439/pull-machine-controller-e2e-azure-custom-image-reference/1572862532144599040) | true | `/test pull-machine-controller-e2e-azure-custom-image-reference`

[Full PR test history](https://public-prow.loodse.com/pr-history?org=kubermatic&repo=machine-controller&pr=1439)

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
</details>
<!-- test report -->
kron4eg: /retest
kubermatic-bot: LGTM label has been added.  <details>Git tree hash: 54fb7914a3951211b8b0ed30aa5b83c5da8f1ded</details>
kubermatic-bot: [APPROVALNOTIFIER] This PR is **APPROVED**

This pull-request has been approved by: *<a href="https://github.com/kubermatic/machine-controller/pull/1439#pullrequestreview-1117308202" title="Approved">ahmedwaleedmalik</a>*, *<a href="https://github.com/kubermatic/machine-controller/pull/1439#" title="Author self-approved">kron4eg</a>*

The full list of commands accepted by this bot can be found [here](https://go.k8s.io/bot-commands?repo=kubermatic%2Fmachine-controller).

The pull request process is described [here](https://git.k8s.io/community/contributors/guide/owners.md#the-code-review-process)

<details >
Needs approval from an approver in each of these files:

- ~~[OWNERS](https://github.com/kubermatic/machine-controller/blob/master/OWNERS)~~ [ahmedwaleedmalik,kron4eg]
- ~~[pkg/userdata/OWNERS](https://github.com/kubermatic/machine-controller/blob/master/pkg/userdata/OWNERS)~~ [ahmedwaleedmalik]

Approvers can indicate their approval by writing `/approve` in a comment
Approvers can cancel approval by writing `/approve cancel` in a comment
</details>
<!-- META={"approvers":[]} -->

Patch:
diff --git a/pkg/containerruntime/containerd.go b/pkg/containerruntime/containerd.go
index 413b0297..248ff0bb 100644
--- 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
index c8973e62..173ce3f6 100644
--- 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"
 )


Test patch:
diff --git a/pkg/userdata/centos/testdata/kubelet-v1.22-aws.yaml b/pkg/userdata/centos/testdata/kubelet-v1.22-aws.yaml
index d4d50344..df35961d 100644
--- 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
index ff6b3c5c..c5189aac 100644
--- 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
index 4a793afc..f9437054 100644
--- 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
index 2c6ecd08..19a57bbc 100644
--- 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
index 2c64afd9..dd1e83fc 100644
--- 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
index fb5cc23d..6a7352d0 100644
--- 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
index 9b68d8f9..25051264 100644
--- 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
index c2c9a339..cf85e964 100644
--- 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
index 5ee3c66b..2399d418 100644
--- 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
index ec9e1ee7..4ae2476f 100644
--- 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
index db2355f5..a7909057 100644
--- 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
index d5bab82b..15936469 100644
--- 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
index 7e0ca299..60d49d61 100644
--- 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
index 82c5677d..dd7d3683 100644
--- 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
index 5b24323e..1e4785fc 100644
--- 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
index 5b07fe6d..5cc28493 100644
--- 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
index ecd6b661..8e8a5918 100644
--- 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
index df98b4fe..7da83179 100644
--- 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
index b4da3353..26715a38 100644
--- 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
index 04eeda05..de9e8b81 100644
--- 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
index bc2e5438..871afd16 100644
--- 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
index 6377d7b3..6280d8c5 100644
--- 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
index 47ebef3e..c77004f2 100644
--- 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
index ba853e3f..968eaf04 100644
--- 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
index a2464cc1..2900f5c3 100644
--- 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
index 9cb82e69..7af96633 100644
--- 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
index bf311fa0..fff144f5 100644
--- 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
index 7438e9e4..83120b0c 100644
--- 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
index b0a6d2cb..2857fb81 100644
--- 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
index d105086e..d761c1a2 100644
--- 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
index 82318116..fef7938b 100644
--- 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
index c100f10a..5dd08723 100644
--- 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
index 913f2e38..ed129f53 100644
--- 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
index 6367bd5f..34480661 100644
--- 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
index a30b0117..be1c64a2 100644
--- 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
index 840756ce..5e7ec012 100644
--- 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
index 8541fcfc..b087ed87 100644
--- 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
index 82318116..fef7938b 100644
--- 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
index abe51931..6ad303d5 100644
--- 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
index 9d45afa3..d0773d79 100644
--- 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
index 4372a223..31c647d6 100644
--- 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
index 035687f2..16127b36 100644
--- 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
diff --git a/pkg/userdata/ubuntu/testdata/vsphere.yaml b/pkg/userdata/ubuntu/testdata/vsphere.yaml
index c2f31b9f..8d838337 100644
--- a/pkg/userdata/ubuntu/testdata/vsphere.yaml
+++ b/pkg/userdata/ubuntu/testdata/vsphere.yaml
@@ -100,7 +100,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