Update containerd to 1.6 (#2388)

Signed-off-by: Waleed Malik <[email protected]> Signed-off-by: Waleed Malik <[email protected]>
kubermatic · Sep 28, 2022 · fd96b9d · fd96b9d
1 parent 45703d4
commit fd96b9d
Show file tree

Hide file tree

Showing 20 changed files with 22 additions and 22 deletions.
diff --git a/go.mod b/go.mod
@@ -13,7 +13,7 @@ require (
 	github.com/iancoleman/orderedmap v0.2.0
 	github.com/imdario/mergo v0.3.13
 	github.com/koron-go/prefixw v0.0.0-20181013140428-271b207a7572
-	github.com/kubermatic/machine-controller v1.54.0
+	github.com/kubermatic/machine-controller v1.54.2
 	github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de
 	github.com/pkg/errors v0.9.1
 	github.com/pmezard/go-difflib v1.0.0

diff --git a/go.sum b/go.sum
@@ -405,8 +405,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/kubermatic/machine-controller v1.54.0 h1:rmXEKJF4RS0iM1VasQqoKJe/wjER9TRnqactdJbuavs=
-github.com/kubermatic/machine-controller v1.54.0/go.mod h1:63KnO0rPfNOrIipMH3V/8BwoqZXOShzrGdqRFnKhsU0=
+github.com/kubermatic/machine-controller v1.54.2 h1:jBJcprWEx5xhlkXqN5AQ8Tqc2bxgm6vi/NROB0wJB88=
+github.com/kubermatic/machine-controller v1.54.2/go.mod h1:63KnO0rPfNOrIipMH3V/8BwoqZXOShzrGdqRFnKhsU0=
 github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhnIaL+V+BEER86oLrvS+kWobKpbJuye0=
 github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE=
 github.com/lithammer/dedent v1.1.0/go.mod h1:jrXYCQtgg0nJiN+StA2KgR7w6CiQNv9Fd/Z9BP0jIOc=

diff --git a/pkg/scripts/funcs.go b/pkg/scripts/funcs.go
@@ -86,6 +86,6 @@ var (
 
 const (
 	latestDockerVersion            = "'20.10.*'"
-	defaultContainerdVersion       = "'1.5.*'"
+	defaultContainerdVersion       = "'1.6.*'"
 	defaultAmazonContainerdVersion = "'1.4.*'"
 )
diff --git a/pkg/scripts/testdata/TestKubeadmCentOS-force.golden b/pkg/scripts/testdata/TestKubeadmCentOS-force.golden
@@ -91,7 +91,7 @@ sudo yum versionlock delete docker-ce docker-ce-cli containerd.io || true
 sudo yum install -y \
 	docker-ce-'20.10.*' \
 	docker-ce-cli-'20.10.*' \
-	containerd.io-'1.5.*'
+	containerd.io-'1.6.*'
 sudo yum versionlock add docker-ce docker-ce-cli containerd.io
 
 sudo mkdir -p $(dirname /etc/docker/daemon.json)

diff --git a/pkg/scripts/testdata/TestKubeadmCentOS-overwrite_registry.golden b/pkg/scripts/testdata/TestKubeadmCentOS-overwrite_registry.golden
@@ -91,7 +91,7 @@ sudo yum versionlock delete docker-ce docker-ce-cli containerd.io || true
 sudo yum install -y \
 	docker-ce-'20.10.*' \
 	docker-ce-cli-'20.10.*' \
-	containerd.io-'1.5.*'
+	containerd.io-'1.6.*'
 sudo yum versionlock add docker-ce docker-ce-cli containerd.io
 
 sudo mkdir -p $(dirname /etc/docker/daemon.json)

diff --git a/pkg/scripts/testdata/TestKubeadmCentOS-overwrite_registry_insecure.golden b/pkg/scripts/testdata/TestKubeadmCentOS-overwrite_registry_insecure.golden
@@ -91,7 +91,7 @@ sudo yum versionlock delete docker-ce docker-ce-cli containerd.io || true
 sudo yum install -y \
 	docker-ce-'20.10.*' \
 	docker-ce-cli-'20.10.*' \
-	containerd.io-'1.5.*'
+	containerd.io-'1.6.*'
 sudo yum versionlock add docker-ce docker-ce-cli containerd.io
 
 sudo mkdir -p $(dirname /etc/docker/daemon.json)

diff --git a/pkg/scripts/testdata/TestKubeadmCentOS-proxy.golden b/pkg/scripts/testdata/TestKubeadmCentOS-proxy.golden
@@ -91,7 +91,7 @@ sudo yum versionlock delete docker-ce docker-ce-cli containerd.io || true
 sudo yum install -y \
 	docker-ce-'20.10.*' \
 	docker-ce-cli-'20.10.*' \
-	containerd.io-'1.5.*'
+	containerd.io-'1.6.*'
 sudo yum versionlock add docker-ce docker-ce-cli containerd.io
 
 sudo mkdir -p $(dirname /etc/docker/daemon.json)

diff --git a/pkg/scripts/testdata/TestKubeadmCentOS-simple.golden b/pkg/scripts/testdata/TestKubeadmCentOS-simple.golden
@@ -91,7 +91,7 @@ sudo yum versionlock delete docker-ce docker-ce-cli containerd.io || true
 sudo yum install -y \
 	docker-ce-'20.10.*' \
 	docker-ce-cli-'20.10.*' \
-	containerd.io-'1.5.*'
+	containerd.io-'1.6.*'
 sudo yum versionlock add docker-ce docker-ce-cli containerd.io
 
 sudo mkdir -p $(dirname /etc/docker/daemon.json)

diff --git a/pkg/scripts/testdata/TestKubeadmCentOS-with_containerd.golden b/pkg/scripts/testdata/TestKubeadmCentOS-with_containerd.golden
@@ -90,7 +90,7 @@ sudo yum-config-manager --save --setopt=docker-ce-stable.module_hotfixes=true
 
 
 sudo yum versionlock delete containerd.io || true
-sudo yum install -y containerd.io-'1.5.*'
+sudo yum install -y containerd.io-'1.6.*'
 sudo yum versionlock add containerd.io
 
 

diff --git a/pkg/scripts/testdata/TestKubeadmCentOS-with_containerd_with_insecure_registry.golden b/pkg/scripts/testdata/TestKubeadmCentOS-with_containerd_with_insecure_registry.golden
@@ -90,7 +90,7 @@ sudo yum-config-manager --save --setopt=docker-ce-stable.module_hotfixes=true
 
 
 sudo yum versionlock delete containerd.io || true
-sudo yum install -y containerd.io-'1.5.*'
+sudo yum install -y containerd.io-'1.6.*'
 sudo yum versionlock add containerd.io
 
 

diff --git a/pkg/scripts/testdata/TestKubeadmDebian-overwrite_registry.golden b/pkg/scripts/testdata/TestKubeadmDebian-overwrite_registry.golden
@@ -87,7 +87,7 @@ sudo DEBIAN_FRONTEND=noninteractive apt-get install \
 	-y \
 	docker-ce=5:'20.10.*' \
 	docker-ce-cli=5:'20.10.*' \
-	containerd.io='1.5.*'
+	containerd.io='1.6.*'
 sudo apt-mark hold docker-ce docker-ce-cli containerd.io
 
 sudo mkdir -p $(dirname /etc/docker/daemon.json)

diff --git a/pkg/scripts/testdata/TestKubeadmDebian-overwrite_registry_insecure.golden b/pkg/scripts/testdata/TestKubeadmDebian-overwrite_registry_insecure.golden
@@ -87,7 +87,7 @@ sudo DEBIAN_FRONTEND=noninteractive apt-get install \
 	-y \
 	docker-ce=5:'20.10.*' \
 	docker-ce-cli=5:'20.10.*' \
-	containerd.io='1.5.*'
+	containerd.io='1.6.*'
 sudo apt-mark hold docker-ce docker-ce-cli containerd.io
 
 sudo mkdir -p $(dirname /etc/docker/daemon.json)

diff --git a/pkg/scripts/testdata/TestKubeadmDebian-simple.golden b/pkg/scripts/testdata/TestKubeadmDebian-simple.golden
@@ -87,7 +87,7 @@ sudo DEBIAN_FRONTEND=noninteractive apt-get install \
 	-y \
 	docker-ce=5:'20.10.*' \
 	docker-ce-cli=5:'20.10.*' \
-	containerd.io='1.5.*'
+	containerd.io='1.6.*'
 sudo apt-mark hold docker-ce docker-ce-cli containerd.io
 
 sudo mkdir -p $(dirname /etc/docker/daemon.json)

diff --git a/pkg/scripts/testdata/TestKubeadmDebian-with_containerd.golden b/pkg/scripts/testdata/TestKubeadmDebian-with_containerd.golden
@@ -84,7 +84,7 @@ sudo DEBIAN_FRONTEND=noninteractive apt-get install \
 	--option "Dpkg::Options::=--force-confold" \
 	--no-install-recommends \
 	-y \
-	containerd.io='1.5.*'
+	containerd.io='1.6.*'
 sudo apt-mark hold containerd.io
 
 

diff --git a/pkg/scripts/testdata/TestKubeadmDebian-with_containerd_with_insecure_registry.golden b/pkg/scripts/testdata/TestKubeadmDebian-with_containerd_with_insecure_registry.golden
@@ -84,7 +84,7 @@ sudo DEBIAN_FRONTEND=noninteractive apt-get install \
 	--option "Dpkg::Options::=--force-confold" \
 	--no-install-recommends \
 	-y \
-	containerd.io='1.5.*'
+	containerd.io='1.6.*'
 sudo apt-mark hold containerd.io
 
 

diff --git a/pkg/scripts/testdata/TestUpgradeKubeadmAndCNICentOS.golden b/pkg/scripts/testdata/TestUpgradeKubeadmAndCNICentOS.golden
@@ -91,7 +91,7 @@ sudo yum versionlock delete docker-ce docker-ce-cli containerd.io || true
 sudo yum install -y \
 	docker-ce-'20.10.*' \
 	docker-ce-cli-'20.10.*' \
-	containerd.io-'1.5.*'
+	containerd.io-'1.6.*'
 sudo yum versionlock add docker-ce docker-ce-cli containerd.io
 
 sudo mkdir -p $(dirname /etc/docker/daemon.json)

diff --git a/pkg/scripts/testdata/TestUpgradeKubeadmAndCNIDebian.golden b/pkg/scripts/testdata/TestUpgradeKubeadmAndCNIDebian.golden
@@ -88,7 +88,7 @@ sudo DEBIAN_FRONTEND=noninteractive apt-get install \
 	-y \
 	docker-ce=5:'20.10.*' \
 	docker-ce-cli=5:'20.10.*' \
-	containerd.io='1.5.*'
+	containerd.io='1.6.*'
 sudo apt-mark hold docker-ce docker-ce-cli containerd.io
 
 sudo mkdir -p $(dirname /etc/docker/daemon.json)

diff --git a/pkg/scripts/testdata/TestUpgradeKubeletAndKubectlCentOS.golden b/pkg/scripts/testdata/TestUpgradeKubeletAndKubectlCentOS.golden
@@ -91,7 +91,7 @@ sudo yum versionlock delete docker-ce docker-ce-cli containerd.io || true
 sudo yum install -y \
 	docker-ce-'20.10.*' \
 	docker-ce-cli-'20.10.*' \
-	containerd.io-'1.5.*'
+	containerd.io-'1.6.*'
 sudo yum versionlock add docker-ce docker-ce-cli containerd.io
 
 sudo mkdir -p $(dirname /etc/docker/daemon.json)

diff --git a/pkg/scripts/testdata/TestUpgradeKubeletAndKubectlDebian.golden b/pkg/scripts/testdata/TestUpgradeKubeletAndKubectlDebian.golden
@@ -88,7 +88,7 @@ sudo DEBIAN_FRONTEND=noninteractive apt-get install \
 	-y \
 	docker-ce=5:'20.10.*' \
 	docker-ce-cli=5:'20.10.*' \
-	containerd.io='1.5.*'
+	containerd.io='1.6.*'
 sudo apt-mark hold docker-ce docker-ce-cli containerd.io
 
 sudo mkdir -p $(dirname /etc/docker/daemon.json)

diff --git a/pkg/templates/images/images.go b/pkg/templates/images/images.go
@@ -215,9 +215,9 @@ func baseResources() map[Resource]map[string]string {
 		CalicoNode:             {"*": "quay.io/calico/node:v3.23.3"},
 		DNSNodeCache:           {"*": "registry.k8s.io/dns/k8s-dns-node-cache:1.21.1"},
 		Flannel:                {"*": "quay.io/coreos/flannel:v0.15.1"},
-		MachineController:      {"*": "quay.io/kubermatic/machine-controller:v1.54.1"},
+		MachineController:      {"*": "quay.io/kubermatic/machine-controller:v1.54.2"},
 		MetricsServer:          {"*": "k8s.gcr.io/metrics-server/metrics-server:v0.6.1"},
-		OperatingSystemManager: {"*": "quay.io/kubermatic/operating-system-manager:v1.0.0"},
+		OperatingSystemManager: {"*": "quay.io/kubermatic/operating-system-manager:v1.1.1"},
 	}
 }