Skip to content

Commit e4f9e15

Browse files
authored
Merge pull request #4188 from cpanato/udpate-go-images
build kube-cross, go-runner, releng-ci with golang 1.25.4/1.24.10
2 parents 06a96b1 + 9d74302 commit e4f9e15

File tree

6 files changed

+26
-66
lines changed

6 files changed

+26
-66
lines changed

dependencies.yaml

Lines changed: 10 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ dependencies:
2525
# Golang (for images, latest)
2626
# To be updated before kubernetes/kubernetes update
2727
- name: "golang (latest)"
28-
version: 1.25.3
28+
version: 1.25.4
2929
refPaths:
3030
- path: images/build/cross/Makefile
3131
match: GO_VERSION\ \?=\ \d+.\d+(alpha|beta|rc)?\.?(\d+)?
@@ -41,7 +41,7 @@ dependencies:
4141
# Golang (for images, previous stable)
4242
# To be updated before kubernetes/kubernetes update
4343
- name: "golang (previous)"
44-
version: 1.24.9
44+
version: 1.24.10
4545
refPaths:
4646
- path: images/build/cross/variants.yaml
4747
match: "GO_VERSION: '\\d+.\\d+(alpha|beta|rc)?\\.?(\\d+)?'"
@@ -53,7 +53,7 @@ dependencies:
5353
# Golang (for images, previous stable)
5454
# To be updated before kubernetes/kubernetes update
5555
- name: "golang (previous)"
56-
version: 1.24.9
56+
version: 1.23.12
5757
refPaths:
5858
- path: images/build/cross/variants.yaml
5959
match: "GO_VERSION: '\\d+.\\d+(alpha|beta|rc)?\\.?(\\d+)?'"
@@ -156,7 +156,7 @@ dependencies:
156156
- path: images/build/go-runner/VERSION
157157

158158
- name: "registry.k8s.io/build-image/go-runner (go1.25-bookworm)"
159-
version: v2.4.0-go1.25.3-bookworm.0
159+
version: v2.4.0-go1.25.4-bookworm.0
160160
refPaths:
161161
- path: images/build/go-runner/variants.yaml
162162
match: v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)
@@ -170,7 +170,7 @@ dependencies:
170170
match: REVISION:\ '\d+'
171171

172172
- name: "registry.k8s.io/build-image/go-runner (go1.24-bookworm)"
173-
version: v2.4.0-go1.24.9-bookworm.0
173+
version: v2.4.0-go1.24.10-bookworm.0
174174
refPaths:
175175
- path: images/build/go-runner/variants.yaml
176176
match: v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)
@@ -186,7 +186,7 @@ dependencies:
186186
# go-runner (latest Golang)
187187
# To be updated before kubernetes/kubernetes update
188188
- name: "registry.k8s.io/build-image/go-runner (go1.23-bookworm)"
189-
version: v2.4.0-go1.24.9-bookworm.0
189+
version: v2.4.0-go1.24.10-bookworm.0
190190
refPaths:
191191
- path: images/build/go-runner/variants.yaml
192192
match: v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)
@@ -207,7 +207,7 @@ dependencies:
207207
match: "CONFIG: 'go\\d+.\\d+-bullseye'"
208208

209209
- name: "registry.k8s.io/build-image/kube-cross (v1.34-go1.24)"
210-
version: v1.35.0-go1.25.3-bullseye.0
210+
version: v1.35.0-go1.25.4-bullseye.0
211211
refPaths:
212212
- path: images/build/cross/variants.yaml
213213
match: "IMAGE_VERSION: 'v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'"
@@ -228,7 +228,7 @@ dependencies:
228228
match: "CONFIG: 'go\\d+.\\d+-bullseye'"
229229

230230
- name: "registry.k8s.io/build-image/kube-cross (v1.34-go1.24)"
231-
version: v1.34.0-go1.24.9-bullseye.0
231+
version: v1.34.0-go1.24.10-bullseye.0
232232
refPaths:
233233
- path: images/build/cross/variants.yaml
234234
match: "IMAGE_VERSION: 'v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'"
@@ -244,7 +244,7 @@ dependencies:
244244
# kube-cross (Kubernetes v1.33)
245245
# To be updated before kubernetes/kubernetes update
246246
- name: "registry.k8s.io/build-image/kube-cross (v1.33-go1.24)"
247-
version: v1.33.0-go1.24.9-bullseye.0
247+
version: v1.33.0-go1.24.10-bullseye.0
248248
refPaths:
249249
- path: images/build/cross/variants.yaml
250250
match: "IMAGE_VERSION: 'v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'"
@@ -266,7 +266,7 @@ dependencies:
266266
# kube-cross (Kubernetes v1.32)
267267
# To be updated before kubernetes/kubernetes update
268268
- name: "registry.k8s.io/build-image/kube-cross (v1.32-go1.23)"
269-
version: v1.32.0-go1.24.9-bullseye.0
269+
version: v1.32.0-go1.24.10-bullseye.0
270270
refPaths:
271271
- path: images/build/cross/variants.yaml
272272
match: "IMAGE_VERSION: 'v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'"
@@ -285,28 +285,6 @@ dependencies:
285285
- path: images/build/cross/variants.yaml
286286
match: REVISION:\ '\d+'
287287

288-
# kube-cross (Kubernetes v1.31)
289-
# To be updated before kubernetes/kubernetes update
290-
- name: "registry.k8s.io/build-image/kube-cross (v1.31-go1.23)"
291-
version: v1.31.0-go1.24.9-bullseye.0
292-
refPaths:
293-
- path: images/build/cross/variants.yaml
294-
match: "IMAGE_VERSION: 'v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'"
295-
296-
- name: "registry.k8s.io/build-image/kube-cross: config variant (v1.31-go1.23)"
297-
version: go1.23-bullseye
298-
refPaths:
299-
- path: images/build/cross/variants.yaml
300-
match: "CONFIG: 'go\\d+.\\d+-bullseye'"
301-
302-
- name: "registry.k8s.io/build-image/kube-cross: image revision (v1.31-go1.23)"
303-
version: 0
304-
refPaths:
305-
- path: images/build/cross/Makefile
306-
match: REVISION \?= \d+
307-
- path: images/build/cross/variants.yaml
308-
match: REVISION:\ '\d+'
309-
310288
# kube-cross dependents (i.e. k8s-cloud-builder)
311289
# To be updated after kubernetes/kubernetes update)
312290
- name: "registry.k8s.io/build-image/kube-cross: dependents k8s-cloud-builder (v1.35-cross1.25)"

images/build/cross/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ IMGNAME = kube-cross
2828
# - v1.100.0-go1.17-bullseye.0 satisfies SemVer regex, while:
2929
# - v1.100-go1.17-bullseye.0 does not
3030
KUBERNETES_VERSION ?= v1.35.0
31-
GO_VERSION ?= 1.25.3
31+
GO_VERSION ?= 1.25.4
3232
GO_MAJOR_VERSION ?= 1.25
3333
OS_CODENAME ?= bullseye
3434
REVISION ?= 0

images/build/cross/variants.yaml

Lines changed: 8 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,36 +2,36 @@ variants:
22
v1.35-go1.25-bullseye:
33
CONFIG: 'go1.25-bullseye'
44
TYPE: 'default'
5-
IMAGE_VERSION: 'v1.35.0-go1.25.3-bullseye.0'
5+
IMAGE_VERSION: 'v1.35.0-go1.25.4-bullseye.0'
66
KUBERNETES_VERSION: 'v1.35.0'
7-
GO_VERSION: '1.25.3'
7+
GO_VERSION: '1.25.4'
88
GO_MAJOR_VERSION: '1.25'
99
OS_CODENAME: 'bullseye'
1010
REVISION: '0'
1111
v1.34-go1.24-bullseye:
1212
CONFIG: 'go1.24-bullseye'
1313
TYPE: 'default'
14-
IMAGE_VERSION: 'v1.34.0-go1.24.9-bullseye.0'
14+
IMAGE_VERSION: 'v1.34.0-go1.24.10-bullseye.0'
1515
KUBERNETES_VERSION: 'v1.34.0'
16-
GO_VERSION: '1.24.9'
16+
GO_VERSION: '1.24.10'
1717
GO_MAJOR_VERSION: '1.24'
1818
OS_CODENAME: 'bullseye'
1919
REVISION: '0'
2020
v1.33-go1.24-bullseye:
2121
CONFIG: 'go1.24-bullseye'
2222
TYPE: 'default'
23-
IMAGE_VERSION: 'v1.33.0-go1.24.9-bullseye.0'
23+
IMAGE_VERSION: 'v1.33.0-go1.24.10-bullseye.0'
2424
KUBERNETES_VERSION: 'v1.33.0'
25-
GO_VERSION: '1.24.9'
25+
GO_VERSION: '1.24.10'
2626
GO_MAJOR_VERSION: '1.24'
2727
OS_CODENAME: 'bullseye'
2828
REVISION: '0'
2929
v1.32-go1.24-bullseye:
3030
CONFIG: 'go1.24-bullseye'
3131
TYPE: 'default'
32-
IMAGE_VERSION: 'v1.32.0-go1.24.9-bullseye.0'
32+
IMAGE_VERSION: 'v1.32.0-go1.24.10-bullseye.0'
3333
KUBERNETES_VERSION: 'v1.32.0'
34-
GO_VERSION: '1.24.9'
34+
GO_VERSION: '1.24.10'
3535
GO_MAJOR_VERSION: '1.24'
3636
OS_CODENAME: 'bullseye'
3737
REVISION: '0'
@@ -44,21 +44,3 @@ variants:
4444
GO_MAJOR_VERSION: '1.23'
4545
OS_CODENAME: 'bullseye'
4646
REVISION: '0'
47-
v1.31-go1.24-bullseye:
48-
CONFIG: 'go1.24-bullseye'
49-
TYPE: 'default'
50-
IMAGE_VERSION: 'v1.31.0-go1.24.9-bullseye.0'
51-
KUBERNETES_VERSION: 'v1.31.0'
52-
GO_VERSION: '1.24.9'
53-
GO_MAJOR_VERSION: '1.24'
54-
OS_CODENAME: 'bullseye'
55-
REVISION: '0'
56-
v1.31-go1.23-bullseye:
57-
CONFIG: 'go1.23-bullseye'
58-
TYPE: 'default'
59-
IMAGE_VERSION: 'v1.31.0-go1.23.12-bullseye.0'
60-
KUBERNETES_VERSION: 'v1.31.0'
61-
GO_VERSION: '1.23.12'
62-
GO_MAJOR_VERSION: '1.23'
63-
OS_CODENAME: 'bullseye'
64-
REVISION: '0'

images/build/go-runner/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ IMGNAME = go-runner
1919
APP_VERSION = $(shell cat VERSION)
2020
GO_MAJOR_VERSION ?= 1.25
2121
REVISION ?= 0
22-
GO_VERSION ?= 1.25.3
22+
GO_VERSION ?= 1.25.4
2323
OS_CODENAME ?= bookworm-slim
2424

2525
# Build args

images/build/go-runner/variants.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
variants:
22
go1.25-bookworm:
33
CONFIG: 'go1.25-bookworm'
4-
IMAGE_VERSION: 'v2.4.0-go1.25.3-bookworm.0'
4+
IMAGE_VERSION: 'v2.4.0-go1.25.4-bookworm.0'
55
GO_MAJOR_VERSION: '1.25'
66
OS_CODENAME: 'bookworm'
77
REVISION: '0'
8-
GO_VERSION: '1.25.3'
8+
GO_VERSION: '1.25.4'
99
DISTROLESS_IMAGE: 'static-debian12'
1010
go1.24-bookworm:
1111
CONFIG: 'go1.24-bookworm'
12-
IMAGE_VERSION: 'v2.4.0-go1.24.9-bookworm.0'
12+
IMAGE_VERSION: 'v2.4.0-go1.24.10-bookworm.0'
1313
GO_MAJOR_VERSION: '1.24'
1414
OS_CODENAME: 'bookworm'
1515
REVISION: '0'
16-
GO_VERSION: '1.24.9'
16+
GO_VERSION: '1.24.10'
1717
DISTROLESS_IMAGE: 'static-debian12'
1818
go1.23-bookworm:
1919
CONFIG: 'go1.23-bookworm'

images/releng/ci/variants.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
variants:
22
go1.25-trixie:
33
CONFIG: 'go1.25-trixie'
4-
GO_VERSION: '1.25.3'
4+
GO_VERSION: '1.25.4'
55
OS_CODENAME: 'trixie'
66
REVISION: '0'
77
go1.24-bookworm:
88
CONFIG: 'go1.24-bookworm'
9-
GO_VERSION: '1.24.9'
9+
GO_VERSION: '1.24.10'
1010
OS_CODENAME: 'bookworm'
1111
REVISION: '0'
1212
go1.23-bookworm:

0 commit comments

Comments
 (0)