Sitelet https://github.com/kubernetes/kops/commit/9488c60bc6640434bea663292746e905951d7341
Skip to content

Commit 9488c60

Browse files
kubernetes-prow[bot]kubernetes-prow[bot]
authored
Merge pull request #18501 from hakman/channels-chores
chore(channels): promote to stable, bump node images, update recommended kOps versions
2 parents c9b93c3 + d96b240 commit 9488c60

37 files changed

Lines changed: 156 additions & 139 deletions

File tree

‎channels/alpha‎

Lines changed: 24 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -66,19 +66,19 @@ spec:
6666
providerID: aws
6767
architectureID: arm64
6868
kubernetesVersion: ">=1.20.0 <1.27.0"
69-
- name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20260410
69+
- name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20260610
7070
providerID: aws
7171
architectureID: amd64
7272
kubernetesVersion: ">=1.27.0 <1.32.0"
73-
- name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-arm64-server-20260410
73+
- name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-arm64-server-20260610
7474
providerID: aws
7575
architectureID: arm64
7676
kubernetesVersion: ">=1.27.0 <1.32.0"
77-
- name: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260218
77+
- name: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260610
7878
providerID: aws
7979
architectureID: amd64
8080
kubernetesVersion: ">=1.32.0"
81-
- name: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-arm64-server-20260218
81+
- name: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-arm64-server-20260610
8282
providerID: aws
8383
architectureID: arm64
8484
kubernetesVersion: ">=1.32.0"
@@ -94,26 +94,34 @@ spec:
9494
providerID: gce
9595
architectureID: amd64
9696
kubernetesVersion: ">=1.18.0 <1.27.0"
97-
- name: ubuntu-os-cloud/ubuntu-2204-jammy-v20250615
97+
- name: ubuntu-os-cloud/ubuntu-2204-jammy-v20260612
9898
providerID: gce
9999
architectureID: amd64
100100
kubernetesVersion: ">=1.27.0 <1.32.0"
101-
- name: ubuntu-os-cloud/ubuntu-2404-noble-amd64-v20250606
101+
- name: ubuntu-os-cloud/ubuntu-2404-noble-amd64-v20260615
102102
providerID: gce
103103
architectureID: amd64
104104
kubernetesVersion: ">=1.32.0"
105-
- name: Canonical:0001-com-ubuntu-server-focal:20_04-lts-gen2:20.04.202406060
105+
- name: ubuntu-os-cloud/ubuntu-2404-noble-arm64-v20260615
106+
providerID: gce
107+
architectureID: arm64
108+
kubernetesVersion: ">=1.32.0"
109+
- name: Canonical:0001-com-ubuntu-server-focal:20_04-lts-gen2:20.04.202505200
106110
providerID: azure
107111
architectureID: amd64
108112
kubernetesVersion: ">=1.20.0 <1.27.0"
109-
- name: Canonical:0001-com-ubuntu-server-jammy:22_04-lts-gen2:22.04.202506120
113+
- name: Canonical:0001-com-ubuntu-server-jammy:22_04-lts-gen2:22.04.202606110
110114
providerID: azure
111115
architectureID: amd64
112116
kubernetesVersion: ">=1.27.0 <1.32.0"
113-
- name: Canonical:ubuntu-24_04-lts:server:24.04.202507010
117+
- name: Canonical:ubuntu-24_04-lts:server:24.04.202606120
114118
providerID: azure
115119
architectureID: amd64
116120
kubernetesVersion: ">=1.32.0"
121+
- name: Canonical:ubuntu-24_04-lts:server-arm64:24.04.202606110
122+
providerID: azure
123+
architectureID: arm64
124+
kubernetesVersion: ">=1.32.0"
117125
cluster:
118126
kubernetesVersion: v1.5.8
119127
networking:
@@ -206,31 +214,31 @@ spec:
206214
#requiredVersion: 1.36.0
207215
kubernetesVersion: 1.36.2
208216
- range: ">=1.35.0-alpha.1"
209-
recommendedVersion: "1.35.0-beta.1"
217+
recommendedVersion: "1.35.1"
210218
#requiredVersion: 1.35.0
211219
kubernetesVersion: 1.35.6
212220
- range: ">=1.34.0-alpha.1"
213-
recommendedVersion: "1.34.1"
221+
recommendedVersion: "1.35.1"
214222
#requiredVersion: 1.34.0
215223
kubernetesVersion: 1.34.9
216224
- range: ">=1.33.0-alpha.1"
217-
recommendedVersion: "1.34.1"
225+
recommendedVersion: "1.35.1"
218226
#requiredVersion: 1.33.0
219227
kubernetesVersion: 1.33.13
220228
- range: ">=1.32.0-alpha.1"
221-
recommendedVersion: "1.34.1"
229+
recommendedVersion: "1.35.1"
222230
#requiredVersion: 1.32.0
223231
kubernetesVersion: 1.32.13
224232
- range: ">=1.31.0-alpha.1"
225-
recommendedVersion: "1.34.1"
233+
recommendedVersion: "1.35.1"
226234
#requiredVersion: 1.31.0
227235
kubernetesVersion: 1.31.14
228236
- range: ">=1.30.0-alpha.1"
229-
recommendedVersion: "1.34.1"
237+
recommendedVersion: "1.35.1"
230238
#requiredVersion: 1.30.0
231239
kubernetesVersion: 1.30.14
232240
- range: ">=1.29.0-alpha.1"
233-
recommendedVersion: "1.34.1"
241+
recommendedVersion: "1.34.3"
234242
#requiredVersion: 1.29.0
235243
kubernetesVersion: 1.29.15
236244
- range: ">=1.28.0-alpha.1"

‎channels/stable‎

Lines changed: 30 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -66,19 +66,19 @@ spec:
6666
providerID: aws
6767
architectureID: arm64
6868
kubernetesVersion: ">=1.20.0 <1.27.0"
69-
- name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20260410
69+
- name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20260610
7070
providerID: aws
7171
architectureID: amd64
7272
kubernetesVersion: ">=1.27.0 <1.32.0"
73-
- name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-arm64-server-20260410
73+
- name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-arm64-server-20260610
7474
providerID: aws
7575
architectureID: arm64
7676
kubernetesVersion: ">=1.27.0 <1.32.0"
77-
- name: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260218
77+
- name: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260610
7878
providerID: aws
7979
architectureID: amd64
8080
kubernetesVersion: ">=1.32.0"
81-
- name: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-arm64-server-20260218
81+
- name: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-arm64-server-20260610
8282
providerID: aws
8383
architectureID: arm64
8484
kubernetesVersion: ">=1.32.0"
@@ -94,26 +94,34 @@ spec:
9494
providerID: gce
9595
architectureID: amd64
9696
kubernetesVersion: ">=1.18.0 <1.27.0"
97-
- name: ubuntu-os-cloud/ubuntu-2204-jammy-v20250615
97+
- name: ubuntu-os-cloud/ubuntu-2204-jammy-v20260612
9898
providerID: gce
9999
architectureID: amd64
100100
kubernetesVersion: ">=1.27.0 <1.32.0"
101-
- name: ubuntu-os-cloud/ubuntu-2404-noble-amd64-v20250606
101+
- name: ubuntu-os-cloud/ubuntu-2404-noble-amd64-v20260615
102102
providerID: gce
103103
architectureID: amd64
104104
kubernetesVersion: ">=1.32.0"
105-
- name: Canonical:0001-com-ubuntu-server-focal:20_04-lts-gen2:20.04.202406060
105+
- name: ubuntu-os-cloud/ubuntu-2404-noble-arm64-v20260615
106+
providerID: gce
107+
architectureID: arm64
108+
kubernetesVersion: ">=1.32.0"
109+
- name: Canonical:0001-com-ubuntu-server-focal:20_04-lts-gen2:20.04.202505200
106110
providerID: azure
107111
architectureID: amd64
108112
kubernetesVersion: ">=1.20.0 <1.27.0"
109-
- name: Canonical:0001-com-ubuntu-server-jammy:22_04-lts-gen2:22.04.202506120
113+
- name: Canonical:0001-com-ubuntu-server-jammy:22_04-lts-gen2:22.04.202606110
110114
providerID: azure
111115
architectureID: amd64
112116
kubernetesVersion: ">=1.27.0 <1.32.0"
113-
- name: Canonical:ubuntu-24_04-lts:server:24.04.202507010
117+
- name: Canonical:ubuntu-24_04-lts:server:24.04.202606120
114118
providerID: azure
115119
architectureID: amd64
116120
kubernetesVersion: ">=1.32.0"
121+
- name: Canonical:ubuntu-24_04-lts:server-arm64:24.04.202606110
122+
providerID: azure
123+
architectureID: arm64
124+
kubernetesVersion: ">=1.32.0"
117125
cluster:
118126
kubernetesVersion: v1.5.8
119127
networking:
@@ -123,13 +131,13 @@ spec:
123131
recommendedVersion: 1.36.2
124132
requiredVersion: 1.36.0
125133
- range: ">=1.35.0"
126-
recommendedVersion: 1.35.5
134+
recommendedVersion: 1.35.6
127135
requiredVersion: 1.35.0
128136
- range: ">=1.34.0"
129-
recommendedVersion: 1.34.8
137+
recommendedVersion: 1.34.9
130138
requiredVersion: 1.34.0
131139
- range: ">=1.33.0"
132-
recommendedVersion: 1.33.12
140+
recommendedVersion: 1.33.13
133141
requiredVersion: 1.33.0
134142
- range: ">=1.32.0"
135143
recommendedVersion: 1.32.13
@@ -206,31 +214,31 @@ spec:
206214
#requiredVersion: 1.36.0
207215
kubernetesVersion: 1.36.2
208216
- range: ">=1.35.0-alpha.1"
209-
recommendedVersion: "1.34.3"
217+
recommendedVersion: "1.35.1"
210218
#requiredVersion: 1.34.0
211-
kubernetesVersion: 1.35.5
219+
kubernetesVersion: 1.35.6
212220
- range: ">=1.34.0-alpha.1"
213-
recommendedVersion: "1.34.1"
221+
recommendedVersion: "1.35.1"
214222
#requiredVersion: 1.34.0
215-
kubernetesVersion: 1.34.8
223+
kubernetesVersion: 1.34.9
216224
- range: ">=1.33.0-alpha.1"
217-
recommendedVersion: "1.34.1"
225+
recommendedVersion: "1.35.1"
218226
#requiredVersion: 1.33.0
219-
kubernetesVersion: 1.33.12
227+
kubernetesVersion: 1.33.13
220228
- range: ">=1.32.0-alpha.1"
221-
recommendedVersion: "1.34.1"
229+
recommendedVersion: "1.35.1"
222230
#requiredVersion: 1.32.0
223231
kubernetesVersion: 1.32.13
224232
- range: ">=1.31.0-alpha.1"
225-
recommendedVersion: "1.34.1"
233+
recommendedVersion: "1.35.1"
226234
#requiredVersion: 1.31.0
227235
kubernetesVersion: 1.31.14
228236
- range: ">=1.30.0-alpha.1"
229-
recommendedVersion: "1.34.1"
237+
recommendedVersion: "1.35.1"
230238
#requiredVersion: 1.30.0
231239
kubernetesVersion: 1.30.14
232240
- range: ">=1.29.0-alpha.1"
233-
recommendedVersion: "1.34.1"
241+
recommendedVersion: "1.34.3"
234242
#requiredVersion: 1.29.0
235243
kubernetesVersion: 1.29.15
236244
- range: ">=1.28.0-alpha.1"

‎pkg/apis/kops/channel.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,8 @@ func (c *Channel) HasUpstreamImagePrefix(image string) bool {
377377
strings.HasPrefix(image, "Canonical:0001-com-ubuntu-server-focal:20_04-lts-gen2:") ||
378378
strings.HasPrefix(image, "Canonical:0001-com-ubuntu-server-jammy:22_04-lts-gen2:") ||
379379
strings.HasPrefix(image, "Canonical:ubuntu-24_04-lts:server-gen1:") ||
380-
strings.HasPrefix(image, "Canonical:ubuntu-24_04-lts:server:")
380+
strings.HasPrefix(image, "Canonical:ubuntu-24_04-lts:server:") ||
381+
strings.HasPrefix(image, "Canonical:ubuntu-24_04-lts:server-arm64:")
381382
}
382383

383384
// GetPackageVersion returns the version for the package, or an error if could not be found.

‎tests/integration/create_cluster/calico_bpf/expected-v1alpha2.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ metadata:
7070
kops.k8s.io/cluster: calico-bpf.example.com
7171
name: control-plane-us-test-1a
7272
spec:
73-
image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260218
73+
image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260610
7474
machineType: m3.medium
7575
maxSize: 1
7676
minSize: 1
@@ -90,7 +90,7 @@ metadata:
9090
kops.k8s.io/cluster: calico-bpf.example.com
9191
name: nodes-us-test-1a
9292
spec:
93-
image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260218
93+
image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260610
9494
machineType: t2.medium
9595
maxSize: 1
9696
minSize: 1

‎tests/integration/create_cluster/cilium-eni/expected-v1alpha2.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ metadata:
7171
kops.k8s.io/cluster: minimal.example.com
7272
name: control-plane-us-test-1a
7373
spec:
74-
image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260218
74+
image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260610
7575
machineType: m3.medium
7676
maxSize: 1
7777
minSize: 1
@@ -91,7 +91,7 @@ metadata:
9191
kops.k8s.io/cluster: minimal.example.com
9292
name: nodes-us-test-1a
9393
spec:
94-
image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260218
94+
image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260610
9595
machineType: t2.medium
9696
maxSize: 1
9797
minSize: 1

‎tests/integration/create_cluster/complex-private/expected-v1alpha2.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ metadata:
135135
kops.k8s.io/cluster: complex.example.com
136136
name: bastions
137137
spec:
138-
image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260218
138+
image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260610
139139
machineType: t2.micro
140140
maxSize: 1
141141
minSize: 1
@@ -161,7 +161,7 @@ metadata:
161161
kops.k8s.io/cluster: complex.example.com
162162
name: control-plane-us-test-1a
163163
spec:
164-
image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260218
164+
image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260610
165165
machineType: m3.medium
166166
maxSize: 1
167167
minSize: 1
@@ -181,7 +181,7 @@ metadata:
181181
kops.k8s.io/cluster: complex.example.com
182182
name: control-plane-us-test-1b
183183
spec:
184-
image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260218
184+
image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260610
185185
machineType: m3.medium
186186
maxSize: 1
187187
minSize: 1
@@ -201,7 +201,7 @@ metadata:
201201
kops.k8s.io/cluster: complex.example.com
202202
name: control-plane-us-test-1c
203203
spec:
204-
image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260218
204+
image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260610
205205
machineType: m3.medium
206206
maxSize: 1
207207
minSize: 1
@@ -221,7 +221,7 @@ metadata:
221221
kops.k8s.io/cluster: complex.example.com
222222
name: nodes-us-test-1a
223223
spec:
224-
image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260218
224+
image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260610
225225
machineType: t2.medium
226226
maxSize: 4
227227
minSize: 4
@@ -242,7 +242,7 @@ metadata:
242242
kops.k8s.io/cluster: complex.example.com
243243
name: nodes-us-test-1b
244244
spec:
245-
image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260218
245+
image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260610
246246
machineType: t2.medium
247247
maxSize: 3
248248
minSize: 3
@@ -262,7 +262,7 @@ metadata:
262262
kops.k8s.io/cluster: complex.example.com
263263
name: nodes-us-test-1c
264264
spec:
265-
image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260218
265+
image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260610
266266
machineType: t2.medium
267267
maxSize: 3
268268
minSize: 3

‎tests/integration/create_cluster/complex/expected-v1alpha2.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ metadata:
107107
kops.k8s.io/cluster: complex.example.com
108108
name: control-plane-us-test-1a
109109
spec:
110-
image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260218
110+
image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260610
111111
machineType: m3.medium
112112
maxSize: 1
113113
minSize: 1
@@ -127,7 +127,7 @@ metadata:
127127
kops.k8s.io/cluster: complex.example.com
128128
name: control-plane-us-test-1b
129129
spec:
130-
image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260218
130+
image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260610
131131
machineType: m3.medium
132132
maxSize: 1
133133
minSize: 1
@@ -147,7 +147,7 @@ metadata:
147147
kops.k8s.io/cluster: complex.example.com
148148
name: control-plane-us-test-1c
149149
spec:
150-
image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260218
150+
image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260610
151151
machineType: m3.medium
152152
maxSize: 1
153153
minSize: 1
@@ -167,7 +167,7 @@ metadata:
167167
kops.k8s.io/cluster: complex.example.com
168168
name: nodes-us-test-1a
169169
spec:
170-
image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260218
170+
image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260610
171171
machineType: t2.medium
172172
maxSize: 4
173173
minSize: 4
@@ -188,7 +188,7 @@ metadata:
188188
kops.k8s.io/cluster: complex.example.com
189189
name: nodes-us-test-1b
190190
spec:
191-
image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260218
191+
image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260610
192192
machineType: t2.medium
193193
maxSize: 3
194194
minSize: 3
@@ -208,7 +208,7 @@ metadata:
208208
kops.k8s.io/cluster: complex.example.com
209209
name: nodes-us-test-1c
210210
spec:
211-
image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260218
211+
image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260610
212212
machineType: t2.medium
213213
maxSize: 3
214214
minSize: 3

0 commit comments

Comments
 (0)