Merge pull request #16617 from hakman/k8s-june

chore: Promote alpha channel to stable

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-20240426
+    - name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20240610
       providerID: aws
       architectureID: amd64
       kubernetesVersion: ">=1.18.0 <1.27.0"
-    - name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-arm64-server-20240426
+    - name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-arm64-server-20240610
       providerID: aws
       architectureID: arm64
       kubernetesVersion: ">=1.20.0 <1.27.0"
-    - name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20240501
+    - name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20240607
       providerID: aws
       architectureID: amd64
       kubernetesVersion: ">=1.27.0"
-    - name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-arm64-server-20240501
+    - name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-arm64-server-20240607
       providerID: aws
       architectureID: arm64
       kubernetesVersion: ">=1.27.0"
@@ -82,19 +82,19 @@ spec:
       providerID: gce
       architectureID: amd64
       kubernetesVersion: ">=1.16.0 <1.18.0"
-    - name: ubuntu-os-cloud/ubuntu-2004-focal-v20240426
+    - name: ubuntu-os-cloud/ubuntu-2004-focal-v20240607
       providerID: gce
       architectureID: amd64
       kubernetesVersion: ">=1.18.0 <1.27.0"
-    - name: ubuntu-os-cloud/ubuntu-2204-jammy-v20240501
+    - name: ubuntu-os-cloud/ubuntu-2204-jammy-v20240607
       providerID: gce
       architectureID: amd64
       kubernetesVersion: ">=1.27.0"
-    - name: Canonical:0001-com-ubuntu-server-focal:20_04-lts-gen2:20.04.202404270
+    - 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.202405010
+    - name: Canonical:0001-com-ubuntu-server-jammy:22_04-lts-gen2:22.04.202405140
       providerID: azure
       architectureID: amd64
       kubernetesVersion: ">=1.27.0"
@@ -104,16 +104,16 @@ spec:
       kubenet: {}
   kubernetesVersions:
   - range: ">=1.30.0"
-    recommendedVersion: 1.30.0
+    recommendedVersion: 1.30.2
     requiredVersion: 1.30.0
   - range: ">=1.29.0"
-    recommendedVersion: 1.29.4
+    recommendedVersion: 1.29.6
     requiredVersion: 1.29.0
   - range: ">=1.28.0"
-    recommendedVersion: 1.28.9
+    recommendedVersion: 1.28.11
     requiredVersion: 1.28.0
   - range: ">=1.27.0"
-    recommendedVersion: 1.27.13
+    recommendedVersion: 1.27.15
     requiredVersion: 1.27.0
   - range: ">=1.26.0"
     recommendedVersion: 1.26.15
@@ -170,19 +170,19 @@ spec:
   - range: ">=1.30.0-alpha.1"
     recommendedVersion: "1.29.0-beta.1"
     #requiredVersion: 1.30.0
-    kubernetesVersion: 1.30.0
+    kubernetesVersion: 1.30.2
   - range: ">=1.29.0-alpha.1"
     recommendedVersion: "1.29.0-beta.1"
     #requiredVersion: 1.29.0
-    kubernetesVersion: 1.29.3
+    kubernetesVersion: 1.29.6
   - range: ">=1.28.0-alpha.1"
     recommendedVersion: "1.28.4"
     #requiredVersion: 1.28.0
-    kubernetesVersion: 1.28.8
+    kubernetesVersion: 1.28.11
   - range: ">=1.27.0-alpha.1"
     recommendedVersion: "1.28.4"
     #requiredVersion: 1.27.0
-    kubernetesVersion: 1.27.12
+    kubernetesVersion: 1.27.15
   - range: ">=1.26.0-alpha.1"
     recommendedVersion: "1.28.4"
     #requiredVersion: 1.26.0

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-focal-20.04-amd64-server-20240426
+  image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20240610
   instanceMetadata:
     httpTokens: required
   machineType: m3.medium
@@ -91,7 +91,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-20240426
+  image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20240610
   instanceMetadata:
     httpPutResponseHopLimit: 1
     httpTokens: required

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-focal-20.04-amd64-server-20240426
+  image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20240610
   instanceMetadata:
     httpPutResponseHopLimit: 1
     httpTokens: required
@@ -162,7 +162,7 @@ metadata:
     kops.k8s.io/cluster: complex.example.com
   name: control-plane-us-test-1a
 spec:
-  image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20240426
+  image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20240610
   instanceMetadata:
     httpTokens: required
   machineType: m3.medium
@@ -182,7 +182,7 @@ metadata:
     kops.k8s.io/cluster: complex.example.com
   name: control-plane-us-test-1b
 spec:
-  image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20240426
+  image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20240610
   instanceMetadata:
     httpTokens: required
   machineType: m3.medium
@@ -202,7 +202,7 @@ metadata:
     kops.k8s.io/cluster: complex.example.com
   name: control-plane-us-test-1c
 spec:
-  image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20240426
+  image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20240610
   instanceMetadata:
     httpTokens: required
   machineType: m3.medium
@@ -222,7 +222,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-20240426
+  image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20240610
   instanceMetadata:
     httpPutResponseHopLimit: 1
     httpTokens: required
@@ -244,7 +244,7 @@ metadata:
     kops.k8s.io/cluster: complex.example.com
   name: nodes-us-test-1b
 spec:
-  image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20240426
+  image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20240610
   instanceMetadata:
     httpPutResponseHopLimit: 1
     httpTokens: required
@@ -265,7 +265,7 @@ metadata:
     kops.k8s.io/cluster: complex.example.com
   name: nodes-us-test-1c
 spec:
-  image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20240426
+  image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20240610
   instanceMetadata:
     httpPutResponseHopLimit: 1
     httpTokens: required

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-focal-20.04-amd64-server-20240426
+  image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20240610
   instanceMetadata:
     httpTokens: required
   machineType: m3.medium
@@ -127,7 +127,7 @@ metadata:
     kops.k8s.io/cluster: complex.example.com
   name: control-plane-us-test-1b
 spec:
-  image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20240426
+  image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20240610
   instanceMetadata:
     httpTokens: required
   machineType: m3.medium
@@ -147,7 +147,7 @@ metadata:
     kops.k8s.io/cluster: complex.example.com
   name: control-plane-us-test-1c
 spec:
-  image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20240426
+  image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20240610
   instanceMetadata:
     httpTokens: required
   machineType: m3.medium
@@ -167,7 +167,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-20240426
+  image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20240610
   instanceMetadata:
     httpPutResponseHopLimit: 1
     httpTokens: required
@@ -189,7 +189,7 @@ metadata:
     kops.k8s.io/cluster: complex.example.com
   name: nodes-us-test-1b
 spec:
-  image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20240426
+  image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20240610
   instanceMetadata:
     httpPutResponseHopLimit: 1
     httpTokens: required
@@ -210,7 +210,7 @@ metadata:
     kops.k8s.io/cluster: complex.example.com
   name: nodes-us-test-1c
 spec:
-  image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20240426
+  image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20240610
   instanceMetadata:
     httpPutResponseHopLimit: 1
     httpTokens: required

tests/integration/create_cluster/gce_byo_sa/expected-v1alpha2.yaml

@@ -66,7 +66,7 @@ metadata:
     kops.k8s.io/cluster: gce.example.com
   name: control-plane-us-test1-a
 spec:
-  image: ubuntu-os-cloud/ubuntu-2004-focal-v20240426
+  image: ubuntu-os-cloud/ubuntu-2004-focal-v20240607
   machineType: e2-medium
   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-v20240426
+  image: ubuntu-os-cloud/ubuntu-2004-focal-v20240607
   machineType: e2-medium
   maxSize: 1
   minSize: 1

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-focal-20.04-amd64-server-20240426
+  image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20240610
   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-20240426
+  image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20240610
   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-20240426
+  image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20240610
   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-20240426
+  image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20240610
   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-20240426
+  image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20240610
   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-20240426
+  image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20240610
   instanceMetadata:
     httpPutResponseHopLimit: 1
     httpTokens: required

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-20240426
+  image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20240610
   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-20240426
+  image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20240610
   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-20240426
+  image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20240610
   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-20240426
+  image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20240610
   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-20240426
+  image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20240610
   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-20240426
+  image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20240610
   instanceMetadata:
     httpPutResponseHopLimit: 1
     httpTokens: required