Repository: kubermatic/machine-controller
Pull request #1447 (2022-09-28 08:29:34)

[release/v1.54] Upgrade containerd v1.6
This is an automated cherry-pick of #1439

/assign ahmedwaleedmalik

```release-note
Upgrade containerd to v1.6
```

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

This pull-request has been approved by: *<a href="https://github.com/kubermatic/machine-controller/pull/1447#" title="Author self-approved">kubermatic-bot</a>*
To complete the [pull request process](https://git.k8s.io/community/contributors/guide/owners.md#the-code-review-process), please assign **moadqassem** after the PR has been reviewed.
You can assign the PR to them by writing `/assign @moadqassem` 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/release/v1.54/OWNERS)**
- **[pkg/userdata/OWNERS](https://github.com/kubermatic/machine-controller/blob/release/v1.54/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":["moadqassem"]} -->
kubermatic-bot: LGTM label has been added.  <details>Git tree hash: 1f8b5975997bd008d5b8b01275009400aab8e9ec</details>
kubermatic-bot: @kubermatic-bot: The following test **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-vsphere | 1799b143cfd93eceaf0b6fff3f5a472da808db06 | [link](https://public-prow.loodse.com/view/gs/prow-dev-public-data/pr-logs/pull/kubermatic_machine-controller/1447/pull-machine-controller-e2e-vsphere/1575040054366048256) | true | `/test pull-machine-controller-e2e-vsphere`

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

<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 -->
ahmedwaleedmalik: /test pull-machine-controller-e2e-vsphere
kubermatic-bot: @kubermatic-bot: 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-vsphere | 1799b143cfd93eceaf0b6fff3f5a472da808db06 | [link](https://public-prow.loodse.com/view/gs/prow-dev-public-data/pr-logs/pull/kubermatic_machine-controller/1447/pull-machine-controller-e2e-vsphere/1575044661221789696) | true | `/test pull-machine-controller-e2e-vsphere`
pull-machine-controller-e2e-azure | 1799b143cfd93eceaf0b6fff3f5a472da808db06 | [link](https://public-prow.loodse.com/view/gs/prow-dev-public-data/pr-logs/pull/kubermatic_machine-controller/1447/pull-machine-controller-e2e-azure/1575040040042500096) | true | `/test pull-machine-controller-e2e-azure`

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

<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: @kubermatic-bot: 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-vsphere | 1799b143cfd93eceaf0b6fff3f5a472da808db06 | [link](https://public-prow.loodse.com/view/gs/prow-dev-public-data/pr-logs/pull/kubermatic_machine-controller/1447/pull-machine-controller-e2e-vsphere/1575044661221789696) | true | `/test pull-machine-controller-e2e-vsphere`
pull-machine-controller-e2e-azure | 1799b143cfd93eceaf0b6fff3f5a472da808db06 | [link](https://public-prow.loodse.com/view/gs/prow-dev-public-data/pr-logs/pull/kubermatic_machine-controller/1447/pull-machine-controller-e2e-azure/1575040040042500096) | true | `/test pull-machine-controller-e2e-azure`
pull-machine-controller-e2e-aws-arm | 1799b143cfd93eceaf0b6fff3f5a472da808db06 | [link](https://public-prow.loodse.com/view/gs/prow-dev-public-data/pr-logs/pull/kubermatic_machine-controller/1447/pull-machine-controller-e2e-aws-arm/1575040034858340352) | true | `/test pull-machine-controller-e2e-aws-arm`

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

<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 -->

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 6d8ccc61..1e4771c2 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 479ab18d..2ad4ff6d 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 1610437f..e35494f6 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 0d66983a..922a6ed8 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 a9cce76c..ed355d2a 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 af4f8c66..aefae9f2 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 1af4fa12..dffd822e 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 9830772b..8e5b5c07 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 990b382d..65a80a0c 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 a391452d..6a0226e6 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 89cba1ba..b2526486 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 d664973d..d75d338b 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 45df41d5..9544e51a 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 c22c6a5e..58b811e0 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 588b2f68..95085d92 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 3c100fa6..f1557e32 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 49e9b76b..09129997 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 5561c339..78711e5c 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 45c84c42..6fd08b17 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 0a0256bf..a831be49 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 082b3f08..8930d106 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 82ee0fe2..cf8ae817 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 53419263..3b1a9d83 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 1b715e6e..503d1760 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 78ba4008..fc8d43f2 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 3f6a48f7..4be791fa 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 49a36052..af1412ec 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 4518cb75..3496e935 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 e672ac70..abb230e9 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 669c1f32..aaf86d14 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 edc0823a..37d989cf 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 8f5aec7c..03ee6a2f 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 eab425d4..ec1584ea 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 48742ea5..7203ad2e 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 2d72cede..504462f0 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 17faf81e..ba44d5e0 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 a6c40fee..98473754 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 edc0823a..37d989cf 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 376cf3c9..1a55ae1f 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 c6f71837..d24a844b 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 61136e44..d74c9ac5 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 9c9e30e7..18624f61 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 0122c00d..3a93caa7 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
diff --git a/test/e2e/provisioning/testdata/machinedeployment-vsphere-datastore-cluster.yaml b/test/e2e/provisioning/testdata/machinedeployment-vsphere-datastore-cluster.yaml
index 743faff4..d12fd854 100644
--- a/test/e2e/provisioning/testdata/machinedeployment-vsphere-datastore-cluster.yaml
+++ b/test/e2e/provisioning/testdata/machinedeployment-vsphere-datastore-cluster.yaml
@@ -35,6 +35,7 @@ spec:
             cpus: 2
             MemoryMB: 2048
             diskSizeGB: << DISK_SIZE >>
+            allowInsecure: true
           operatingSystem: "<< OS_NAME >>"
           operatingSystemSpec:
             distUpgradeOnBoot: false
diff --git a/test/e2e/provisioning/testdata/machinedeployment-vsphere-resource-pool.yaml b/test/e2e/provisioning/testdata/machinedeployment-vsphere-resource-pool.yaml
index 13d8af42..47bc4b94 100644
--- a/test/e2e/provisioning/testdata/machinedeployment-vsphere-resource-pool.yaml
+++ b/test/e2e/provisioning/testdata/machinedeployment-vsphere-resource-pool.yaml
@@ -35,6 +35,7 @@ spec:
             cpus: 2
             MemoryMB: 2048
             diskSizeGB: << DISK_SIZE >>
+            allowInsecure: true
           operatingSystem: "<< OS_NAME >>"
           operatingSystemSpec:
             distUpgradeOnBoot: false
diff --git a/test/e2e/provisioning/testdata/machinedeployment-vsphere.yaml b/test/e2e/provisioning/testdata/machinedeployment-vsphere.yaml
index e14f7f4a..bd22937c 100644
--- a/test/e2e/provisioning/testdata/machinedeployment-vsphere.yaml
+++ b/test/e2e/provisioning/testdata/machinedeployment-vsphere.yaml
@@ -35,6 +35,7 @@ spec:
             cpus: 2
             MemoryMB: 4096
             diskSizeGB: << DISK_SIZE >>
+            allowInsecure: true
           operatingSystem: "<< OS_NAME >>"
           operatingSystemSpec:
             distUpgradeOnBoot: false