diff --git a/docs/operating-system.md b/docs/operating-system.md index beb70e6e6..93f16a872 100644 --- 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 | \ No newline at end of file +| Ubuntu | 20.04 LTS, 22.04 LTS | diff --git a/pkg/cloudprovider/provider/alibaba/provider.go b/pkg/cloudprovider/provider/alibaba/provider.go index 3b4f773f9..f70d42c45 100644 --- 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 index 8b96c6b4d..6bc448c40 100644 --- 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 index a68813d8e..b88f54c69 100644 --- 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 index fbb121f6f..6f4a9a6c4 100644 --- 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 index 0fd67b6c8..2c290450e 100644 --- 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 index 934adca06..9901b7af7 100644 --- 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 index 23c4dddfe..9c385e809 100644 --- 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 index e79920d7b..c8973e625 100644 --- 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 index 92555b815..6d8ccc610 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.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 index da8f203ec..479ab18df 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.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 index bcb8c3ade..1610437f1 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.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 index ad28ad691..0d66983a4 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.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 index 11c411561..a9cce76cb 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.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 index 8cc2eb137..af4f8c66e 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.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 index aee1a886d..1af4fa125 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.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 index dbdb97a14..11ead7d42 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.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 index 82ee10299..733fe615c 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.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 index 98a5f9b61..286031fa6 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.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 index deeef0ad8..8625265ee 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.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 index 749268ce1..930ffddc6 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.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 index 1ec73c6a7..a7edd8cc1 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.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 index 49a601c3d..05f164b99 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.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 index 0a661c056..0e1dcc3ce 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.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 index 2b58e6cc7..67b65185a 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.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 index fb1eafba0..5fef11bd5 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.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 index e3082bbfc..a61c42f23 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.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 index 721b11943..5a926bf22 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.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 index 14cb1eabc..91c283fa0 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.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 index 9273d0b8e..837ba90b6 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.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 index 75d43c26f..0216d0958 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.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 index d76ac8ad9..4518cb757 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.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 index 72876104d..e672ac706 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.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 index 0f2ee1524..669c1f325 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.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 index 77428740e..edc0823a9 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.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 index f0d5f55f0..8f5aec7cf 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.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 index dc18f0a19..eab425d46 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.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 index 58c16ae1f..48742ea5d 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.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 index 77904a297..2d72cede6 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.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 index 3866be991..17faf81eb 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.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 index 6725d1b9b..a6c40fee2 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.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 index 77428740e..edc0823a9 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.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.23.5.yaml b/pkg/userdata/ubuntu/testdata/version-1.23.5.yaml index d05672a00..376cf3c98 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.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/vsphere-mirrors.yaml b/pkg/userdata/ubuntu/testdata/vsphere-mirrors.yaml index be7f75f56..61136e44d 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.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/vsphere-proxy.yaml b/pkg/userdata/ubuntu/testdata/vsphere-proxy.yaml index 7dfa8d510..9c9e30e75 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.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/vsphere.yaml b/pkg/userdata/ubuntu/testdata/vsphere.yaml index f73e59b71..0122c00da 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.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/test/e2e/provisioning/helper.go b/test/e2e/provisioning/helper.go index 39812773a..3c8bc9f2e 100644 --- a/test/e2e/provisioning/helper.go +++ b/test/e2e/provisioning/helper.go @@ -49,7 +49,7 @@ var ( } openStackImages = map[string]string{ - string(providerconfigtypes.OperatingSystemUbuntu): "machine-controller-e2e-ubuntu-20-04", + string(providerconfigtypes.OperatingSystemUbuntu): "kubermatic-ubuntu", string(providerconfigtypes.OperatingSystemCentOS): "machine-controller-e2e-centos", string(providerconfigtypes.OperatingSystemRHEL): "machine-controller-e2e-rhel-8-5", string(providerconfigtypes.OperatingSystemFlatcar): "machine-controller-e2e-flatcar-stable-2983", @@ -61,7 +61,15 @@ var ( string(providerconfigtypes.OperatingSystemFlatcar): "kkp-flatcar-3033.2.2", string(providerconfigtypes.OperatingSystemRHEL): "kkp-rhel-8.6", string(providerconfigtypes.OperatingSystemRockyLinux): "kkp-rockylinux-8", - string(providerconfigtypes.OperatingSystemUbuntu): "kkp-ubuntu-20.04", + string(providerconfigtypes.OperatingSystemUbuntu): "kkp-ubuntu-22.04", + } + + kubevirtImages = map[string]string{ + string(providerconfigtypes.OperatingSystemCentOS): "centos", + string(providerconfigtypes.OperatingSystemFlatcar): "flatcar", + string(providerconfigtypes.OperatingSystemRHEL): "rhel", + string(providerconfigtypes.OperatingSystemRockyLinux): "rockylinux", + string(providerconfigtypes.OperatingSystemUbuntu): "ubuntu-22.04", } ) @@ -237,6 +245,9 @@ func testScenario(t *testing.T, testCase scenario, cloudProvider string, testPar // only use by vSphere scenarios scenarioParams = append(scenarioParams, fmt.Sprintf("<< OS_Image_Template >>=%s", vSphereOSImageTemplates[testCase.osName])) + // only use by KubeVirt scenarios + scenarioParams = append(scenarioParams, fmt.Sprintf("<< KUBEVIRT_OS_IMAGE >>=%s", kubevirtImages[testCase.osName])) + // default kubeconfig to the hardcoded path at which `make e2e-cluster` creates its new kubeconfig gopath := os.Getenv("GOPATH") projectDir := filepath.Join(gopath, "src/github.com/kubermatic/machine-controller") diff --git a/test/e2e/provisioning/testdata/machinedeployment-kubevirt.yaml b/test/e2e/provisioning/testdata/machinedeployment-kubevirt.yaml index 5c66b5622..37c585d33 100644 --- a/test/e2e/provisioning/testdata/machinedeployment-kubevirt.yaml +++ b/test/e2e/provisioning/testdata/machinedeployment-kubevirt.yaml @@ -34,7 +34,7 @@ spec: cpus: "1" memory: "4096M" primaryDisk: - osImage: http://image-repo.kube-system.svc.cluster.local/images/<< OS_NAME >>.img + osImage: http://image-repo.kube-system.svc.cluster.local/images/<< KUBEVIRT_OS_IMAGE >>.img size: "25Gi" storageClassName: longhorn dnsPolicy: "None"