From 752c3de50467cf4489ac21639d3fc4452b2a3ab2 Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Sun, 21 Nov 2021 04:45:24 +0200 Subject: [PATCH 1/4] Update Ubuntu images to latest version --- channels/alpha | 6 +++--- channels/stable | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/channels/alpha b/channels/alpha index f387418066f88..855276731afcf 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-20211021 + - name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118 providerID: aws architectureID: amd64 kubernetesVersion: ">=1.18.0" - - name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-arm64-server-20211021 + - name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-arm64-server-20211118 providerID: aws architectureID: arm64 kubernetesVersion: ">=1.20.0" @@ -74,7 +74,7 @@ spec: providerID: gce architectureID: amd64 kubernetesVersion: ">=1.16.0 <1.18.0" - - name: ubuntu-os-cloud/ubuntu-2004-focal-v20210927 + - name: ubuntu-os-cloud/ubuntu-2004-focal-v20211118 providerID: gce architectureID: amd64 kubernetesVersion: ">=1.18.0" diff --git a/channels/stable b/channels/stable index 1503e0b6dbf42..a9c56f0d3923f 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-20211015 + - name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118 providerID: aws architectureID: amd64 kubernetesVersion: ">=1.18.0" - - name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-arm64-server-20211015 + - name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-arm64-server-20211118 providerID: aws architectureID: arm64 kubernetesVersion: ">=1.20.0" @@ -74,7 +74,7 @@ spec: providerID: gce architectureID: amd64 kubernetesVersion: ">=1.16.0 <1.18.0" - - name: ubuntu-os-cloud/ubuntu-2004-focal-v20210927 + - name: ubuntu-os-cloud/ubuntu-2004-focal-v20211118 providerID: gce architectureID: amd64 kubernetesVersion: ">=1.18.0" From 25b9773a2e2eda467417dc65ebe7b51572acf55b Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Sun, 21 Nov 2021 04:46:06 +0200 Subject: [PATCH 2/4] Promote alpha channel to stable --- channels/stable | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/channels/stable b/channels/stable index a9c56f0d3923f..855276731afcf 100644 --- a/channels/stable +++ b/channels/stable @@ -88,16 +88,16 @@ spec: kubenet: {} kubernetesVersions: - range: ">=1.22.0" - recommendedVersion: 1.22.2 + recommendedVersion: 1.22.3 requiredVersion: 1.22.0 - range: ">=1.21.0" - recommendedVersion: 1.21.5 + recommendedVersion: 1.21.6 requiredVersion: 1.21.0 - range: ">=1.20.0" - recommendedVersion: 1.20.11 + recommendedVersion: 1.20.12 requiredVersion: 1.20.0 - range: ">=1.19.0" - recommendedVersion: 1.19.15 + recommendedVersion: 1.19.16 requiredVersion: 1.19.0 - range: ">=1.18.0" recommendedVersion: 1.18.20 @@ -130,19 +130,19 @@ spec: - range: ">=1.22.0-alpha.1" recommendedVersion: "1.22.0" #requiredVersion: 1.22.0 - kubernetesVersion: 1.22.2 + kubernetesVersion: 1.22.3 - range: ">=1.21.0-alpha.1" recommendedVersion: "1.21.2" #requiredVersion: 1.21.0 - kubernetesVersion: 1.21.5 + kubernetesVersion: 1.21.6 - range: ">=1.20.0-alpha.1" recommendedVersion: "1.21.2" #requiredVersion: 1.20.0 - kubernetesVersion: 1.20.11 + kubernetesVersion: 1.20.12 - range: ">=1.19.0-alpha.1" recommendedVersion: "1.21.2" #requiredVersion: 1.19.0 - kubernetesVersion: 1.19.15 + kubernetesVersion: 1.19.16 - range: ">=1.18.0-alpha.1" recommendedVersion: "1.21.2" #requiredVersion: 1.18.0 From 351b39129ad7e2a6797b2f1627723a14dfc87f9b Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Sun, 21 Nov 2021 04:52:42 +0200 Subject: [PATCH 3/4] Update alpha channel with November releases --- channels/alpha | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/channels/alpha b/channels/alpha index 855276731afcf..a3e98bcdc2b42 100644 --- a/channels/alpha +++ b/channels/alpha @@ -88,13 +88,13 @@ spec: kubenet: {} kubernetesVersions: - range: ">=1.22.0" - recommendedVersion: 1.22.3 + recommendedVersion: 1.22.4 requiredVersion: 1.22.0 - range: ">=1.21.0" - recommendedVersion: 1.21.6 + recommendedVersion: 1.21.7 requiredVersion: 1.21.0 - range: ">=1.20.0" - recommendedVersion: 1.20.12 + recommendedVersion: 1.20.13 requiredVersion: 1.20.0 - range: ">=1.19.0" recommendedVersion: 1.19.16 @@ -128,35 +128,35 @@ spec: requiredVersion: 1.11.10 kopsVersions: - range: ">=1.22.0-alpha.1" - recommendedVersion: "1.22.0" + recommendedVersion: "1.22.2" #requiredVersion: 1.22.0 - kubernetesVersion: 1.22.3 + kubernetesVersion: 1.22.4 - range: ">=1.21.0-alpha.1" - recommendedVersion: "1.21.2" + recommendedVersion: "1.22.2" #requiredVersion: 1.21.0 - kubernetesVersion: 1.21.6 + kubernetesVersion: 1.21.7 - range: ">=1.20.0-alpha.1" - recommendedVersion: "1.21.2" + recommendedVersion: "1.22.2" #requiredVersion: 1.20.0 - kubernetesVersion: 1.20.12 + kubernetesVersion: 1.20.13 - range: ">=1.19.0-alpha.1" - recommendedVersion: "1.21.2" + recommendedVersion: "1.22.2" #requiredVersion: 1.19.0 kubernetesVersion: 1.19.16 - range: ">=1.18.0-alpha.1" - recommendedVersion: "1.21.2" + recommendedVersion: "1.22.2" #requiredVersion: 1.18.0 kubernetesVersion: 1.18.20 - range: ">=1.17.0-alpha.1" - recommendedVersion: "1.21.2" + recommendedVersion: "1.22.2" #requiredVersion: 1.17.0 kubernetesVersion: 1.17.17 - range: ">=1.16.0-alpha.1" - recommendedVersion: "1.21.2" + recommendedVersion: "1.21.4" #requiredVersion: 1.16.0 kubernetesVersion: 1.16.15 - range: ">=1.15.0-alpha.1" - recommendedVersion: "1.21.2" + recommendedVersion: "1.21.4" #requiredVersion: 1.15.0 kubernetesVersion: 1.15.12 - range: ">=1.14.0-alpha.1" From 7357245d65851c715c67ee274515da4e951483c1 Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Sun, 21 Nov 2021 04:56:25 +0200 Subject: [PATCH 4/4] 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 1b6f1ce77aae9..1b416599caa87 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-20211015 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118 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-20211015 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118 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 e4f97609bfe3c..d433f0a5bebb4 100644 --- a/tests/integration/create_cluster/gce_byo_sa/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/gce_byo_sa/expected-v1alpha2.yaml @@ -64,7 +64,7 @@ metadata: kops.k8s.io/cluster: gce.example.com name: master-us-test1-a spec: - image: ubuntu-os-cloud/ubuntu-2004-focal-v20210927 + image: ubuntu-os-cloud/ubuntu-2004-focal-v20211118 machineType: n1-standard-1 maxSize: 1 minSize: 1 @@ -87,7 +87,7 @@ metadata: kops.k8s.io/cluster: gce.example.com name: nodes-us-test1-a spec: - image: ubuntu-os-cloud/ubuntu-2004-focal-v20210927 + image: ubuntu-os-cloud/ubuntu-2004-focal-v20211118 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 1ba6ea754a088..a2131e02564f7 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-20211015 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118 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-20211015 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118 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-20211015 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118 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-20211015 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118 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-20211015 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118 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-20211015 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118 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 1ba6ea754a088..a2131e02564f7 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-20211015 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118 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-20211015 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118 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-20211015 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118 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-20211015 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118 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-20211015 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118 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-20211015 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118 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 919ac07a4c67b..e1ab6da893d8e 100644 --- a/tests/integration/create_cluster/ha_gce/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ha_gce/expected-v1alpha2.yaml @@ -72,7 +72,7 @@ metadata: kops.k8s.io/cluster: ha-gce.example.com name: master-us-test1-a spec: - image: ubuntu-os-cloud/ubuntu-2004-focal-v20210927 + image: ubuntu-os-cloud/ubuntu-2004-focal-v20211118 machineType: n1-standard-1 maxSize: 1 minSize: 1 @@ -95,7 +95,7 @@ metadata: kops.k8s.io/cluster: ha-gce.example.com name: master-us-test1-b spec: - image: ubuntu-os-cloud/ubuntu-2004-focal-v20210927 + image: ubuntu-os-cloud/ubuntu-2004-focal-v20211118 machineType: n1-standard-1 maxSize: 1 minSize: 1 @@ -118,7 +118,7 @@ metadata: kops.k8s.io/cluster: ha-gce.example.com name: master-us-test1-c spec: - image: ubuntu-os-cloud/ubuntu-2004-focal-v20210927 + image: ubuntu-os-cloud/ubuntu-2004-focal-v20211118 machineType: n1-standard-1 maxSize: 1 minSize: 1 @@ -141,7 +141,7 @@ metadata: kops.k8s.io/cluster: ha-gce.example.com name: nodes-us-test1-a spec: - image: ubuntu-os-cloud/ubuntu-2004-focal-v20210927 + image: ubuntu-os-cloud/ubuntu-2004-focal-v20211118 machineType: n1-standard-2 maxSize: 1 minSize: 1 @@ -164,7 +164,7 @@ metadata: kops.k8s.io/cluster: ha-gce.example.com name: nodes-us-test1-b spec: - image: ubuntu-os-cloud/ubuntu-2004-focal-v20210927 + image: ubuntu-os-cloud/ubuntu-2004-focal-v20211118 machineType: n1-standard-2 maxSize: 1 minSize: 1 @@ -187,7 +187,7 @@ metadata: kops.k8s.io/cluster: ha-gce.example.com name: nodes-us-test1-c spec: - image: ubuntu-os-cloud/ubuntu-2004-focal-v20210927 + image: ubuntu-os-cloud/ubuntu-2004-focal-v20211118 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 4e9167f209fe2..1e10778abf0de 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-20211015 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118 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-20211015 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118 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-20211015 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118 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-20211015 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118 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 19ab84fb219a1..411454465cbf9 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-20211015 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118 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-20211015 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118 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-20211015 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118 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-20211015 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118 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-20211015 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118 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-20211015 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118 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-20211015 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118 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 c9e11a38255d4..729838a4f8b2a 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-20211015 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118 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-20211015 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118 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-20211015 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118 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 8f08b61d5556f..b62c91b66e57c 100644 --- a/tests/integration/create_cluster/ipv6/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ipv6/expected-v1alpha2.yaml @@ -66,7 +66,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-20211015 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118 instanceMetadata: httpPutResponseHopLimit: 3 httpTokens: required @@ -89,7 +89,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-20211015 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118 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 6a485e7d3e4a7..f8a2a4e58cc03 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-20211015 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118 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-20211015 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118 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 203c26aaaedd3..8aa10625ee081 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-20211015 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118 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-20211015 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118 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 9f6da21d5fcb0..bbb082cb666ff 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-20211015 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118 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-20211015 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118 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 9f6da21d5fcb0..bbb082cb666ff 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-20211015 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118 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-20211015 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118 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 a4ae6f8e24f87..60ece11212934 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-20211015 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118 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-20211015 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118 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 5bd6b51844369..67d0345559d45 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-20211015 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118 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-20211015 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118 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 36795d5b5f8ba..b432f78124266 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-20211015 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118 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-20211015 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118 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-20211015 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118 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 aea2ad756acc6..a0a117409950f 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-20211015 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118 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-20211015 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118 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 8c6a01df29a86..9d5e89339ccf0 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-20211015 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118 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-20211015 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118 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-20211015 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118 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 065213f729d92..4c8f859085be3 100644 --- a/tests/integration/create_cluster/private_gce/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/private_gce/expected-v1alpha2.yaml @@ -71,7 +71,7 @@ metadata: kops.k8s.io/cluster: private.example.com name: bastions spec: - image: ubuntu-os-cloud/ubuntu-2004-focal-v20210927 + image: ubuntu-os-cloud/ubuntu-2004-focal-v20211118 machineType: f1-micro maxSize: 1 minSize: 1 @@ -97,7 +97,7 @@ spec: additionalSecurityGroups: - sg-exampleid3 - sg-exampleid4 - image: ubuntu-os-cloud/ubuntu-2004-focal-v20210927 + image: ubuntu-os-cloud/ubuntu-2004-focal-v20211118 machineType: n1-standard-1 maxSize: 1 minSize: 1 @@ -123,7 +123,7 @@ spec: additionalSecurityGroups: - sg-exampleid - sg-exampleid2 - image: ubuntu-os-cloud/ubuntu-2004-focal-v20210927 + image: ubuntu-os-cloud/ubuntu-2004-focal-v20211118 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 f09f6bf6ec18b..10ca073d3c172 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-20211015 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118 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-20211015 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118 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 b35bb495a7900..a2847cf5bc2dd 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-20211015 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118 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-20211015 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118 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 b35bb495a7900..a2847cf5bc2dd 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-20211015 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118 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-20211015 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118 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 407f18e4585d7..86dafd4d05174 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-20211015 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118 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-20211015 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118 machineType: t2.medium maxSize: 1 minSize: 1