Skip to content

Commit a6a6668

Browse files
authored
Merge pull request #4209 from cpanato/update-k8sbuilders
Update k8s-cloud-builder and k8s-ci-builder to Go 1.25.5/1.24.11
2 parents 560c6e4 + 085850c commit a6a6668

File tree

4 files changed

+30
-30
lines changed

4 files changed

+30
-30
lines changed

dependencies.yaml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -262,25 +262,25 @@ dependencies:
262262
# kube-cross dependents (i.e. k8s-cloud-builder)
263263
# To be updated after kubernetes/kubernetes update)
264264
- name: "registry.k8s.io/build-image/kube-cross: dependents k8s-cloud-builder (v1.35-cross1.25)"
265-
version: v1.35.0-go1.25.4-bullseye.0
265+
version: v1.35.0-go1.25.5-bullseye.0
266266
refPaths:
267267
- path: images/k8s-cloud-builder/variants.yaml
268268
match: "KUBE_CROSS_VERSION: 'v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'"
269269

270270
- name: "registry.k8s.io/build-image/kube-cross: dependents k8s-cloud-builder (v1.34-cross1.24)"
271-
version: v1.34.0-go1.24.10-bullseye.0
271+
version: v1.34.0-go1.24.11-bullseye.0
272272
refPaths:
273273
- path: images/k8s-cloud-builder/variants.yaml
274274
match: "KUBE_CROSS_VERSION: 'v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'"
275275

276276
- name: "registry.k8s.io/build-image/kube-cross: dependents k8s-cloud-builder (v1.33-cross1.24)"
277-
version: v1.33.0-go1.24.10-bullseye.0
277+
version: v1.33.0-go1.24.11-bullseye.0
278278
refPaths:
279279
- path: images/k8s-cloud-builder/variants.yaml
280280
match: "KUBE_CROSS_VERSION: 'v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'"
281281

282282
- name: "registry.k8s.io/build-image/kube-cross: dependents k8s-cloud-builder (v1.32-cross1.24)"
283-
version: v1.32.0-go1.24.10-bullseye.0
283+
version: v1.32.0-go1.24.11-bullseye.0
284284
refPaths:
285285
- path: images/k8s-cloud-builder/variants.yaml
286286
match: "KUBE_CROSS_VERSION: 'v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'"
@@ -294,7 +294,7 @@ dependencies:
294294

295295
# Golang (current release branch: master)
296296
- name: "golang: after kubernetes/kubernetes update (master)"
297-
version: 1.25.4
297+
version: 1.25.5
298298
refPaths:
299299
- path: images/releng/k8s-ci-builder/Makefile
300300
match: GO_VERSION\ \?=\ \d+.\d+(alpha|beta|rc)?\.?(\d+)?
@@ -303,48 +303,48 @@ dependencies:
303303

304304
# Golang (previous release branch: 1.34)
305305
- name: "golang: after kubernetes/kubernetes update (previous release branches: 1.34)"
306-
version: 1.24.10
306+
version: 1.24.11
307307
refPaths:
308308
- path: images/releng/k8s-ci-builder/variants.yaml
309309
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
310310

311311
# Golang (previous release branch: 1.33)
312312
- name: "golang: after kubernetes/kubernetes update (previous release branches: 1.33)"
313-
version: 1.24.10
313+
version: 1.24.11
314314
refPaths:
315315
- path: images/releng/k8s-ci-builder/variants.yaml
316316
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
317317

318318
# Golang (previous release branch: 1.32)
319319
- name: "golang: after kubernetes/kubernetes update (previous release branches: 1.32)"
320-
version: 1.24.10
320+
version: 1.24.11
321321
refPaths:
322322
- path: images/releng/k8s-ci-builder/variants.yaml
323323
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
324324

325325
# k8s-ci-builder
326326
- name: "golang: releng tooling for k8s-ci-builder (master)"
327-
version: 1.25.4
327+
version: 1.25.5
328328
refPaths:
329329
- path: images/releng/k8s-ci-builder/Makefile
330330
match: GO_VERSION_TOOLING\ \?=\ \d+.\d+(alpha|beta|rc)?\.?(\d+)?
331331
- path: images/releng/k8s-ci-builder/variants.yaml
332332
match: "GO_VERSION_TOOLING: '\\d+.\\d+(alpha|beta|rc)?\\.?(\\d+)?'"
333333

334334
- name: "golang: releng tooling for k8s-ci-builder (previous release branches: 1.34)"
335-
version: 1.24.10
335+
version: 1.24.11
336336
refPaths:
337337
- path: images/releng/k8s-ci-builder/variants.yaml
338338
match: "GO_VERSION_TOOLING: '\\d+.\\d+(alpha|beta|rc)?\\.?(\\d+)?'"
339339

340340
- name: "golang: releng tooling for k8s-ci-builder (previous release branches: 1.33)"
341-
version: 1.24.10
341+
version: 1.24.11
342342
refPaths:
343343
- path: images/releng/k8s-ci-builder/variants.yaml
344344
match: "GO_VERSION_TOOLING: '\\d+.\\d+(alpha|beta|rc)?\\.?(\\d+)?'"
345345

346346
- name: "golang: releng tooling for k8s-ci-builder (previous release branches: 1.32)"
347-
version: 1.24.10
347+
version: 1.24.11
348348
refPaths:
349349
- path: images/releng/k8s-ci-builder/variants.yaml
350350
match: "GO_VERSION_TOOLING: '\\d+.\\d+(alpha|beta|rc)?\\.?(\\d+)?'"
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
variants:
22
v1.35-cross1.25-bullseye:
33
CONFIG: 'cross1.25'
4-
KUBE_CROSS_VERSION: 'v1.35.0-go1.25.4-bullseye.0'
4+
KUBE_CROSS_VERSION: 'v1.35.0-go1.25.5-bullseye.0'
55
v1.34-cross1.24-bullseye:
66
CONFIG: 'cross1.24'
7-
KUBE_CROSS_VERSION: 'v1.34.0-go1.24.10-bullseye.0'
7+
KUBE_CROSS_VERSION: 'v1.34.0-go1.24.11-bullseye.0'
88
v1.33-cross1.24-bullseye:
99
CONFIG: 'cross1.24'
10-
KUBE_CROSS_VERSION: 'v1.33.0-go1.24.10-bullseye.0'
10+
KUBE_CROSS_VERSION: 'v1.33.0-go1.24.11-bullseye.0'
1111
v1.32-cross1.24-bullseye:
1212
CONFIG: 'cross1.24'
13-
KUBE_CROSS_VERSION: 'v1.32.0-go1.24.10-bullseye.0'
13+
KUBE_CROSS_VERSION: 'v1.32.0-go1.24.11-bullseye.0'

images/releng/k8s-ci-builder/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ IMAGE = $(REGISTRY)/$(IMGNAME)
2424
TAG ?= $(shell git describe --tags --always --dirty)
2525

2626
# Build args
27-
GO_VERSION ?= 1.25.4
28-
GO_VERSION_TOOLING ?= 1.25.4
27+
GO_VERSION ?= 1.25.5
28+
GO_VERSION_TOOLING ?= 1.25.5
2929
OS_CODENAME ?= bullseye
3030
IMAGE_ARG ?= $(IMAGE):$(TAG)-$(CONFIG)
3131

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
variants:
22
default:
33
CONFIG: default
4-
GO_VERSION: '1.25.4'
5-
GO_VERSION_TOOLING: '1.25.4'
4+
GO_VERSION: '1.25.5'
5+
GO_VERSION_TOOLING: '1.25.5'
66
OS_CODENAME: 'bullseye'
77
next:
88
CONFIG: next
9-
GO_VERSION: '1.25.4'
10-
GO_VERSION_TOOLING: '1.25.4'
9+
GO_VERSION: '1.25.5'
10+
GO_VERSION_TOOLING: '1.25.5'
1111
OS_CODENAME: 'bookworm'
1212
'1.35':
1313
CONFIG: '1.35'
14-
GO_VERSION: '1.25.4'
15-
GO_VERSION_TOOLING: '1.25.4'
14+
GO_VERSION: '1.25.5'
15+
GO_VERSION_TOOLING: '1.25.5'
1616
OS_CODENAME: 'bullseye'
1717
'1.34':
1818
CONFIG: '1.34'
19-
GO_VERSION: '1.24.10'
20-
GO_VERSION_TOOLING: '1.24.10'
19+
GO_VERSION: '1.24.11'
20+
GO_VERSION_TOOLING: '1.24.11'
2121
OS_CODENAME: 'bullseye'
2222
'1.33':
2323
CONFIG: '1.33'
24-
GO_VERSION: '1.24.10'
25-
GO_VERSION_TOOLING: '1.24.10'
24+
GO_VERSION: '1.24.11'
25+
GO_VERSION_TOOLING: '1.24.11'
2626
OS_CODENAME: 'bullseye'
2727
'1.32':
2828
CONFIG: '1.32'
29-
GO_VERSION: '1.24.10'
30-
GO_VERSION_TOOLING: '1.24.10'
29+
GO_VERSION: '1.24.11'
30+
GO_VERSION_TOOLING: '1.24.11'
3131
OS_CODENAME: 'bullseye'

0 commit comments

Comments
 (0)