Skip to content

Commit da8ee93

Browse files
authored
Merge pull request #4092 from saschagrunert/k8s-ci-builder
Update k8s-cloud-builder and k8s-ci-builder to Go 1.24.6 for main
2 parents f8fa6b9 + 8f3e3a3 commit da8ee93

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

dependencies.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ dependencies:
297297
# kube-cross dependents (i.e. k8s-cloud-builder)
298298
# To be updated after kubernetes/kubernetes update)
299299
- name: "registry.k8s.io/build-image/kube-cross: dependents k8s-cloud-builder (v1.34-cross1.24)"
300-
version: v1.34.0-go1.24.5-bullseye.0
300+
version: v1.34.0-go1.24.6-bullseye.0
301301
refPaths:
302302
- path: images/k8s-cloud-builder/variants.yaml
303303
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-]+)*))?)'"
@@ -329,7 +329,7 @@ dependencies:
329329

330330
# Golang (current release branch: master)
331331
- name: "golang: after kubernetes/kubernetes update (master)"
332-
version: 1.24.5
332+
version: 1.24.6
333333
refPaths:
334334
- path: images/releng/k8s-ci-builder/Makefile
335335
match: GO_VERSION\ \?=\ \d+.\d+(alpha|beta|rc)?\.?(\d+)?
@@ -359,7 +359,7 @@ dependencies:
359359

360360
# k8s-ci-builder
361361
- name: "golang: releng tooling for k8s-ci-builder (master)"
362-
version: 1.24.5
362+
version: 1.24.6
363363
refPaths:
364364
- path: images/releng/k8s-ci-builder/Makefile
365365
match: GO_VERSION_TOOLING\ \?=\ \d+.\d+(alpha|beta|rc)?\.?(\d+)?

images/k8s-cloud-builder/variants.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
variants:
22
v1.34-cross1.24-bullseye:
33
CONFIG: 'cross1.24'
4-
KUBE_CROSS_VERSION: 'v1.34.0-go1.24.5-bullseye.0'
4+
KUBE_CROSS_VERSION: 'v1.34.0-go1.24.6-bullseye.0'
55
v1.33-cross1.24-bullseye:
66
CONFIG: 'cross1.24'
77
KUBE_CROSS_VERSION: 'v1.33.0-go1.24.5-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.24.5
28-
GO_VERSION_TOOLING ?= 1.24.5
27+
GO_VERSION ?= 1.24.6
28+
GO_VERSION_TOOLING ?= 1.24.6
2929
OS_CODENAME ?= bullseye
3030
IMAGE_ARG ?= $(IMAGE):$(TAG)-$(CONFIG)
3131

images/releng/k8s-ci-builder/variants.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
variants:
22
default:
33
CONFIG: default
4-
GO_VERSION: '1.24.5'
5-
GO_VERSION_TOOLING: '1.24.5'
4+
GO_VERSION: '1.24.6'
5+
GO_VERSION_TOOLING: '1.24.6'
66
OS_CODENAME: 'bullseye'
77
next:
88
CONFIG: next
@@ -11,8 +11,8 @@ variants:
1111
OS_CODENAME: 'bookworm'
1212
'1.34':
1313
CONFIG: '1.34'
14-
GO_VERSION: '1.24.5'
15-
GO_VERSION_TOOLING: '1.24.5'
14+
GO_VERSION: '1.24.6'
15+
GO_VERSION_TOOLING: '1.24.6'
1616
OS_CODENAME: 'bullseye'
1717
'1.33':
1818
CONFIG: '1.33'

0 commit comments

Comments
 (0)