From 71b93587f8e0255c26af9c15bcf5b26fe1a41449 Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Sun, 25 Apr 2021 09:00:23 +0300 Subject: [PATCH 1/2] Promote channel alpha to stable --- channels/stable | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/channels/stable b/channels/stable index b7fd4fd9b9..d70db9d926 100644 --- a/channels/stable +++ b/channels/stable @@ -88,13 +88,13 @@ spec: kubenet: {} kubernetesVersions: - range: ">=1.20.0" - recommendedVersion: 1.20.5 + recommendedVersion: 1.20.6 requiredVersion: 1.20.0 - range: ">=1.19.0" - recommendedVersion: 1.19.9 + recommendedVersion: 1.19.10 requiredVersion: 1.19.0 - range: ">=1.18.0" - recommendedVersion: 1.18.17 + recommendedVersion: 1.18.18 requiredVersion: 1.18.0 - range: ">=1.17.0" recommendedVersion: 1.17.17 @@ -122,27 +122,27 @@ spec: requiredVersion: 1.11.10 kopsVersions: - range: ">=1.20.0-alpha.1" - #recommendedVersion: "1.19.0-beta.3" + recommendedVersion: "1.20.0" #requiredVersion: 1.20.0 - kubernetesVersion: 1.20.5 - - range: ">=1.19.0-beta.3" - #recommendedVersion: "1.19.0-beta.3" + kubernetesVersion: 1.20.6 + - range: ">=1.19.0-alpha.1" + recommendedVersion: "1.20.0" #requiredVersion: 1.19.0 - kubernetesVersion: 1.19.9 + kubernetesVersion: 1.19.10 - range: ">=1.18.0-alpha.1" - recommendedVersion: "1.18.2" + recommendedVersion: "1.20.0" #requiredVersion: 1.18.0 - kubernetesVersion: 1.18.17 + kubernetesVersion: 1.18.18 - range: ">=1.17.0-alpha.1" - recommendedVersion: "1.18.2" + recommendedVersion: "1.20.0" #requiredVersion: 1.17.0 kubernetesVersion: 1.17.17 - range: ">=1.16.0-alpha.1" - recommendedVersion: "1.18.2" + recommendedVersion: "1.20.0" #requiredVersion: 1.16.0 kubernetesVersion: 1.16.15 - range: ">=1.15.0-alpha.1" - recommendedVersion: "1.18.2" + recommendedVersion: "1.20.0" #requiredVersion: 1.15.0 kubernetesVersion: 1.15.12 - range: ">=1.14.0-alpha.1" From 55e154a52605e07f627ad8caff5e16745895ce39 Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Sun, 25 Apr 2021 09:10:13 +0300 Subject: [PATCH 2/2] Update Ubuntu images to latest version --- channels/alpha | 10 +++++----- channels/stable | 10 +++++----- pkg/apis/kops/channel.go | 4 ++-- .../create_cluster/complex/expected-v1alpha2.yaml | 4 ++-- .../gce_byo_sa/expected-v1alpha2.yaml | 4 ++-- .../create_cluster/ha/expected-v1alpha2.yaml | 12 ++++++------ .../ha_encrypt/expected-v1alpha2.yaml | 12 ++++++------ .../create_cluster/ha_gce/expected-v1alpha2.yaml | 12 ++++++------ .../ha_shared_zone/expected-v1alpha2.yaml | 8 ++++---- .../ha_shared_zones/expected-v1alpha2.yaml | 14 +++++++------- .../ingwspecified/expected-v1alpha2.yaml | 6 +++--- .../minimal-1.18/expected-v1alpha2.yaml | 4 ++-- .../minimal-1.19/expected-v1alpha2.yaml | 4 ++-- .../minimal-1.20/expected-v1alpha2.yaml | 4 ++-- .../minimal-1.21/expected-v1alpha2.yaml | 4 ++-- .../ngwspecified/expected-v1alpha2.yaml | 6 +++--- .../overrides/expected-v1alpha2.yaml | 4 ++-- .../create_cluster/private/expected-v1alpha2.yaml | 6 +++--- .../private_gce/expected-v1alpha2.yaml | 6 +++--- .../private_shared_subnets/expected-v1alpha2.yaml | 4 ++-- .../shared_subnets/expected-v1alpha2.yaml | 4 ++-- .../expected-v1alpha2.yaml | 4 ++-- .../shared_vpc/expected-v1alpha2.yaml | 4 ++-- 23 files changed, 75 insertions(+), 75 deletions(-) diff --git a/channels/alpha b/channels/alpha index d70db9d926..38abc92d43 100644 --- a/channels/alpha +++ b/channels/alpha @@ -58,15 +58,15 @@ spec: providerID: aws architectureID: amd64 kubernetesVersion: ">=1.17.0 <1.18.0" - - name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 + - name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415 providerID: aws architectureID: amd64 kubernetesVersion: ">=1.18.0" - - name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-arm64-server-20210325 + - name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-arm64-server-20210415 providerID: aws architectureID: arm64 kubernetesVersion: ">=1.20.0" - - name: "cos-cloud/cos-stable-65-10323-99-0" + - name: cos-cloud/cos-stable-65-10323-99-0 providerID: gce architectureID: amd64 kubernetesVersion: "<1.16.0-alpha.1" @@ -74,11 +74,11 @@ spec: providerID: gce architectureID: amd64 kubernetesVersion: ">=1.16.0 <1.18.0" - - name: "ubuntu-os-cloud/ubuntu-2004-focal-v20210325" + - name: ubuntu-os-cloud/ubuntu-2004-focal-v20210415 providerID: gce architectureID: amd64 kubernetesVersion: ">=1.18.0" - - name: "Canonical:UbuntuServer:20.04-LTS:latest" + - name: Canonical:0001-com-ubuntu-server-focal:20_04-lts-gen2:20.04.202104150 providerID: azure architectureID: amd64 kubernetesVersion: ">=1.20.0" diff --git a/channels/stable b/channels/stable index d70db9d926..38abc92d43 100644 --- a/channels/stable +++ b/channels/stable @@ -58,15 +58,15 @@ spec: providerID: aws architectureID: amd64 kubernetesVersion: ">=1.17.0 <1.18.0" - - name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 + - name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415 providerID: aws architectureID: amd64 kubernetesVersion: ">=1.18.0" - - name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-arm64-server-20210325 + - name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-arm64-server-20210415 providerID: aws architectureID: arm64 kubernetesVersion: ">=1.20.0" - - name: "cos-cloud/cos-stable-65-10323-99-0" + - name: cos-cloud/cos-stable-65-10323-99-0 providerID: gce architectureID: amd64 kubernetesVersion: "<1.16.0-alpha.1" @@ -74,11 +74,11 @@ spec: providerID: gce architectureID: amd64 kubernetesVersion: ">=1.16.0 <1.18.0" - - name: "ubuntu-os-cloud/ubuntu-2004-focal-v20210325" + - name: ubuntu-os-cloud/ubuntu-2004-focal-v20210415 providerID: gce architectureID: amd64 kubernetesVersion: ">=1.18.0" - - name: "Canonical:UbuntuServer:20.04-LTS:latest" + - name: Canonical:0001-com-ubuntu-server-focal:20_04-lts-gen2:20.04.202104150 providerID: azure architectureID: amd64 kubernetesVersion: ">=1.20.0" diff --git a/pkg/apis/kops/channel.go b/pkg/apis/kops/channel.go index f08db1813b..e9fc120de5 100644 --- a/pkg/apis/kops/channel.go +++ b/pkg/apis/kops/channel.go @@ -335,6 +335,6 @@ func (c *Channel) HasUpstreamImagePrefix(image string) bool { return strings.HasPrefix(image, "kope.io/k8s-") || strings.HasPrefix(image, "099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-") || strings.HasPrefix(image, "cos-cloud/cos-stable-") || - strings.HasPrefix(image, "ubuntu-os-cloud/ubuntu-") || - strings.HasPrefix(image, "Canonical:UbuntuServer:") + strings.HasPrefix(image, "ubuntu-os-cloud/ubuntu-2004-focal-") || + strings.HasPrefix(image, "Canonical:0001-com-ubuntu-server-focal:20_04-lts-gen2:") } diff --git a/tests/integration/create_cluster/complex/expected-v1alpha2.yaml b/tests/integration/create_cluster/complex/expected-v1alpha2.yaml index e15ab0e43e..e19e9d68bc 100644 --- a/tests/integration/create_cluster/complex/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/complex/expected-v1alpha2.yaml @@ -63,7 +63,7 @@ metadata: kops.k8s.io/cluster: complex.example.com name: master-us-test-1a spec: - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415 machineType: m3.medium maxSize: 1 minSize: 1 @@ -83,7 +83,7 @@ metadata: kops.k8s.io/cluster: complex.example.com name: nodes-us-test-1a spec: - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415 machineType: t2.medium maxSize: 1 minSize: 1 diff --git a/tests/integration/create_cluster/gce_byo_sa/expected-v1alpha2.yaml b/tests/integration/create_cluster/gce_byo_sa/expected-v1alpha2.yaml index e762025a2a..61b4e3d5af 100644 --- a/tests/integration/create_cluster/gce_byo_sa/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/gce_byo_sa/expected-v1alpha2.yaml @@ -62,7 +62,7 @@ metadata: kops.k8s.io/cluster: gce.example.com name: master-us-test1-a spec: - image: ubuntu-os-cloud/ubuntu-2004-focal-v20210325 + image: ubuntu-os-cloud/ubuntu-2004-focal-v20210415 machineType: n1-standard-1 maxSize: 1 minSize: 1 @@ -85,7 +85,7 @@ metadata: kops.k8s.io/cluster: gce.example.com name: nodes-us-test1-a spec: - image: ubuntu-os-cloud/ubuntu-2004-focal-v20210325 + image: ubuntu-os-cloud/ubuntu-2004-focal-v20210415 machineType: n1-standard-2 maxSize: 1 minSize: 1 diff --git a/tests/integration/create_cluster/ha/expected-v1alpha2.yaml b/tests/integration/create_cluster/ha/expected-v1alpha2.yaml index 55db70d833..8f73726b46 100644 --- a/tests/integration/create_cluster/ha/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ha/expected-v1alpha2.yaml @@ -83,7 +83,7 @@ metadata: kops.k8s.io/cluster: ha.example.com name: master-us-test-1a spec: - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415 machineType: m3.medium maxSize: 1 minSize: 1 @@ -103,7 +103,7 @@ metadata: kops.k8s.io/cluster: ha.example.com name: master-us-test-1b spec: - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415 machineType: m3.medium maxSize: 1 minSize: 1 @@ -123,7 +123,7 @@ metadata: kops.k8s.io/cluster: ha.example.com name: master-us-test-1c spec: - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415 machineType: m3.medium maxSize: 1 minSize: 1 @@ -143,7 +143,7 @@ metadata: kops.k8s.io/cluster: ha.example.com name: nodes-us-test-1a spec: - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415 machineType: t2.medium maxSize: 1 minSize: 1 @@ -163,7 +163,7 @@ metadata: kops.k8s.io/cluster: ha.example.com name: nodes-us-test-1b spec: - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415 machineType: t2.medium maxSize: 1 minSize: 1 @@ -183,7 +183,7 @@ metadata: kops.k8s.io/cluster: ha.example.com name: nodes-us-test-1c spec: - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415 machineType: t2.medium maxSize: 1 minSize: 1 diff --git a/tests/integration/create_cluster/ha_encrypt/expected-v1alpha2.yaml b/tests/integration/create_cluster/ha_encrypt/expected-v1alpha2.yaml index 55db70d833..8f73726b46 100644 --- a/tests/integration/create_cluster/ha_encrypt/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ha_encrypt/expected-v1alpha2.yaml @@ -83,7 +83,7 @@ metadata: kops.k8s.io/cluster: ha.example.com name: master-us-test-1a spec: - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415 machineType: m3.medium maxSize: 1 minSize: 1 @@ -103,7 +103,7 @@ metadata: kops.k8s.io/cluster: ha.example.com name: master-us-test-1b spec: - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415 machineType: m3.medium maxSize: 1 minSize: 1 @@ -123,7 +123,7 @@ metadata: kops.k8s.io/cluster: ha.example.com name: master-us-test-1c spec: - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415 machineType: m3.medium maxSize: 1 minSize: 1 @@ -143,7 +143,7 @@ metadata: kops.k8s.io/cluster: ha.example.com name: nodes-us-test-1a spec: - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415 machineType: t2.medium maxSize: 1 minSize: 1 @@ -163,7 +163,7 @@ metadata: kops.k8s.io/cluster: ha.example.com name: nodes-us-test-1b spec: - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415 machineType: t2.medium maxSize: 1 minSize: 1 @@ -183,7 +183,7 @@ metadata: kops.k8s.io/cluster: ha.example.com name: nodes-us-test-1c spec: - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415 machineType: t2.medium maxSize: 1 minSize: 1 diff --git a/tests/integration/create_cluster/ha_gce/expected-v1alpha2.yaml b/tests/integration/create_cluster/ha_gce/expected-v1alpha2.yaml index 452493365a..993a707229 100644 --- a/tests/integration/create_cluster/ha_gce/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ha_gce/expected-v1alpha2.yaml @@ -70,7 +70,7 @@ metadata: kops.k8s.io/cluster: ha-gce.example.com name: master-us-test1-a spec: - image: ubuntu-os-cloud/ubuntu-2004-focal-v20210325 + image: ubuntu-os-cloud/ubuntu-2004-focal-v20210415 machineType: n1-standard-1 maxSize: 1 minSize: 1 @@ -93,7 +93,7 @@ metadata: kops.k8s.io/cluster: ha-gce.example.com name: master-us-test1-b spec: - image: ubuntu-os-cloud/ubuntu-2004-focal-v20210325 + image: ubuntu-os-cloud/ubuntu-2004-focal-v20210415 machineType: n1-standard-1 maxSize: 1 minSize: 1 @@ -116,7 +116,7 @@ metadata: kops.k8s.io/cluster: ha-gce.example.com name: master-us-test1-c spec: - image: ubuntu-os-cloud/ubuntu-2004-focal-v20210325 + image: ubuntu-os-cloud/ubuntu-2004-focal-v20210415 machineType: n1-standard-1 maxSize: 1 minSize: 1 @@ -139,7 +139,7 @@ metadata: kops.k8s.io/cluster: ha-gce.example.com name: nodes-us-test1-a spec: - image: ubuntu-os-cloud/ubuntu-2004-focal-v20210325 + image: ubuntu-os-cloud/ubuntu-2004-focal-v20210415 machineType: n1-standard-2 maxSize: 1 minSize: 1 @@ -162,7 +162,7 @@ metadata: kops.k8s.io/cluster: ha-gce.example.com name: nodes-us-test1-b spec: - image: ubuntu-os-cloud/ubuntu-2004-focal-v20210325 + image: ubuntu-os-cloud/ubuntu-2004-focal-v20210415 machineType: n1-standard-2 maxSize: 1 minSize: 1 @@ -185,7 +185,7 @@ metadata: kops.k8s.io/cluster: ha-gce.example.com name: nodes-us-test1-c spec: - image: ubuntu-os-cloud/ubuntu-2004-focal-v20210325 + image: ubuntu-os-cloud/ubuntu-2004-focal-v20210415 machineType: n1-standard-2 maxSize: 1 minSize: 1 diff --git a/tests/integration/create_cluster/ha_shared_zone/expected-v1alpha2.yaml b/tests/integration/create_cluster/ha_shared_zone/expected-v1alpha2.yaml index 23b18d2faf..6cd299b977 100644 --- a/tests/integration/create_cluster/ha_shared_zone/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ha_shared_zone/expected-v1alpha2.yaml @@ -75,7 +75,7 @@ metadata: kops.k8s.io/cluster: ha.example.com name: master-us-test-1a-1 spec: - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415 machineType: m3.medium maxSize: 1 minSize: 1 @@ -95,7 +95,7 @@ metadata: kops.k8s.io/cluster: ha.example.com name: master-us-test-1a-2 spec: - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415 machineType: m3.medium maxSize: 1 minSize: 1 @@ -115,7 +115,7 @@ metadata: kops.k8s.io/cluster: ha.example.com name: master-us-test-1a-3 spec: - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415 machineType: m3.medium maxSize: 1 minSize: 1 @@ -135,7 +135,7 @@ metadata: kops.k8s.io/cluster: ha.example.com name: nodes-us-test-1a spec: - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415 machineType: t2.medium maxSize: 1 minSize: 1 diff --git a/tests/integration/create_cluster/ha_shared_zones/expected-v1alpha2.yaml b/tests/integration/create_cluster/ha_shared_zones/expected-v1alpha2.yaml index d6f03733bf..fc6a605a28 100644 --- a/tests/integration/create_cluster/ha_shared_zones/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ha_shared_zones/expected-v1alpha2.yaml @@ -91,7 +91,7 @@ metadata: kops.k8s.io/cluster: ha.example.com name: master-us-test-1a-1 spec: - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415 machineType: m3.medium maxSize: 1 minSize: 1 @@ -111,7 +111,7 @@ metadata: kops.k8s.io/cluster: ha.example.com name: master-us-test-1a-2 spec: - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415 machineType: m3.medium maxSize: 1 minSize: 1 @@ -131,7 +131,7 @@ metadata: kops.k8s.io/cluster: ha.example.com name: master-us-test-1a-3 spec: - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415 machineType: m3.medium maxSize: 1 minSize: 1 @@ -151,7 +151,7 @@ metadata: kops.k8s.io/cluster: ha.example.com name: master-us-test-1b-1 spec: - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415 machineType: m3.medium maxSize: 1 minSize: 1 @@ -171,7 +171,7 @@ metadata: kops.k8s.io/cluster: ha.example.com name: master-us-test-1b-2 spec: - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415 machineType: m3.medium maxSize: 1 minSize: 1 @@ -191,7 +191,7 @@ metadata: kops.k8s.io/cluster: ha.example.com name: nodes-us-test-1a spec: - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415 machineType: t2.medium maxSize: 1 minSize: 1 @@ -211,7 +211,7 @@ metadata: kops.k8s.io/cluster: ha.example.com name: nodes-us-test-1b spec: - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415 machineType: t2.medium maxSize: 1 minSize: 1 diff --git a/tests/integration/create_cluster/ingwspecified/expected-v1alpha2.yaml b/tests/integration/create_cluster/ingwspecified/expected-v1alpha2.yaml index b26dc61b47..321a3fe894 100644 --- a/tests/integration/create_cluster/ingwspecified/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ingwspecified/expected-v1alpha2.yaml @@ -72,7 +72,7 @@ metadata: kops.k8s.io/cluster: private.example.com name: bastions spec: - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415 machineType: t2.micro maxSize: 1 minSize: 1 @@ -92,7 +92,7 @@ metadata: kops.k8s.io/cluster: private.example.com name: master-us-test-1a spec: - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415 machineType: m3.medium maxSize: 1 minSize: 1 @@ -112,7 +112,7 @@ metadata: kops.k8s.io/cluster: private.example.com name: nodes-us-test-1a spec: - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415 machineType: t2.medium maxSize: 1 minSize: 1 diff --git a/tests/integration/create_cluster/minimal-1.18/expected-v1alpha2.yaml b/tests/integration/create_cluster/minimal-1.18/expected-v1alpha2.yaml index f9187c57ce..66e47d1213 100644 --- a/tests/integration/create_cluster/minimal-1.18/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/minimal-1.18/expected-v1alpha2.yaml @@ -63,7 +63,7 @@ metadata: kops.k8s.io/cluster: minimal.example.com name: master-us-test-1a spec: - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415 machineType: m3.medium maxSize: 1 minSize: 1 @@ -83,7 +83,7 @@ metadata: kops.k8s.io/cluster: minimal.example.com name: nodes-us-test-1a spec: - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415 machineType: t2.medium maxSize: 1 minSize: 1 diff --git a/tests/integration/create_cluster/minimal-1.19/expected-v1alpha2.yaml b/tests/integration/create_cluster/minimal-1.19/expected-v1alpha2.yaml index cf3b767505..2c6679547b 100644 --- a/tests/integration/create_cluster/minimal-1.19/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/minimal-1.19/expected-v1alpha2.yaml @@ -63,7 +63,7 @@ metadata: kops.k8s.io/cluster: minimal.example.com name: master-us-test-1a spec: - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415 machineType: m3.medium maxSize: 1 minSize: 1 @@ -83,7 +83,7 @@ metadata: kops.k8s.io/cluster: minimal.example.com name: nodes-us-test-1a spec: - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415 machineType: t2.medium maxSize: 1 minSize: 1 diff --git a/tests/integration/create_cluster/minimal-1.20/expected-v1alpha2.yaml b/tests/integration/create_cluster/minimal-1.20/expected-v1alpha2.yaml index 715996db49..ea95fc995b 100644 --- a/tests/integration/create_cluster/minimal-1.20/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/minimal-1.20/expected-v1alpha2.yaml @@ -63,7 +63,7 @@ metadata: kops.k8s.io/cluster: minimal.example.com name: master-us-test-1a spec: - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415 machineType: m3.medium maxSize: 1 minSize: 1 @@ -83,7 +83,7 @@ metadata: kops.k8s.io/cluster: minimal.example.com name: nodes-us-test-1a spec: - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415 machineType: t2.medium maxSize: 1 minSize: 1 diff --git a/tests/integration/create_cluster/minimal-1.21/expected-v1alpha2.yaml b/tests/integration/create_cluster/minimal-1.21/expected-v1alpha2.yaml index 715996db49..ea95fc995b 100644 --- a/tests/integration/create_cluster/minimal-1.21/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/minimal-1.21/expected-v1alpha2.yaml @@ -63,7 +63,7 @@ metadata: kops.k8s.io/cluster: minimal.example.com name: master-us-test-1a spec: - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415 machineType: m3.medium maxSize: 1 minSize: 1 @@ -83,7 +83,7 @@ metadata: kops.k8s.io/cluster: minimal.example.com name: nodes-us-test-1a spec: - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415 machineType: t2.medium maxSize: 1 minSize: 1 diff --git a/tests/integration/create_cluster/ngwspecified/expected-v1alpha2.yaml b/tests/integration/create_cluster/ngwspecified/expected-v1alpha2.yaml index dc6c8fec72..20efc14b5c 100644 --- a/tests/integration/create_cluster/ngwspecified/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ngwspecified/expected-v1alpha2.yaml @@ -72,7 +72,7 @@ metadata: kops.k8s.io/cluster: private.example.com name: bastions spec: - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415 machineType: t2.micro maxSize: 1 minSize: 1 @@ -92,7 +92,7 @@ metadata: kops.k8s.io/cluster: private.example.com name: master-us-test-1a spec: - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415 machineType: m3.medium maxSize: 1 minSize: 1 @@ -112,7 +112,7 @@ metadata: kops.k8s.io/cluster: private.example.com name: nodes-us-test-1a spec: - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415 machineType: t2.medium maxSize: 1 minSize: 1 diff --git a/tests/integration/create_cluster/overrides/expected-v1alpha2.yaml b/tests/integration/create_cluster/overrides/expected-v1alpha2.yaml index 5d08e84f51..976e7108c7 100644 --- a/tests/integration/create_cluster/overrides/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/overrides/expected-v1alpha2.yaml @@ -66,7 +66,7 @@ metadata: kops.k8s.io/cluster: overrides.example.com name: master-us-test-1a spec: - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415 machineType: m3.medium maxSize: 1 minSize: 1 @@ -86,7 +86,7 @@ metadata: kops.k8s.io/cluster: overrides.example.com name: nodes-us-test-1a spec: - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415 machineType: t2.medium maxSize: 1 minSize: 1 diff --git a/tests/integration/create_cluster/private/expected-v1alpha2.yaml b/tests/integration/create_cluster/private/expected-v1alpha2.yaml index 660f77e801..9615b804c5 100644 --- a/tests/integration/create_cluster/private/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/private/expected-v1alpha2.yaml @@ -75,7 +75,7 @@ metadata: kops.k8s.io/cluster: private.example.com name: bastions spec: - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415 machineType: t2.micro maxSize: 1 minSize: 1 @@ -98,7 +98,7 @@ spec: additionalSecurityGroups: - sg-exampleid3 - sg-exampleid4 - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415 machineType: m3.medium maxSize: 1 minSize: 1 @@ -121,7 +121,7 @@ spec: additionalSecurityGroups: - sg-exampleid - sg-exampleid2 - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415 machineType: t2.medium maxSize: 1 minSize: 1 diff --git a/tests/integration/create_cluster/private_gce/expected-v1alpha2.yaml b/tests/integration/create_cluster/private_gce/expected-v1alpha2.yaml index 1d1ea1d446..cc038a9c7b 100644 --- a/tests/integration/create_cluster/private_gce/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/private_gce/expected-v1alpha2.yaml @@ -72,7 +72,7 @@ metadata: kops.k8s.io/cluster: private.example.com name: bastions spec: - image: ubuntu-os-cloud/ubuntu-2004-focal-v20210325 + image: ubuntu-os-cloud/ubuntu-2004-focal-v20210415 machineType: f1-micro maxSize: 1 minSize: 1 @@ -98,7 +98,7 @@ spec: additionalSecurityGroups: - sg-exampleid3 - sg-exampleid4 - image: ubuntu-os-cloud/ubuntu-2004-focal-v20210325 + image: ubuntu-os-cloud/ubuntu-2004-focal-v20210415 machineType: n1-standard-1 maxSize: 1 minSize: 1 @@ -124,7 +124,7 @@ spec: additionalSecurityGroups: - sg-exampleid - sg-exampleid2 - image: ubuntu-os-cloud/ubuntu-2004-focal-v20210325 + image: ubuntu-os-cloud/ubuntu-2004-focal-v20210415 machineType: n1-standard-2 maxSize: 1 minSize: 1 diff --git a/tests/integration/create_cluster/private_shared_subnets/expected-v1alpha2.yaml b/tests/integration/create_cluster/private_shared_subnets/expected-v1alpha2.yaml index 1afdca839c..bdc09091f0 100644 --- a/tests/integration/create_cluster/private_shared_subnets/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/private_shared_subnets/expected-v1alpha2.yaml @@ -72,7 +72,7 @@ metadata: kops.k8s.io/cluster: private-subnets.example.com name: master-us-test-1a spec: - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415 machineType: m3.medium maxSize: 1 minSize: 1 @@ -92,7 +92,7 @@ metadata: kops.k8s.io/cluster: private-subnets.example.com name: nodes-us-test-1a spec: - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415 machineType: t2.medium maxSize: 1 minSize: 1 diff --git a/tests/integration/create_cluster/shared_subnets/expected-v1alpha2.yaml b/tests/integration/create_cluster/shared_subnets/expected-v1alpha2.yaml index f378926144..daaaa5ea7b 100644 --- a/tests/integration/create_cluster/shared_subnets/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/shared_subnets/expected-v1alpha2.yaml @@ -65,7 +65,7 @@ metadata: kops.k8s.io/cluster: subnet.example.com name: master-us-test-1a spec: - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415 machineType: m3.medium maxSize: 1 minSize: 1 @@ -85,7 +85,7 @@ metadata: kops.k8s.io/cluster: subnet.example.com name: nodes-us-test-1a spec: - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415 machineType: t2.medium maxSize: 1 minSize: 1 diff --git a/tests/integration/create_cluster/shared_subnets_vpc_lookup/expected-v1alpha2.yaml b/tests/integration/create_cluster/shared_subnets_vpc_lookup/expected-v1alpha2.yaml index f378926144..daaaa5ea7b 100644 --- a/tests/integration/create_cluster/shared_subnets_vpc_lookup/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/shared_subnets_vpc_lookup/expected-v1alpha2.yaml @@ -65,7 +65,7 @@ metadata: kops.k8s.io/cluster: subnet.example.com name: master-us-test-1a spec: - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415 machineType: m3.medium maxSize: 1 minSize: 1 @@ -85,7 +85,7 @@ metadata: kops.k8s.io/cluster: subnet.example.com name: nodes-us-test-1a spec: - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415 machineType: t2.medium maxSize: 1 minSize: 1 diff --git a/tests/integration/create_cluster/shared_vpc/expected-v1alpha2.yaml b/tests/integration/create_cluster/shared_vpc/expected-v1alpha2.yaml index 90ae9f9466..6f1ac1cdbc 100644 --- a/tests/integration/create_cluster/shared_vpc/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/shared_vpc/expected-v1alpha2.yaml @@ -64,7 +64,7 @@ metadata: kops.k8s.io/cluster: vpc.example.com name: master-us-test-1a spec: - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415 machineType: m3.medium maxSize: 1 minSize: 1 @@ -84,7 +84,7 @@ metadata: kops.k8s.io/cluster: vpc.example.com name: nodes-us-test-1a spec: - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415 machineType: t2.medium maxSize: 1 minSize: 1