From b7d54970719f8a558542c36a89f1e68852c55117 Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Sun, 10 Oct 2021 12:55:38 +0300 Subject: [PATCH 1/3] Update channels with latest cloud images --- channels/alpha | 8 ++++---- channels/stable | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/channels/alpha b/channels/alpha index 6b7fe7fa2b..e26688dba1 100644 --- a/channels/alpha +++ b/channels/alpha @@ -58,11 +58,11 @@ spec: providerID: aws architectureID: amd64 kubernetesVersion: ">=1.17.0 <1.18.0" - - name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210907 + - name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211001 providerID: aws architectureID: amd64 kubernetesVersion: ">=1.18.0" - - name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-arm64-server-20210907 + - name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-arm64-server-20211001 providerID: aws architectureID: arm64 kubernetesVersion: ">=1.20.0" @@ -74,11 +74,11 @@ spec: providerID: gce architectureID: amd64 kubernetesVersion: ">=1.16.0 <1.18.0" - - name: ubuntu-os-cloud/ubuntu-2004-focal-v20210908 + - name: ubuntu-os-cloud/ubuntu-2004-focal-v20210927 providerID: gce architectureID: amd64 kubernetesVersion: ">=1.18.0" - - name: Canonical:0001-com-ubuntu-server-focal:20_04-lts-gen2:20.04.202109080 + - name: Canonical:0001-com-ubuntu-server-focal:20_04-lts-gen2:20.04.202110010 providerID: azure architectureID: amd64 kubernetesVersion: ">=1.20.0" diff --git a/channels/stable b/channels/stable index 6b7fe7fa2b..e26688dba1 100644 --- a/channels/stable +++ b/channels/stable @@ -58,11 +58,11 @@ spec: providerID: aws architectureID: amd64 kubernetesVersion: ">=1.17.0 <1.18.0" - - name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210907 + - name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211001 providerID: aws architectureID: amd64 kubernetesVersion: ">=1.18.0" - - name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-arm64-server-20210907 + - name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-arm64-server-20211001 providerID: aws architectureID: arm64 kubernetesVersion: ">=1.20.0" @@ -74,11 +74,11 @@ spec: providerID: gce architectureID: amd64 kubernetesVersion: ">=1.16.0 <1.18.0" - - name: ubuntu-os-cloud/ubuntu-2004-focal-v20210908 + - name: ubuntu-os-cloud/ubuntu-2004-focal-v20210927 providerID: gce architectureID: amd64 kubernetesVersion: ">=1.18.0" - - name: Canonical:0001-com-ubuntu-server-focal:20_04-lts-gen2:20.04.202109080 + - name: Canonical:0001-com-ubuntu-server-focal:20_04-lts-gen2:20.04.202110010 providerID: azure architectureID: amd64 kubernetesVersion: ">=1.20.0" From 40289396fd9974359c181c478b03d50691e8801d Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Sun, 10 Oct 2021 12:56:49 +0300 Subject: [PATCH 2/3] Update alpha channel with latest kOps releases --- channels/alpha | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/channels/alpha b/channels/alpha index e26688dba1..06f6fee14b 100644 --- a/channels/alpha +++ b/channels/alpha @@ -125,35 +125,35 @@ spec: requiredVersion: 1.11.10 kopsVersions: - range: ">=1.22.0-alpha.1" - recommendedVersion: "1.22.0-beta.1" + recommendedVersion: "1.22.0-beta.2" #requiredVersion: 1.22.0 kubernetesVersion: 1.22.2 - range: ">=1.21.0-alpha.1" - recommendedVersion: "1.21.0" + recommendedVersion: "1.21.2" #requiredVersion: 1.21.0 kubernetesVersion: 1.21.5 - range: ">=1.20.0-alpha.1" - recommendedVersion: "1.21.0" + recommendedVersion: "1.21.2" #requiredVersion: 1.20.0 kubernetesVersion: 1.20.11 - range: ">=1.19.0-alpha.1" - recommendedVersion: "1.21.0" + recommendedVersion: "1.21.2" #requiredVersion: 1.19.0 kubernetesVersion: 1.19.15 - range: ">=1.18.0-alpha.1" - recommendedVersion: "1.21.0" + recommendedVersion: "1.21.2" #requiredVersion: 1.18.0 kubernetesVersion: 1.18.20 - range: ">=1.17.0-alpha.1" - recommendedVersion: "1.21.0" + recommendedVersion: "1.21.2" #requiredVersion: 1.17.0 kubernetesVersion: 1.17.17 - range: ">=1.16.0-alpha.1" - recommendedVersion: "1.21.0" + recommendedVersion: "1.21.2" #requiredVersion: 1.16.0 kubernetesVersion: 1.16.15 - range: ">=1.15.0-alpha.1" - recommendedVersion: "1.21.0" + recommendedVersion: "1.21.2" #requiredVersion: 1.15.0 kubernetesVersion: 1.15.12 - range: ">=1.14.0-alpha.1" From 4cf87b9200a2e7d32ab1aa6cc03e421ce3cdbf39 Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Sun, 10 Oct 2021 13:10:14 +0300 Subject: [PATCH 3/3] Run hack/update-expected.sh --- .../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 +++--- .../create_cluster/ipv6/expected-v1alpha2.yaml | 4 ++-- .../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 ++-- .../minimal-1.22/expected-v1alpha2.yaml | 4 ++-- .../minimal-1.23/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, 69 insertions(+), 69 deletions(-) diff --git a/tests/integration/create_cluster/complex/expected-v1alpha2.yaml b/tests/integration/create_cluster/complex/expected-v1alpha2.yaml index 14cb286a6c..cac9289dc7 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-20210907 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211001 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-20210907 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211001 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 9a3628319d..08569c16b6 100644 --- a/tests/integration/create_cluster/gce_byo_sa/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/gce_byo_sa/expected-v1alpha2.yaml @@ -63,7 +63,7 @@ metadata: kops.k8s.io/cluster: gce.example.com name: master-us-test1-a spec: - image: ubuntu-os-cloud/ubuntu-2004-focal-v20210908 + image: ubuntu-os-cloud/ubuntu-2004-focal-v20210927 machineType: n1-standard-1 maxSize: 1 minSize: 1 @@ -86,7 +86,7 @@ metadata: kops.k8s.io/cluster: gce.example.com name: nodes-us-test1-a spec: - image: ubuntu-os-cloud/ubuntu-2004-focal-v20210908 + image: ubuntu-os-cloud/ubuntu-2004-focal-v20210927 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 c08c3510e6..034b62353c 100644 --- a/tests/integration/create_cluster/ha/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ha/expected-v1alpha2.yaml @@ -84,7 +84,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-20210907 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211001 machineType: m3.medium maxSize: 1 minSize: 1 @@ -104,7 +104,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-20210907 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211001 machineType: m3.medium maxSize: 1 minSize: 1 @@ -124,7 +124,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-20210907 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211001 machineType: m3.medium maxSize: 1 minSize: 1 @@ -144,7 +144,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-20210907 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211001 machineType: t2.medium maxSize: 1 minSize: 1 @@ -164,7 +164,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-20210907 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211001 machineType: t2.medium maxSize: 1 minSize: 1 @@ -184,7 +184,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-20210907 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211001 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 c08c3510e6..034b62353c 100644 --- a/tests/integration/create_cluster/ha_encrypt/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ha_encrypt/expected-v1alpha2.yaml @@ -84,7 +84,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-20210907 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211001 machineType: m3.medium maxSize: 1 minSize: 1 @@ -104,7 +104,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-20210907 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211001 machineType: m3.medium maxSize: 1 minSize: 1 @@ -124,7 +124,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-20210907 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211001 machineType: m3.medium maxSize: 1 minSize: 1 @@ -144,7 +144,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-20210907 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211001 machineType: t2.medium maxSize: 1 minSize: 1 @@ -164,7 +164,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-20210907 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211001 machineType: t2.medium maxSize: 1 minSize: 1 @@ -184,7 +184,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-20210907 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211001 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 7f216ed647..778d01a394 100644 --- a/tests/integration/create_cluster/ha_gce/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ha_gce/expected-v1alpha2.yaml @@ -71,7 +71,7 @@ metadata: kops.k8s.io/cluster: ha-gce.example.com name: master-us-test1-a spec: - image: ubuntu-os-cloud/ubuntu-2004-focal-v20210908 + image: ubuntu-os-cloud/ubuntu-2004-focal-v20210927 machineType: n1-standard-1 maxSize: 1 minSize: 1 @@ -94,7 +94,7 @@ metadata: kops.k8s.io/cluster: ha-gce.example.com name: master-us-test1-b spec: - image: ubuntu-os-cloud/ubuntu-2004-focal-v20210908 + image: ubuntu-os-cloud/ubuntu-2004-focal-v20210927 machineType: n1-standard-1 maxSize: 1 minSize: 1 @@ -117,7 +117,7 @@ metadata: kops.k8s.io/cluster: ha-gce.example.com name: master-us-test1-c spec: - image: ubuntu-os-cloud/ubuntu-2004-focal-v20210908 + image: ubuntu-os-cloud/ubuntu-2004-focal-v20210927 machineType: n1-standard-1 maxSize: 1 minSize: 1 @@ -140,7 +140,7 @@ metadata: kops.k8s.io/cluster: ha-gce.example.com name: nodes-us-test1-a spec: - image: ubuntu-os-cloud/ubuntu-2004-focal-v20210908 + image: ubuntu-os-cloud/ubuntu-2004-focal-v20210927 machineType: n1-standard-2 maxSize: 1 minSize: 1 @@ -163,7 +163,7 @@ metadata: kops.k8s.io/cluster: ha-gce.example.com name: nodes-us-test1-b spec: - image: ubuntu-os-cloud/ubuntu-2004-focal-v20210908 + image: ubuntu-os-cloud/ubuntu-2004-focal-v20210927 machineType: n1-standard-2 maxSize: 1 minSize: 1 @@ -186,7 +186,7 @@ metadata: kops.k8s.io/cluster: ha-gce.example.com name: nodes-us-test1-c spec: - image: ubuntu-os-cloud/ubuntu-2004-focal-v20210908 + image: ubuntu-os-cloud/ubuntu-2004-focal-v20210927 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 cf04cebbca..1d8bd57de6 100644 --- a/tests/integration/create_cluster/ha_shared_zone/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ha_shared_zone/expected-v1alpha2.yaml @@ -76,7 +76,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-20210907 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211001 machineType: m3.medium maxSize: 1 minSize: 1 @@ -96,7 +96,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-20210907 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211001 machineType: m3.medium maxSize: 1 minSize: 1 @@ -116,7 +116,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-20210907 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211001 machineType: m3.medium maxSize: 1 minSize: 1 @@ -136,7 +136,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-20210907 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211001 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 ca41de4262..24c02b7f29 100644 --- a/tests/integration/create_cluster/ha_shared_zones/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ha_shared_zones/expected-v1alpha2.yaml @@ -92,7 +92,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-20210907 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211001 machineType: m3.medium maxSize: 1 minSize: 1 @@ -112,7 +112,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-20210907 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211001 machineType: m3.medium maxSize: 1 minSize: 1 @@ -132,7 +132,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-20210907 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211001 machineType: m3.medium maxSize: 1 minSize: 1 @@ -152,7 +152,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-20210907 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211001 machineType: m3.medium maxSize: 1 minSize: 1 @@ -172,7 +172,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-20210907 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211001 machineType: m3.medium maxSize: 1 minSize: 1 @@ -192,7 +192,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-20210907 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211001 machineType: t2.medium maxSize: 1 minSize: 1 @@ -212,7 +212,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-20210907 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211001 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 a43a459db0..8c983e06d9 100644 --- a/tests/integration/create_cluster/ingwspecified/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ingwspecified/expected-v1alpha2.yaml @@ -73,7 +73,7 @@ metadata: kops.k8s.io/cluster: private.example.com name: bastions spec: - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210907 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211001 machineType: t2.micro maxSize: 1 minSize: 1 @@ -93,7 +93,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-20210907 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211001 machineType: m3.medium maxSize: 1 minSize: 1 @@ -113,7 +113,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-20210907 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211001 machineType: t2.medium maxSize: 1 minSize: 1 diff --git a/tests/integration/create_cluster/ipv6/expected-v1alpha2.yaml b/tests/integration/create_cluster/ipv6/expected-v1alpha2.yaml index 8ac9865640..0186573a9d 100644 --- a/tests/integration/create_cluster/ipv6/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ipv6/expected-v1alpha2.yaml @@ -65,7 +65,7 @@ metadata: kops.k8s.io/cluster: ipv6.example.com name: master-us-test-1a spec: - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210907 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211001 instanceMetadata: httpPutResponseHopLimit: 3 httpTokens: required @@ -88,7 +88,7 @@ metadata: kops.k8s.io/cluster: ipv6.example.com name: nodes-us-test-1a spec: - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210907 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211001 instanceMetadata: httpPutResponseHopLimit: 1 httpTokens: required 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 66d9341d70..37c55b24d3 100644 --- a/tests/integration/create_cluster/minimal-1.18/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/minimal-1.18/expected-v1alpha2.yaml @@ -64,7 +64,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-20210907 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211001 machineType: m3.medium maxSize: 1 minSize: 1 @@ -84,7 +84,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-20210907 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211001 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 ca7ce8dca6..5dc8b9438a 100644 --- a/tests/integration/create_cluster/minimal-1.19/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/minimal-1.19/expected-v1alpha2.yaml @@ -64,7 +64,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-20210907 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211001 machineType: m3.medium maxSize: 1 minSize: 1 @@ -84,7 +84,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-20210907 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211001 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 84d27301be..79b21687b1 100644 --- a/tests/integration/create_cluster/minimal-1.20/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/minimal-1.20/expected-v1alpha2.yaml @@ -64,7 +64,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-20210907 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211001 machineType: m3.medium maxSize: 1 minSize: 1 @@ -84,7 +84,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-20210907 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211001 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 84d27301be..79b21687b1 100644 --- a/tests/integration/create_cluster/minimal-1.21/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/minimal-1.21/expected-v1alpha2.yaml @@ -64,7 +64,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-20210907 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211001 machineType: m3.medium maxSize: 1 minSize: 1 @@ -84,7 +84,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-20210907 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211001 machineType: t2.medium maxSize: 1 minSize: 1 diff --git a/tests/integration/create_cluster/minimal-1.22/expected-v1alpha2.yaml b/tests/integration/create_cluster/minimal-1.22/expected-v1alpha2.yaml index 8e20c1ea1e..3effd6b989 100644 --- a/tests/integration/create_cluster/minimal-1.22/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/minimal-1.22/expected-v1alpha2.yaml @@ -64,7 +64,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-20210907 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211001 instanceMetadata: httpPutResponseHopLimit: 3 httpTokens: required @@ -87,7 +87,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-20210907 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211001 instanceMetadata: httpPutResponseHopLimit: 1 httpTokens: required diff --git a/tests/integration/create_cluster/minimal-1.23/expected-v1alpha2.yaml b/tests/integration/create_cluster/minimal-1.23/expected-v1alpha2.yaml index a129337226..58fbb54e13 100644 --- a/tests/integration/create_cluster/minimal-1.23/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/minimal-1.23/expected-v1alpha2.yaml @@ -64,7 +64,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-20210907 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211001 instanceMetadata: httpPutResponseHopLimit: 3 httpTokens: required @@ -87,7 +87,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-20210907 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211001 instanceMetadata: httpPutResponseHopLimit: 1 httpTokens: required diff --git a/tests/integration/create_cluster/ngwspecified/expected-v1alpha2.yaml b/tests/integration/create_cluster/ngwspecified/expected-v1alpha2.yaml index 9821e847a5..e0fcea5f0e 100644 --- a/tests/integration/create_cluster/ngwspecified/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ngwspecified/expected-v1alpha2.yaml @@ -73,7 +73,7 @@ metadata: kops.k8s.io/cluster: private.example.com name: bastions spec: - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210907 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211001 machineType: t2.micro maxSize: 1 minSize: 1 @@ -93,7 +93,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-20210907 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211001 machineType: m3.medium maxSize: 1 minSize: 1 @@ -113,7 +113,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-20210907 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211001 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 9decb9a0a7..643be8ec7f 100644 --- a/tests/integration/create_cluster/overrides/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/overrides/expected-v1alpha2.yaml @@ -67,7 +67,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-20210907 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211001 machineType: m3.medium maxSize: 1 minSize: 1 @@ -87,7 +87,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-20210907 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211001 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 8421ca6fd7..a6c3dc842d 100644 --- a/tests/integration/create_cluster/private/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/private/expected-v1alpha2.yaml @@ -76,7 +76,7 @@ metadata: kops.k8s.io/cluster: private.example.com name: bastions spec: - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210907 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211001 machineType: t2.micro maxSize: 1 minSize: 1 @@ -99,7 +99,7 @@ spec: additionalSecurityGroups: - sg-exampleid3 - sg-exampleid4 - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210907 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211001 machineType: m3.medium maxSize: 1 minSize: 1 @@ -122,7 +122,7 @@ spec: additionalSecurityGroups: - sg-exampleid - sg-exampleid2 - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210907 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211001 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 ed899a009a..1881e7b933 100644 --- a/tests/integration/create_cluster/private_gce/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/private_gce/expected-v1alpha2.yaml @@ -70,7 +70,7 @@ metadata: kops.k8s.io/cluster: private.example.com name: bastions spec: - image: ubuntu-os-cloud/ubuntu-2004-focal-v20210908 + image: ubuntu-os-cloud/ubuntu-2004-focal-v20210927 machineType: f1-micro maxSize: 1 minSize: 1 @@ -96,7 +96,7 @@ spec: additionalSecurityGroups: - sg-exampleid3 - sg-exampleid4 - image: ubuntu-os-cloud/ubuntu-2004-focal-v20210908 + image: ubuntu-os-cloud/ubuntu-2004-focal-v20210927 machineType: n1-standard-1 maxSize: 1 minSize: 1 @@ -122,7 +122,7 @@ spec: additionalSecurityGroups: - sg-exampleid - sg-exampleid2 - image: ubuntu-os-cloud/ubuntu-2004-focal-v20210908 + image: ubuntu-os-cloud/ubuntu-2004-focal-v20210927 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 64dcf7d952..cbba1fcd5c 100644 --- a/tests/integration/create_cluster/private_shared_subnets/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/private_shared_subnets/expected-v1alpha2.yaml @@ -73,7 +73,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-20210907 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211001 machineType: m3.medium maxSize: 1 minSize: 1 @@ -93,7 +93,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-20210907 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211001 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 1be53e20cd..40cc6b208e 100644 --- a/tests/integration/create_cluster/shared_subnets/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/shared_subnets/expected-v1alpha2.yaml @@ -66,7 +66,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-20210907 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211001 machineType: m3.medium maxSize: 1 minSize: 1 @@ -86,7 +86,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-20210907 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211001 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 1be53e20cd..40cc6b208e 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 @@ -66,7 +66,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-20210907 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211001 machineType: m3.medium maxSize: 1 minSize: 1 @@ -86,7 +86,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-20210907 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211001 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 dd1805d5d7..20671733ad 100644 --- a/tests/integration/create_cluster/shared_vpc/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/shared_vpc/expected-v1alpha2.yaml @@ -65,7 +65,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-20210907 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211001 machineType: m3.medium maxSize: 1 minSize: 1 @@ -85,7 +85,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-20210907 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211001 machineType: t2.medium maxSize: 1 minSize: 1