Set Ubuntu 24.04 as default in k8s 1.31

simonmacklin · Jul 8, 2024 · acf6e6d · acf6e6d
1 parent 1cd9930
commit acf6e6d
Showing 1 changed file with 20 additions and 4 deletions.
diff --git a/channels/alpha b/channels/alpha
@@ -69,11 +69,19 @@ spec:
     - name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20240607
       providerID: aws
       architectureID: amd64
-      kubernetesVersion: ">=1.27.0"
+      kubernetesVersion: ">=1.27.0 <1.31.0"
     - name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-arm64-server-20240607
       providerID: aws
       architectureID: arm64
-      kubernetesVersion: ">=1.27.0"
+      kubernetesVersion: ">=1.27.0 <1.31.0"
+    - name: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20240701.1
+      providerID: aws
+      architectureID: amd64
+      kubernetesVersion: ">=1.31.0"
+    - name: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-arm64-server-20240701.1
+      providerID: aws
+      architectureID: arm64
+      kubernetesVersion: ">=1.31.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.31.0"
+    - name: ubuntu-os-cloud/ubuntu-2404-noble-amd64-v20240701a
+      providerID: gce
+      architectureID: amd64
+      kubernetesVersion: ">=1.31.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.31.0"
+    - name: Canonical:ubuntu-24_04-lts:server-gen1:24.04.202407011
+      providerID: azure
+      architectureID: amd64
+      kubernetesVersion: ">=1.31.0"
   cluster:
     kubernetesVersion: v1.5.8
     networking: