Skip to content

Commit 2d56a5a

Browse files
committed
build go1.23.6 for release 1.30/1.31 and drop for 1.29
Signed-off-by: cpanato <[email protected]>
1 parent 90469b0 commit 2d56a5a

File tree

2 files changed

+17
-57
lines changed

2 files changed

+17
-57
lines changed

Diff for: dependencies.yaml

+12-34
Original file line numberDiff line numberDiff line change
@@ -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.22.12
44+
version: 1.23.6
4545
refPaths:
4646
- path: images/build/cross/variants.yaml
4747
match: "GO_VERSION: '\\d+.\\d+(alpha|beta|rc)?\\.?(\\d+)?'"
@@ -282,21 +282,21 @@ dependencies:
282282
- path: images/build/cross/variants.yaml
283283
match: REVISION:\ '\d+'
284284

285-
# kube-cross (Kubernetes v1.31, Go 1.22)
285+
# kube-cross (Kubernetes v1.31, Go 1.23)
286286
# To be updated before kubernetes/kubernetes update
287-
- name: "registry.k8s.io/build-image/kube-cross (v1.31-go1.22)"
288-
version: v1.31.0-go1.22.12-bullseye.0
287+
- name: "registry.k8s.io/build-image/kube-cross (v1.31-go1.23)"
288+
version: v1.31.0-go1.23.6-bullseye.0
289289
refPaths:
290290
- path: images/build/cross/variants.yaml
291291
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-]+)*))?)'"
292292

293-
- name: "registry.k8s.io/build-image/kube-cross: config variant (v1.31-go1.22)"
294-
version: go1.22-bullseye
293+
- name: "registry.k8s.io/build-image/kube-cross: config variant (v1.31-go1.23)"
294+
version: go1.23-bullseye
295295
refPaths:
296296
- path: images/build/cross/variants.yaml
297297
match: "CONFIG: 'go\\d+.\\d+-bullseye'"
298298

299-
- name: "registry.k8s.io/build-image/kube-cross: image revision (v1.31-go1.22)"
299+
- name: "registry.k8s.io/build-image/kube-cross: image revision (v1.31-go1.23)"
300300
version: 0
301301
refPaths:
302302
- path: images/build/cross/Makefile
@@ -306,41 +306,19 @@ dependencies:
306306

307307
# kube-cross (Kubernetes v1.30)
308308
# To be updated before kubernetes/kubernetes update
309-
- name: "registry.k8s.io/build-image/kube-cross (v1.30-go1.22)"
310-
version: v1.30.0-go1.22.12-bullseye.0
309+
- name: "registry.k8s.io/build-image/kube-cross (v1.30-go1.23)"
310+
version: v1.30.0-go1.23.6-bullseye.0
311311
refPaths:
312312
- path: images/build/cross/variants.yaml
313313
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-]+)*))?)'"
314314

315-
- name: "registry.k8s.io/build-image/kube-cross: config variant (v1.30-go1.22)"
316-
version: go1.22-bullseye
317-
refPaths:
318-
- path: images/build/cross/variants.yaml
319-
match: "CONFIG: 'go\\d+.\\d+-bullseye'"
320-
321-
- name: "registry.k8s.io/build-image/kube-cross: image revision (v1.30-go1.22)"
322-
version: 0
323-
refPaths:
324-
- path: images/build/cross/Makefile
325-
match: REVISION \?= \d+
326-
- path: images/build/cross/variants.yaml
327-
match: REVISION:\ '\d+'
328-
329-
# kube-cross (Kubernetes v1.29)
330-
# To be updated before kubernetes/kubernetes update
331-
- name: "registry.k8s.io/build-image/kube-cross (v1.29-go1.22)"
332-
version: v1.29.0-go1.22.12-bullseye.0
333-
refPaths:
334-
- path: images/build/cross/variants.yaml
335-
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-]+)*))?)'"
336-
337-
- name: "registry.k8s.io/build-image/kube-cross: config variant (v1.29-go1.22)"
338-
version: go1.22-bullseye
315+
- name: "registry.k8s.io/build-image/kube-cross: config variant (v1.30-go1.23)"
316+
version: go1.23-bullseye
339317
refPaths:
340318
- path: images/build/cross/variants.yaml
341319
match: "CONFIG: 'go\\d+.\\d+-bullseye'"
342320

343-
- name: "registry.k8s.io/build-image/kube-cross: image revision (v1.29-go1.22)"
321+
- name: "registry.k8s.io/build-image/kube-cross: image revision (v1.30-go1.23)"
344322
version: 0
345323
refPaths:
346324
- path: images/build/cross/Makefile

Diff for: images/build/cross/variants.yaml

+5-23
Original file line numberDiff line numberDiff line change
@@ -35,30 +35,12 @@ variants:
3535
GO_MAJOR_VERSION: '1.23'
3636
OS_CODENAME: 'bullseye'
3737
REVISION: '0'
38-
v1.31-go1.22-bullseye:
39-
CONFIG: 'go1.22-bullseye'
40-
TYPE: 'default'
41-
IMAGE_VERSION: 'v1.31.0-go1.22.12-bullseye.0'
42-
KUBERNETES_VERSION: 'v1.31.0'
43-
GO_VERSION: '1.22.12'
44-
GO_MAJOR_VERSION: '1.22'
45-
OS_CODENAME: 'bullseye'
46-
REVISION: '0'
47-
v1.30-go1.22-bullseye:
48-
CONFIG: 'go1.22-bullseye'
38+
v1.30-go1.23-bullseye:
39+
CONFIG: 'go1.23-bullseye'
4940
TYPE: 'default'
50-
IMAGE_VERSION: 'v1.30.0-go1.22.12-bullseye.0'
41+
IMAGE_VERSION: 'v1.30.0-go1.23.6-bullseye.0'
5142
KUBERNETES_VERSION: 'v1.30.0'
52-
GO_VERSION: '1.22.12'
53-
GO_MAJOR_VERSION: '1.22'
54-
OS_CODENAME: 'bullseye'
55-
REVISION: '0'
56-
v1.29-go1.22-bullseye:
57-
CONFIG: 'go1.22-bullseye'
58-
TYPE: 'default'
59-
IMAGE_VERSION: 'v1.29.0-go1.22.12-bullseye.0'
60-
KUBERNETES_VERSION: 'v1.29.0'
61-
GO_VERSION: '1.22.12'
62-
GO_MAJOR_VERSION: '1.22'
43+
GO_VERSION: '1.23.6'
44+
GO_MAJOR_VERSION: '1.23'
6345
OS_CODENAME: 'bullseye'
6446
REVISION: '0'

0 commit comments

Comments
 (0)