[release/v1.54] Support for Ubuntu 22.04 (#1441)

* Add support for Ubuntu 22.04 Signed-off-by: Waleed Malik <[email protected]> * Use containerd v1.5 as default when docker is selected Signed-off-by: Waleed Malik <[email protected]> Signed-off-by: Waleed Malik <[email protected]> Co-authored-by: Waleed Malik <[email protected]>
kubermatic · Sep 26, 2022 · abd0793 · abd0793
1 parent 76ef02f
commit abd0793
Show file tree

Hide file tree

Showing 48 changed files with 64 additions and 51 deletions.
diff --git a/docs/operating-system.md b/docs/operating-system.md
@@ -45,4 +45,4 @@ Machine controller may work with other OS versions that are not listed in the ta
 | RHEL | 8.x |
 | Rocky Linux | 8.5 |
 | SLES |  SLES 15 SP3 |
-| Ubuntu | 20.04 LTS |
+| Ubuntu | 20.04 LTS, 22.04 LTS |
diff --git a/pkg/cloudprovider/provider/alibaba/provider.go b/pkg/cloudprovider/provider/alibaba/provider.go
@@ -44,7 +44,7 @@ import (
 const (
 	machineUIDTag   = "machine_uid"
 	centosImageName = "CentOS  7.9 64 bit"
-	ubuntuImageName = "Ubuntu  20.04 64 bit"
+	ubuntuImageName = "Ubuntu  22.04 64 bit"
 
 	finalizerInstance = "kubermatic.io/cleanup-alibaba-instance"
 )

diff --git a/pkg/cloudprovider/provider/aws/provider.go b/pkg/cloudprovider/provider/aws/provider.go
@@ -139,13 +139,13 @@ var (
 		providerconfigtypes.OperatingSystemUbuntu: {
 			awstypes.CPUArchitectureX86_64: {
 				// Be as precise as possible - otherwise we might get a nightly dev build
-				description: "Canonical, Ubuntu, 20.04 LTS, amd64 focal image build on ????-??-??",
+				description: "Canonical, Ubuntu, 22.04 LTS, amd64 jammy image build on ????-??-??",
 				// The AWS marketplace ID from Canonical
 				owner: "099720109477",
 			},
 			awstypes.CPUArchitectureARM64: {
 				// Be as precise as possible - otherwise we might get a nightly dev build
-				description: "Canonical, Ubuntu, 20.04 LTS, arm64 focal image build on ????-??-??",
+				description: "Canonical, Ubuntu, 22.04 LTS, arm64 jammy image build on ????-??-??",
 				// The AWS marketplace ID from Canonical
 				owner: "099720109477",
 			},

diff --git a/pkg/cloudprovider/provider/azure/provider.go b/pkg/cloudprovider/provider/azure/provider.go
@@ -148,8 +148,8 @@ var imageReferences = map[providerconfigtypes.OperatingSystem]compute.ImageRefer
 	},
 	providerconfigtypes.OperatingSystemUbuntu: {
 		Publisher: to.StringPtr("Canonical"),
-		Offer:     to.StringPtr("0001-com-ubuntu-server-focal"),
-		Sku:       to.StringPtr("20_04-lts"),
+		Offer:     to.StringPtr("0001-com-ubuntu-server-jammy"),
+		Sku:       to.StringPtr("22_04-lts"),
 		Version:   to.StringPtr("latest"),
 	},
 	providerconfigtypes.OperatingSystemRHEL: {

diff --git a/pkg/cloudprovider/provider/digitalocean/provider.go b/pkg/cloudprovider/provider/digitalocean/provider.go
@@ -85,7 +85,7 @@ func (t *TokenSource) Token() (*oauth2.Token, error) {
 func getSlugForOS(os providerconfigtypes.OperatingSystem) (string, error) {
 	switch os {
 	case providerconfigtypes.OperatingSystemUbuntu:
-		return "ubuntu-20-04-x64", nil
+		return "ubuntu-22-04-x64", nil
 	case providerconfigtypes.OperatingSystemCentOS:
 		return "centos-7-x64", nil
 	case providerconfigtypes.OperatingSystemRockyLinux:

diff --git a/pkg/cloudprovider/provider/equinixmetal/provider.go b/pkg/cloudprovider/provider/equinixmetal/provider.go
@@ -471,7 +471,7 @@ func getDeviceByTag(client *packngo.Client, projectID, tag string) (*packngo.Dev
 func getNameForOS(os providerconfigtypes.OperatingSystem) (string, error) {
 	switch os {
 	case providerconfigtypes.OperatingSystemUbuntu:
-		return "ubuntu_20_04", nil
+		return "ubuntu_22_04", nil
 	case providerconfigtypes.OperatingSystemCentOS:
 		return "centos_7", nil
 	case providerconfigtypes.OperatingSystemFlatcar:

diff --git a/pkg/cloudprovider/provider/gce/config.go b/pkg/cloudprovider/provider/gce/config.go
@@ -48,7 +48,7 @@ var imageProjects = map[providerconfigtypes.OperatingSystem]string{
 
 // imageFamilies maps the OS to the Google Cloud image projects.
 var imageFamilies = map[providerconfigtypes.OperatingSystem]string{
-	providerconfigtypes.OperatingSystemUbuntu: "ubuntu-2004-lts",
+	providerconfigtypes.OperatingSystemUbuntu: "ubuntu-2204-lts",
 }
 
 // diskTypes are the disk types of the Google Cloud. Map is used for

diff --git a/pkg/cloudprovider/provider/hetzner/provider.go b/pkg/cloudprovider/provider/hetzner/provider.go
@@ -70,7 +70,7 @@ type Config struct {
 func getNameForOS(os providerconfigtypes.OperatingSystem) (string, error) {
 	switch os {
 	case providerconfigtypes.OperatingSystemUbuntu:
-		return "ubuntu-20.04", nil
+		return "ubuntu-22.04", nil
 	case providerconfigtypes.OperatingSystemCentOS:
 		return "centos-7", nil
 	case providerconfigtypes.OperatingSystemRockyLinux:

diff --git a/pkg/containerruntime/docker.go b/pkg/containerruntime/docker.go
@@ -27,7 +27,8 @@ import (
 )
 
 const (
-	DefaultDockerContainerdVersion = "1.4"
+	LegacyDockerContainerdVersion  = "1.4"
+	DefaultDockerContainerdVersion = "1.5"
 	DefaultDockerVersion           = "20.10"
 	LegacyDockerVersion            = "19.03"
 )
@@ -89,6 +90,7 @@ func (eng *Docker) ScriptFor(os types.OperatingSystem) (string, error) {
 
 	switch os {
 	case types.OperatingSystemAmazonLinux2:
+		args.ContainerdVersion = LegacyDockerContainerdVersion
 		err := dockerAmazonTemplate.Execute(&buf, args)
 		return buf.String(), err
 	case types.OperatingSystemCentOS, types.OperatingSystemRHEL, types.OperatingSystemRockyLinux:

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.4* \
+        containerd.io-1.5* \
         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.4* \
+        containerd.io-1.5* \
         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.4* \
+        containerd.io-1.5* \
         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.4* \
+        containerd.io-1.5* \
         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.4* \
+        containerd.io-1.5* \
         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.4* \
+        containerd.io-1.5* \
         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.4* \
+        containerd.io-1.5* \
         docker-ce-20.10* \
         yum-plugin-versionlock
     yum versionlock add docker-ce* containerd.io

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.4* \
+        containerd.io-1.5* \
         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.4* \
+        containerd.io-1.5* \
         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.4* \
+        containerd.io-1.5* \
         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.4* \
+        containerd.io-1.5* \
         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.4* \
+        containerd.io-1.5* \
         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.4* \
+        containerd.io-1.5* \
         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.4* \
+        containerd.io-1.5* \
         docker-ce-20.10* \
         yum-plugin-versionlock
     yum versionlock add docker-ce* containerd.io

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.4* \
+        containerd.io-1.5* \
         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.4* \
+        containerd.io-1.5* \
         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.4* \
+        containerd.io-1.5* \
         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.4* \
+        containerd.io-1.5* \
         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.4* \
+        containerd.io-1.5* \
         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.4* \
+        containerd.io-1.5* \
         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.4* \
+        containerd.io-1.5* \
         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.4* \
+        containerd.io-1.5* \
         docker-ce-20.10* \
         yum-plugin-versionlock
     yum versionlock add docker-ce* containerd.io

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.4* \
+        containerd.io=1.5* \
         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.4* \
+        containerd.io=1.5* \
         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.4* \
+        containerd.io=1.5* \
         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.4* \
+        containerd.io=1.5* \
         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.4* \
+        containerd.io=1.5* \
         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.4* \
+        containerd.io=1.5* \
         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.4* \
+        containerd.io=1.5* \
         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.4* \
+        containerd.io=1.5* \
         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.4* \
+        containerd.io=1.5* \
         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.4* \
+        containerd.io=1.5* \
         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.4* \
+        containerd.io=1.5* \
         docker-ce-cli=5:20.10* \
         docker-ce=5:20.10*
     apt-mark hold docker-ce* containerd.io