From 237d6e4ff19e0987e5c1184122d41f2e8390f712 Mon Sep 17 00:00:00 2001 From: Moshe Vayner Date: Thu, 20 Feb 2025 17:29:26 -0500 Subject: [PATCH 1/2] chore(channels): promote alpha to stable - k8s and ubuntu AMI versions --- channels/stable | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/channels/stable b/channels/stable index 6de714afee..f0d8641d4f 100644 --- a/channels/stable +++ b/channels/stable @@ -58,19 +58,19 @@ spec: providerID: aws architectureID: amd64 kubernetesVersion: ">=1.17.0 <1.18.0" - - name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20250111 + - name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20250210 providerID: aws architectureID: amd64 kubernetesVersion: ">=1.18.0 <1.27.0" - - name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-arm64-server-20250111 + - name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-arm64-server-20250210 providerID: aws architectureID: arm64 kubernetesVersion: ">=1.20.0 <1.27.0" - - name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20250112 + - name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20250211 providerID: aws architectureID: amd64 kubernetesVersion: ">=1.27.0 <1.32.0" - - name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-arm64-server-20250112 + - name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-arm64-server-20250211 providerID: aws architectureID: arm64 kubernetesVersion: ">=1.27.0 <1.32.0" @@ -120,16 +120,16 @@ spec: kubenet: {} kubernetesVersions: - range: ">=1.32.0" - recommendedVersion: 1.32.1 + recommendedVersion: 1.32.2 requiredVersion: 1.30.0 - range: ">=1.31.0" - recommendedVersion: 1.31.5 + recommendedVersion: 1.31.6 requiredVersion: 1.30.0 - range: ">=1.30.0" - recommendedVersion: 1.30.9 + recommendedVersion: 1.30.10 requiredVersion: 1.30.0 - range: ">=1.29.0" - recommendedVersion: 1.29.13 + recommendedVersion: 1.29.14 requiredVersion: 1.29.0 - range: ">=1.28.0" recommendedVersion: 1.28.15 @@ -192,19 +192,19 @@ spec: - range: ">=1.32.0-alpha.1" recommendedVersion: "1.31.0-beta.1" #requiredVersion: 1.32.0 - kubernetesVersion: 1.32.1 + kubernetesVersion: 1.32.2 - range: ">=1.31.0-alpha.1" recommendedVersion: "1.31.0-beta.1" #requiredVersion: 1.31.0 - kubernetesVersion: 1.31.5 + kubernetesVersion: 1.31.6 - range: ">=1.30.0-alpha.1" recommendedVersion: "1.30.3" #requiredVersion: 1.30.0 - kubernetesVersion: 1.30.9 + kubernetesVersion: 1.30.10 - range: ">=1.29.0-alpha.1" recommendedVersion: "1.30.3" #requiredVersion: 1.29.0 - kubernetesVersion: 1.29.13 + kubernetesVersion: 1.29.14 - range: ">=1.28.0-alpha.1" recommendedVersion: "1.30.3" #requiredVersion: 1.28.0 From fbd0ba0c771bf590d3d83aceef43d2c42ed81667 Mon Sep 17 00:00:00 2001 From: Moshe Vayner Date: Thu, 20 Feb 2025 17:33:31 -0500 Subject: [PATCH 2/2] test: hack/update-expected --- .../create_cluster/ha_encrypt/expected-v1alpha2.yaml | 12 ++++++------ .../create_cluster/ipv6/expected-v1alpha2.yaml | 4 ++-- .../create_cluster/karpenter/expected-v1alpha2.yaml | 4 ++-- .../minimal-1.27/expected-v1alpha2.yaml | 4 ++-- .../minimal-1.28/expected-v1alpha2.yaml | 4 ++-- .../minimal-1.29/expected-v1alpha2.yaml | 4 ++-- .../minimal-1.30/expected-v1alpha2.yaml | 4 ++-- .../minimal-1.31/expected-v1alpha2.yaml | 4 ++-- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/tests/integration/create_cluster/ha_encrypt/expected-v1alpha2.yaml b/tests/integration/create_cluster/ha_encrypt/expected-v1alpha2.yaml index 371ce9720b..0454952a87 100644 --- a/tests/integration/create_cluster/ha_encrypt/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ha_encrypt/expected-v1alpha2.yaml @@ -87,7 +87,7 @@ metadata: kops.k8s.io/cluster: ha.example.com name: control-plane-us-test-1a spec: - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20250111 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20250210 instanceMetadata: httpTokens: required machineType: m3.medium @@ -107,7 +107,7 @@ metadata: kops.k8s.io/cluster: ha.example.com name: control-plane-us-test-1b spec: - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20250111 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20250210 instanceMetadata: httpTokens: required machineType: m3.medium @@ -127,7 +127,7 @@ metadata: kops.k8s.io/cluster: ha.example.com name: control-plane-us-test-1c spec: - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20250111 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20250210 instanceMetadata: httpTokens: required machineType: m3.medium @@ -147,7 +147,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-20250111 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20250210 instanceMetadata: httpPutResponseHopLimit: 1 httpTokens: required @@ -168,7 +168,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-20250111 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20250210 instanceMetadata: httpPutResponseHopLimit: 1 httpTokens: required @@ -189,7 +189,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-20250111 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20250210 instanceMetadata: httpPutResponseHopLimit: 1 httpTokens: required diff --git a/tests/integration/create_cluster/ipv6/expected-v1alpha2.yaml b/tests/integration/create_cluster/ipv6/expected-v1alpha2.yaml index c724acb850..652ee06f4a 100644 --- a/tests/integration/create_cluster/ipv6/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ipv6/expected-v1alpha2.yaml @@ -78,7 +78,7 @@ metadata: kops.k8s.io/cluster: ipv6.example.com name: control-plane-us-test-1a spec: - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20250111 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20250210 instanceMetadata: httpTokens: required machineType: m3.medium @@ -98,7 +98,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-20250111 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20250210 instanceMetadata: httpPutResponseHopLimit: 1 httpTokens: required diff --git a/tests/integration/create_cluster/karpenter/expected-v1alpha2.yaml b/tests/integration/create_cluster/karpenter/expected-v1alpha2.yaml index 8c6dcc4e33..595b5c86e5 100644 --- a/tests/integration/create_cluster/karpenter/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/karpenter/expected-v1alpha2.yaml @@ -81,7 +81,7 @@ metadata: kops.k8s.io/cluster: karpenter.example.com name: control-plane-us-test-1a spec: - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20250111 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20250210 instanceMetadata: httpTokens: required machineType: m3.medium @@ -101,7 +101,7 @@ metadata: kops.k8s.io/cluster: karpenter.example.com name: nodes spec: - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20250111 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20250210 instanceMetadata: httpPutResponseHopLimit: 1 httpTokens: required diff --git a/tests/integration/create_cluster/minimal-1.27/expected-v1alpha2.yaml b/tests/integration/create_cluster/minimal-1.27/expected-v1alpha2.yaml index 74ccdb853a..3c52752e02 100644 --- a/tests/integration/create_cluster/minimal-1.27/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/minimal-1.27/expected-v1alpha2.yaml @@ -67,7 +67,7 @@ metadata: kops.k8s.io/cluster: minimal.example.com name: control-plane-us-test-1a spec: - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20250112 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20250211 machineType: m3.medium maxSize: 1 minSize: 1 @@ -85,7 +85,7 @@ metadata: kops.k8s.io/cluster: minimal.example.com name: nodes-us-test-1a spec: - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20250112 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20250211 machineType: t2.medium maxSize: 1 minSize: 1 diff --git a/tests/integration/create_cluster/minimal-1.28/expected-v1alpha2.yaml b/tests/integration/create_cluster/minimal-1.28/expected-v1alpha2.yaml index c93d7369b9..a335519b7d 100644 --- a/tests/integration/create_cluster/minimal-1.28/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/minimal-1.28/expected-v1alpha2.yaml @@ -67,7 +67,7 @@ metadata: kops.k8s.io/cluster: minimal.example.com name: control-plane-us-test-1a spec: - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20250112 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20250211 machineType: m3.medium maxSize: 1 minSize: 1 @@ -85,7 +85,7 @@ metadata: kops.k8s.io/cluster: minimal.example.com name: nodes-us-test-1a spec: - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20250112 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20250211 machineType: t2.medium maxSize: 1 minSize: 1 diff --git a/tests/integration/create_cluster/minimal-1.29/expected-v1alpha2.yaml b/tests/integration/create_cluster/minimal-1.29/expected-v1alpha2.yaml index e576f215ba..4d20ee8408 100644 --- a/tests/integration/create_cluster/minimal-1.29/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/minimal-1.29/expected-v1alpha2.yaml @@ -67,7 +67,7 @@ metadata: kops.k8s.io/cluster: minimal.example.com name: control-plane-us-test-1a spec: - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20250112 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20250211 machineType: m3.medium maxSize: 1 minSize: 1 @@ -85,7 +85,7 @@ metadata: kops.k8s.io/cluster: minimal.example.com name: nodes-us-test-1a spec: - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20250112 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20250211 machineType: t2.medium maxSize: 1 minSize: 1 diff --git a/tests/integration/create_cluster/minimal-1.30/expected-v1alpha2.yaml b/tests/integration/create_cluster/minimal-1.30/expected-v1alpha2.yaml index 5546f407b9..8e2f281ac2 100644 --- a/tests/integration/create_cluster/minimal-1.30/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/minimal-1.30/expected-v1alpha2.yaml @@ -67,7 +67,7 @@ metadata: kops.k8s.io/cluster: minimal.example.com name: control-plane-us-test-1a spec: - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20250112 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20250211 machineType: m3.medium maxSize: 1 minSize: 1 @@ -85,7 +85,7 @@ metadata: kops.k8s.io/cluster: minimal.example.com name: nodes-us-test-1a spec: - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20250112 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20250211 machineType: t2.medium maxSize: 1 minSize: 1 diff --git a/tests/integration/create_cluster/minimal-1.31/expected-v1alpha2.yaml b/tests/integration/create_cluster/minimal-1.31/expected-v1alpha2.yaml index d928c1289f..22da967d36 100644 --- a/tests/integration/create_cluster/minimal-1.31/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/minimal-1.31/expected-v1alpha2.yaml @@ -67,7 +67,7 @@ metadata: kops.k8s.io/cluster: minimal.example.com name: control-plane-us-test-1a spec: - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20250112 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20250211 machineType: m3.medium maxSize: 1 minSize: 1 @@ -85,7 +85,7 @@ metadata: kops.k8s.io/cluster: minimal.example.com name: nodes-us-test-1a spec: - image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20250112 + image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20250211 machineType: t2.medium maxSize: 1 minSize: 1