From fd96b9d5c868249a14ef8e7d53705adc4968fa0f Mon Sep 17 00:00:00 2001 From: Waleed Malik Date: Wed, 28 Sep 2022 19:28:21 +0500 Subject: [PATCH] Update containerd to 1.6 (#2388) Signed-off-by: Waleed Malik Signed-off-by: Waleed Malik --- go.mod | 2 +- go.sum | 4 ++-- pkg/scripts/funcs.go | 2 +- pkg/scripts/testdata/TestKubeadmCentOS-force.golden | 2 +- .../testdata/TestKubeadmCentOS-overwrite_registry.golden | 2 +- .../TestKubeadmCentOS-overwrite_registry_insecure.golden | 2 +- pkg/scripts/testdata/TestKubeadmCentOS-proxy.golden | 2 +- pkg/scripts/testdata/TestKubeadmCentOS-simple.golden | 2 +- pkg/scripts/testdata/TestKubeadmCentOS-with_containerd.golden | 2 +- ...ubeadmCentOS-with_containerd_with_insecure_registry.golden | 2 +- .../testdata/TestKubeadmDebian-overwrite_registry.golden | 2 +- .../TestKubeadmDebian-overwrite_registry_insecure.golden | 2 +- pkg/scripts/testdata/TestKubeadmDebian-simple.golden | 2 +- pkg/scripts/testdata/TestKubeadmDebian-with_containerd.golden | 2 +- ...ubeadmDebian-with_containerd_with_insecure_registry.golden | 2 +- pkg/scripts/testdata/TestUpgradeKubeadmAndCNICentOS.golden | 2 +- pkg/scripts/testdata/TestUpgradeKubeadmAndCNIDebian.golden | 2 +- .../testdata/TestUpgradeKubeletAndKubectlCentOS.golden | 2 +- .../testdata/TestUpgradeKubeletAndKubectlDebian.golden | 2 +- pkg/templates/images/images.go | 4 ++-- 20 files changed, 22 insertions(+), 22 deletions(-) diff --git a/go.mod b/go.mod index 127e41c61..39a42b4a0 100644 --- 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 index 84ba2b92b..3383567cf 100644 --- 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 index ad5725b8e..658390489 100644 --- 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 index c92104d25..a9b607141 100644 --- 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 index 383abc7b2..cca94eb04 100644 --- 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 index 37fc0b5df..d33341ef4 100644 --- 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 index 11d5062c3..0dd5efa38 100644 --- 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 index 383abc7b2..cca94eb04 100644 --- 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 index 7299468f3..5fdb124eb 100644 --- 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 index 619d227a7..d9857aeb8 100644 --- 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 index fa6585aed..6453b354c 100644 --- 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 index 286dedc54..51f181511 100644 --- 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 index fa6585aed..6453b354c 100644 --- 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 index 5954601a3..d78364e99 100644 --- 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 index 35c940209..8c78eff1a 100644 --- 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 index 2d58f9682..ad51891e9 100644 --- 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 index 7072a2c25..60207b581 100644 --- 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 index 9ac97e7bf..6165597fc 100644 --- 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 index de5b40e19..e9b767550 100644 --- 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 index e85051651..2c2c3cd8c 100644 --- 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"}, } }