Skip to content

Commit 2b27bd0

Browse files
authored
Upgrade default ubuntu version to 20.04 LTS (#1062)
* upgrade default ubuntu image to 20.04 in aws Signed-off-by: Moath Qasim <[email protected]> * upgrade default ubuntu image to 20.04 in gce Signed-off-by: Moath Qasim <[email protected]> * upgrade default ubuntu image to 20.04 in openstack Signed-off-by: Moath Qasim <[email protected]> * upgrade default ubuntu image to 20.04 in alicloud, azure, do, hetzner and packet Signed-off-by: Moath Qasim <[email protected]> * change aws ebs test name Signed-off-by: Moath Qasim <[email protected]> * fixing aws ebs, openstack and packet tests Signed-off-by: Moath Qasim <[email protected]> * fixing machine deployment update Signed-off-by: Moath Qasim <[email protected]>
1 parent 8356e1c commit 2b27bd0

File tree

10 files changed

+17
-20
lines changed

10 files changed

+17
-20
lines changed

.prow.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -649,7 +649,7 @@ presubmits:
649649
command:
650650
- "./hack/ci-e2e-test.sh"
651651
args:
652-
- "TestAWSProvisioningE2EWithEbsEncryptionEnabled"
652+
- "TestAWSEbsEncryptionEnabledProvisioningE2E"
653653
resources:
654654
requests:
655655
memory: 1Gi

pkg/cloudprovider/provider/alibaba/provider.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ import (
4444
const (
4545
machineUIDTag = "machine_uid"
4646
centosImageName = "CentOS 7.7 64 bit"
47-
ubuntuImageName = "Ubuntu 18.04 64 bit"
47+
ubuntuImageName = "Ubuntu 20.04 64 bit"
4848

4949
finalizerInstance = "kubermatic.io/cleanup-alibaba-instance"
5050
)

pkg/cloudprovider/provider/aws/provider.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ var (
109109
},
110110
providerconfigtypes.OperatingSystemUbuntu: {
111111
// Be as precise as possible - otherwise we might get a nightly dev build
112-
description: "Canonical, Ubuntu, 18.04 LTS, amd64 bionic image build on ????-??-??",
112+
description: "Canonical, Ubuntu, 20.04 LTS, amd64 focal image build on ????-??-??",
113113
// The AWS marketplace ID from Canonical
114114
owner: "099720109477",
115115
},

pkg/cloudprovider/provider/azure/provider.go

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -126,12 +126,9 @@ var imageReferences = map[providerconfigtypes.OperatingSystem]compute.ImageRefer
126126
},
127127
providerconfigtypes.OperatingSystemUbuntu: {
128128
Publisher: to.StringPtr("Canonical"),
129-
Offer: to.StringPtr("UbuntuServer"),
130-
// FIXME We'd like to use Ubuntu 18.04 eventually, but the docker's release
131-
// deb repo for `bionic` is empty, and we use `$RELEASE` in userdata.
132-
// Either Docker needs to fix their repo, or we need to hardcode `xenial`.
133-
Sku: to.StringPtr("18.04-LTS"),
134-
Version: to.StringPtr("latest"),
129+
Offer: to.StringPtr("0001-com-ubuntu-server-focal"),
130+
Sku: to.StringPtr("20_04-lts"),
131+
Version: to.StringPtr("latest"),
135132
},
136133
providerconfigtypes.OperatingSystemRHEL: {
137134
Publisher: to.StringPtr("RedHat"),

pkg/cloudprovider/provider/digitalocean/provider.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ func (t *TokenSource) Token() (*oauth2.Token, error) {
8585
func getSlugForOS(os providerconfigtypes.OperatingSystem) (string, error) {
8686
switch os {
8787
case providerconfigtypes.OperatingSystemUbuntu:
88-
return "ubuntu-18-04-x64", nil
88+
return "ubuntu-20-04-x64", nil
8989
case providerconfigtypes.OperatingSystemCentOS:
9090
return "centos-7-x64", nil
9191
}

pkg/cloudprovider/provider/gce/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ var imageProjects = map[providerconfigtypes.OperatingSystem]string{
4848

4949
// imageFamilies maps the OS to the Google Cloud image projects
5050
var imageFamilies = map[providerconfigtypes.OperatingSystem]string{
51-
providerconfigtypes.OperatingSystemUbuntu: "ubuntu-1804-lts",
51+
providerconfigtypes.OperatingSystemUbuntu: "ubuntu-2004-lts",
5252
}
5353

5454
// diskTypes are the disk types of the Google Cloud. Map is used for

pkg/cloudprovider/provider/hetzner/provider.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ type Config struct {
6868
func getNameForOS(os providerconfigtypes.OperatingSystem) (string, error) {
6969
switch os {
7070
case providerconfigtypes.OperatingSystemUbuntu:
71-
return "ubuntu-18.04", nil
71+
return "ubuntu-20.04", nil
7272
case providerconfigtypes.OperatingSystemCentOS:
7373
return "centos-7", nil
7474
}

pkg/cloudprovider/provider/packet/provider.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,7 @@ func getDeviceByTag(client *packngo.Client, projectID, tag string) (*packngo.Dev
428428
func getNameForOS(os providerconfigtypes.OperatingSystem) (string, error) {
429429
switch os {
430430
case providerconfigtypes.OperatingSystemUbuntu:
431-
return "ubuntu_18_04", nil
431+
return "ubuntu_20_04", nil
432432
case providerconfigtypes.OperatingSystemCentOS:
433433
return "centos_7", nil
434434
case providerconfigtypes.OperatingSystemFlatcar:

test/e2e/provisioning/all_e2e_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -520,9 +520,9 @@ func TestAWSCentOS8ProvisioningE2E(t *testing.T) {
520520
runScenarios(t, selector, params, AWSManifest, fmt.Sprintf("aws-%s", *testRunIdentifier))
521521
}
522522

523-
// TestAWSProvisioningE2EWithEbsEncryptionEnabled - a test suite that exercises AWS provider with ebs encryption enabled
523+
// TestAWSEbsEncryptionEnabledProvisioningE2E - a test suite that exercises AWS provider with ebs encryption enabled
524524
// by requesting nodes with different combination of container runtime type, container runtime version and the OS flavour.
525-
func TestAWSProvisioningE2EWithEbsEncryptionEnabled(t *testing.T) {
525+
func TestAWSEbsEncryptionEnabledProvisioningE2E(t *testing.T) {
526526
t.Parallel()
527527

528528
// test data
@@ -540,8 +540,8 @@ func TestAWSProvisioningE2EWithEbsEncryptionEnabled(t *testing.T) {
540540
scenario := scenario{
541541
name: "AWS with ebs encryption enabled",
542542
osName: "ubuntu",
543-
containerRuntime: "docker",
544-
kubernetesVersion: "v1.15.6",
543+
containerRuntime: "containerd",
544+
kubernetesVersion: "v1.20.1",
545545
executor: verifyCreateAndDelete,
546546
}
547547
testScenario(t, scenario, fmt.Sprintf("aws-%s", *testRunIdentifier), params, AWSEBSEncryptedManifest, false)
@@ -685,7 +685,7 @@ func TestPacketProvisioningE2E(t *testing.T) {
685685
t.Fatal("unable to run the test suite, PACKET_PROJECT_ID environment variable cannot be empty")
686686
}
687687

688-
selector := Not(OsSelector("sles", "rhel"))
688+
selector := Not(OsSelector("sles", "rhel", "amzn2"))
689689

690690
// act
691691
params := []string{
@@ -893,7 +893,7 @@ func TestDeploymentControllerUpgradesMachineE2E(t *testing.T) {
893893
name: "MachineDeployment upgrade",
894894
osName: "ubuntu",
895895
containerRuntime: "docker",
896-
kubernetesVersion: "1.16.2",
896+
kubernetesVersion: "1.19.1",
897897
executor: verifyCreateUpdateAndDelete,
898898
}
899899
testScenario(t, scenario, *testRunIdentifier, params, HZManifest, false)

test/e2e/provisioning/helper.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ var (
4949
}
5050

5151
openStackImages = map[string]string{
52-
string(providerconfigtypes.OperatingSystemUbuntu): "machine-controller-e2e-ubuntu",
52+
string(providerconfigtypes.OperatingSystemUbuntu): "machine-controller-e2e-ubuntu-20-04",
5353
string(providerconfigtypes.OperatingSystemCentOS): "machine-controller-e2e-centos",
5454
string(providerconfigtypes.OperatingSystemRHEL): "machine-controller-e2e-rhel",
5555
string(providerconfigtypes.OperatingSystemFlatcar): "machine-controller-e2e-flatcar",

0 commit comments

Comments
 (0)