Merge pull request kubernetes#17203 from hakman/default-ubuntu-2404

Use Ubuntu 24.04 (Noble) as the default distro for K8s 1.32+
next-stack · Jan 12, 2025 · ce641d9 · ce641d9
2 parents 2a5166f + 66d6756
commit ce641d9
Show file tree

Hide file tree

Showing 29 changed files with 124 additions and 94 deletions.
diff --git a/channels/alpha b/channels/alpha
@@ -69,19 +69,19 @@ spec:
     - name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
       providerID: aws
       architectureID: amd64
-      kubernetesVersion: ">=1.27.0 <1.31.0"
+      kubernetesVersion: ">=1.27.0 <1.32.0"
     - name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-arm64-server-20241211
       providerID: aws
       architectureID: arm64
-      kubernetesVersion: ">=1.27.0 <1.31.0"
+      kubernetesVersion: ">=1.27.0 <1.32.0"
     - name: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20241206
       providerID: aws
       architectureID: amd64
-      kubernetesVersion: ">=1.31.0"
+      kubernetesVersion: ">=1.32.0"
     - name: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-arm64-server-20241206
       providerID: aws
       architectureID: arm64
-      kubernetesVersion: ">=1.31.0"
+      kubernetesVersion: ">=1.32.0"
     - name: cos-cloud/cos-stable-65-10323-99-0
       providerID: gce
       architectureID: amd64
@@ -97,23 +97,23 @@ spec:
     - name: ubuntu-os-cloud/ubuntu-2204-jammy-v20240607
       providerID: gce
       architectureID: amd64
-      kubernetesVersion: ">=1.27.0 <1.31.0"
+      kubernetesVersion: ">=1.27.0 <1.32.0"
     - name: ubuntu-os-cloud/ubuntu-2404-noble-amd64-v20240701a
       providerID: gce
       architectureID: amd64
-      kubernetesVersion: ">=1.31.0"
+      kubernetesVersion: ">=1.32.0"
     - name: Canonical:0001-com-ubuntu-server-focal:20_04-lts-gen2:20.04.202406060
       providerID: azure
       architectureID: amd64
       kubernetesVersion: ">=1.20.0 <1.27.0"
     - name: Canonical:0001-com-ubuntu-server-jammy:22_04-lts-gen2:22.04.202405140
       providerID: azure
       architectureID: amd64
-      kubernetesVersion: ">=1.27.0 <1.31.0"
+      kubernetesVersion: ">=1.27.0 <1.32.0"
     - name: Canonical:ubuntu-24_04-lts:server-gen1:24.04.202407011
       providerID: azure
       architectureID: amd64
-      kubernetesVersion: ">=1.31.0"
+      kubernetesVersion: ">=1.32.0"
   cluster:
     kubernetesVersion: v1.5.8
     networking:

diff --git a/channels/stable b/channels/stable
@@ -69,11 +69,19 @@ spec:
     - name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
       providerID: aws
       architectureID: amd64
-      kubernetesVersion: ">=1.27.0"
+      kubernetesVersion: ">=1.27.0 <1.32.0"
     - name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-arm64-server-20241211
       providerID: aws
       architectureID: arm64
-      kubernetesVersion: ">=1.27.0"
+      kubernetesVersion: ">=1.27.0 <1.32.0"
+    - name: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20241206
+      providerID: aws
+      architectureID: amd64
+      kubernetesVersion: ">=1.32.0"
+    - name: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-arm64-server-20241206
+      providerID: aws
+      architectureID: arm64
+      kubernetesVersion: ">=1.32.0"
     - name: cos-cloud/cos-stable-65-10323-99-0
       providerID: gce
       architectureID: amd64
@@ -89,15 +97,23 @@ spec:
     - name: ubuntu-os-cloud/ubuntu-2204-jammy-v20240607
       providerID: gce
       architectureID: amd64
-      kubernetesVersion: ">=1.27.0"
+      kubernetesVersion: ">=1.27.0 <1.32.0"
+    - name: ubuntu-os-cloud/ubuntu-2404-noble-amd64-v20240701a
+      providerID: gce
+      architectureID: amd64
+      kubernetesVersion: ">=1.32.0"
     - name: Canonical:0001-com-ubuntu-server-focal:20_04-lts-gen2:20.04.202406060
       providerID: azure
       architectureID: amd64
       kubernetesVersion: ">=1.20.0 <1.27.0"
     - name: Canonical:0001-com-ubuntu-server-jammy:22_04-lts-gen2:22.04.202405140
       providerID: azure
       architectureID: amd64
-      kubernetesVersion: ">=1.27.0"
+      kubernetesVersion: ">=1.27.0 <1.32.0"
+    - name: Canonical:ubuntu-24_04-lts:server-gen1:24.04.202407011
+      providerID: azure
+      architectureID: amd64
+      kubernetesVersion: ">=1.32.0"
   cluster:
     kubernetesVersion: v1.5.8
     networking:

diff --git a/tests/integration/create_cluster/cilium-eni/expected-v1alpha2.yaml b/tests/integration/create_cluster/cilium-eni/expected-v1alpha2.yaml
@@ -71,7 +71,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-20241211
+  image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20241206
   machineType: m3.medium
   maxSize: 1
   minSize: 1
@@ -89,7 +89,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-20241211
+  image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20241206
   machineType: t2.medium
   maxSize: 1
   minSize: 1

diff --git a/tests/integration/create_cluster/complex-private/expected-v1alpha2.yaml b/tests/integration/create_cluster/complex-private/expected-v1alpha2.yaml
@@ -135,7 +135,7 @@ metadata:
     kops.k8s.io/cluster: complex.example.com
   name: bastions
 spec:
-  image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
+  image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20241206
   machineType: t2.micro
   maxSize: 1
   minSize: 1
@@ -159,7 +159,7 @@ metadata:
     kops.k8s.io/cluster: complex.example.com
   name: control-plane-us-test-1a
 spec:
-  image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
+  image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20241206
   machineType: m3.medium
   maxSize: 1
   minSize: 1
@@ -177,7 +177,7 @@ metadata:
     kops.k8s.io/cluster: complex.example.com
   name: control-plane-us-test-1b
 spec:
-  image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
+  image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20241206
   machineType: m3.medium
   maxSize: 1
   minSize: 1
@@ -195,7 +195,7 @@ metadata:
     kops.k8s.io/cluster: complex.example.com
   name: control-plane-us-test-1c
 spec:
-  image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
+  image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20241206
   machineType: m3.medium
   maxSize: 1
   minSize: 1
@@ -213,7 +213,7 @@ metadata:
     kops.k8s.io/cluster: complex.example.com
   name: nodes-us-test-1a
 spec:
-  image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
+  image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20241206
   machineType: t2.medium
   maxSize: 4
   minSize: 4
@@ -232,7 +232,7 @@ metadata:
     kops.k8s.io/cluster: complex.example.com
   name: nodes-us-test-1b
 spec:
-  image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
+  image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20241206
   machineType: t2.medium
   maxSize: 3
   minSize: 3
@@ -250,7 +250,7 @@ metadata:
     kops.k8s.io/cluster: complex.example.com
   name: nodes-us-test-1c
 spec:
-  image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
+  image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20241206
   machineType: t2.medium
   maxSize: 3
   minSize: 3

diff --git a/tests/integration/create_cluster/complex/expected-v1alpha2.yaml b/tests/integration/create_cluster/complex/expected-v1alpha2.yaml
@@ -107,7 +107,7 @@ metadata:
     kops.k8s.io/cluster: complex.example.com
   name: control-plane-us-test-1a
 spec:
-  image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
+  image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20241206
   machineType: m3.medium
   maxSize: 1
   minSize: 1
@@ -125,7 +125,7 @@ metadata:
     kops.k8s.io/cluster: complex.example.com
   name: control-plane-us-test-1b
 spec:
-  image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
+  image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20241206
   machineType: m3.medium
   maxSize: 1
   minSize: 1
@@ -143,7 +143,7 @@ metadata:
     kops.k8s.io/cluster: complex.example.com
   name: control-plane-us-test-1c
 spec:
-  image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
+  image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20241206
   machineType: m3.medium
   maxSize: 1
   minSize: 1
@@ -161,7 +161,7 @@ metadata:
     kops.k8s.io/cluster: complex.example.com
   name: nodes-us-test-1a
 spec:
-  image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
+  image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20241206
   machineType: t2.medium
   maxSize: 4
   minSize: 4
@@ -180,7 +180,7 @@ metadata:
     kops.k8s.io/cluster: complex.example.com
   name: nodes-us-test-1b
 spec:
-  image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
+  image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20241206
   machineType: t2.medium
   maxSize: 3
   minSize: 3
@@ -198,7 +198,7 @@ metadata:
     kops.k8s.io/cluster: complex.example.com
   name: nodes-us-test-1c
 spec:
-  image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
+  image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20241206
   machineType: t2.medium
   maxSize: 3
   minSize: 3

diff --git a/tests/integration/create_cluster/ha/expected-v1alpha2.yaml b/tests/integration/create_cluster/ha/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-jammy-22.04-amd64-server-20241211
+  image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20241206
   machineType: m3.medium
   maxSize: 1
   minSize: 1
@@ -105,7 +105,7 @@ metadata:
     kops.k8s.io/cluster: ha.example.com
   name: control-plane-us-test-1b
 spec:
-  image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
+  image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20241206
   machineType: m3.medium
   maxSize: 1
   minSize: 1
@@ -123,7 +123,7 @@ metadata:
     kops.k8s.io/cluster: ha.example.com
   name: control-plane-us-test-1c
 spec:
-  image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
+  image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20241206
   machineType: m3.medium
   maxSize: 1
   minSize: 1
@@ -141,7 +141,7 @@ metadata:
     kops.k8s.io/cluster: ha.example.com
   name: nodes-us-test-1a
 spec:
-  image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
+  image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20241206
   machineType: t2.medium
   maxSize: 1
   minSize: 1
@@ -159,7 +159,7 @@ metadata:
     kops.k8s.io/cluster: ha.example.com
   name: nodes-us-test-1b
 spec:
-  image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
+  image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20241206
   machineType: t2.medium
   maxSize: 1
   minSize: 1
@@ -177,7 +177,7 @@ metadata:
     kops.k8s.io/cluster: ha.example.com
   name: nodes-us-test-1c
 spec:
-  image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
+  image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20241206
   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
@@ -73,7 +73,7 @@ metadata:
     kops.k8s.io/cluster: ha-gce.example.com
   name: control-plane-us-test1-a
 spec:
-  image: ubuntu-os-cloud/ubuntu-2204-jammy-v20240607
+  image: ubuntu-os-cloud/ubuntu-2404-noble-amd64-v20240701a
   machineType: e2-medium
   maxSize: 1
   minSize: 1
@@ -93,7 +93,7 @@ metadata:
     kops.k8s.io/cluster: ha-gce.example.com
   name: control-plane-us-test1-b
 spec:
-  image: ubuntu-os-cloud/ubuntu-2204-jammy-v20240607
+  image: ubuntu-os-cloud/ubuntu-2404-noble-amd64-v20240701a
   machineType: e2-medium
   maxSize: 1
   minSize: 1
@@ -113,7 +113,7 @@ metadata:
     kops.k8s.io/cluster: ha-gce.example.com
   name: control-plane-us-test1-c
 spec:
-  image: ubuntu-os-cloud/ubuntu-2204-jammy-v20240607
+  image: ubuntu-os-cloud/ubuntu-2404-noble-amd64-v20240701a
   machineType: e2-medium
   maxSize: 1
   minSize: 1
@@ -133,7 +133,7 @@ metadata:
     kops.k8s.io/cluster: ha-gce.example.com
   name: nodes-us-test1-a
 spec:
-  image: ubuntu-os-cloud/ubuntu-2204-jammy-v20240607
+  image: ubuntu-os-cloud/ubuntu-2404-noble-amd64-v20240701a
   machineType: e2-medium
   maxSize: 1
   minSize: 1
@@ -153,7 +153,7 @@ metadata:
     kops.k8s.io/cluster: ha-gce.example.com
   name: nodes-us-test1-b
 spec:
-  image: ubuntu-os-cloud/ubuntu-2204-jammy-v20240607
+  image: ubuntu-os-cloud/ubuntu-2404-noble-amd64-v20240701a
   machineType: e2-medium
   maxSize: 1
   minSize: 1
@@ -173,7 +173,7 @@ metadata:
     kops.k8s.io/cluster: ha-gce.example.com
   name: nodes-us-test1-c
 spec:
-  image: ubuntu-os-cloud/ubuntu-2204-jammy-v20240607
+  image: ubuntu-os-cloud/ubuntu-2404-noble-amd64-v20240701a
   machineType: e2-medium
   maxSize: 1
   minSize: 1

diff --git a/tests/integration/create_cluster/ha_hetzner/expected-v1alpha2.yaml b/tests/integration/create_cluster/ha_hetzner/expected-v1alpha2.yaml
@@ -71,7 +71,7 @@ metadata:
     kops.k8s.io/cluster: ha.example.com
   name: control-plane-fsn1-1
 spec:
-  image: ubuntu-22.04
+  image: ubuntu-24.04
   machineType: cx21
   maxSize: 1
   minSize: 1
@@ -89,7 +89,7 @@ metadata:
     kops.k8s.io/cluster: ha.example.com
   name: control-plane-fsn1-2
 spec:
-  image: ubuntu-22.04
+  image: ubuntu-24.04
   machineType: cx21
   maxSize: 1
   minSize: 1
@@ -107,7 +107,7 @@ metadata:
     kops.k8s.io/cluster: ha.example.com
   name: control-plane-fsn1-3
 spec:
-  image: ubuntu-22.04
+  image: ubuntu-24.04
   machineType: cx21
   maxSize: 1
   minSize: 1
@@ -125,7 +125,7 @@ metadata:
     kops.k8s.io/cluster: ha.example.com
   name: nodes-fsn1
 spec:
-  image: ubuntu-22.04
+  image: ubuntu-24.04
   machineType: cx21
   maxSize: 1
   minSize: 1