Skip to content

Commit c86ea6c

Browse files
authored
Merge pull request #3902 from cpanato/build-go-122-123
build kube-cross, go-runner, releng-ci with golang 1.22.11, 1.23.5
2 parents 760fdec + ecfdb2d commit c86ea6c

File tree

6 files changed

+30
-35
lines changed

6 files changed

+30
-35
lines changed

dependencies.yaml

Lines changed: 10 additions & 10 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.23.4
28+
version: 1.23.5
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.22.10
44+
version: 1.22.11
4545
refPaths:
4646
- path: images/build/cross/variants.yaml
4747
match: "GO_VERSION: '\\d+.\\d+(alpha|beta|rc)?\\.?(\\d+)?'"
@@ -160,7 +160,7 @@ dependencies:
160160
# go-runner (latest Golang)
161161
# To be updated before kubernetes/kubernetes update
162162
- name: "registry.k8s.io/build-image/go-runner (go1.23-bookworm)"
163-
version: v2.4.0-go1.23.4-bookworm.0
163+
version: v2.4.0-go1.23.5-bookworm.0
164164
refPaths:
165165
- path: images/build/go-runner/variants.yaml
166166
match: v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)
@@ -176,7 +176,7 @@ dependencies:
176176
# go-runner (previous stable Golang)
177177
# To be updated before kubernetes/kubernetes update
178178
- name: "registry.k8s.io/build-image/go-runner (go1.22-bookworm)"
179-
version: v2.4.0-go1.22.10-bookworm.0
179+
version: v2.4.0-go1.22.11-bookworm.0
180180
refPaths:
181181
- path: images/build/go-runner/variants.yaml
182182
match: v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)
@@ -219,7 +219,7 @@ dependencies:
219219
# kube-cross (Kubernetes v1.33)
220220
# To be updated before kubernetes/kubernetes update
221221
- name: "registry.k8s.io/build-image/kube-cross (v1.33-go1.23)"
222-
version: v1.33.0-go1.23.4-bullseye.0
222+
version: v1.33.0-go1.23.5-bullseye.0
223223
refPaths:
224224
- path: images/build/cross/variants.yaml
225225
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-]+)*))?)'"
@@ -241,7 +241,7 @@ dependencies:
241241
# kube-cross (Kubernetes v1.32)
242242
# To be updated before kubernetes/kubernetes update
243243
- name: "registry.k8s.io/build-image/kube-cross (v1.32-go1.23)"
244-
version: v1.32.0-go1.23.4-bullseye.0
244+
version: v1.32.0-go1.23.5-bullseye.0
245245
refPaths:
246246
- path: images/build/cross/variants.yaml
247247
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-]+)*))?)'"
@@ -263,7 +263,7 @@ dependencies:
263263
# kube-cross (Kubernetes v1.31)
264264
# To be updated before kubernetes/kubernetes update
265265
- name: "registry.k8s.io/build-image/kube-cross (v1.31-go1.23)"
266-
version: v1.31.0-go1.23.4-bullseye.0
266+
version: v1.31.0-go1.23.5-bullseye.0
267267
refPaths:
268268
- path: images/build/cross/variants.yaml
269269
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,7 +285,7 @@ dependencies:
285285
# kube-cross (Kubernetes v1.31, Go 1.22)
286286
# To be updated before kubernetes/kubernetes update
287287
- name: "registry.k8s.io/build-image/kube-cross (v1.31-go1.22)"
288-
version: v1.31.0-go1.22.10-bullseye.0
288+
version: v1.31.0-go1.22.11-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-]+)*))?)'"
@@ -307,7 +307,7 @@ dependencies:
307307
# kube-cross (Kubernetes v1.30)
308308
# To be updated before kubernetes/kubernetes update
309309
- name: "registry.k8s.io/build-image/kube-cross (v1.30-go1.22)"
310-
version: v1.30.0-go1.22.10-bullseye.0
310+
version: v1.30.0-go1.22.11-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-]+)*))?)'"
@@ -329,7 +329,7 @@ dependencies:
329329
# kube-cross (Kubernetes v1.29)
330330
# To be updated before kubernetes/kubernetes update
331331
- name: "registry.k8s.io/build-image/kube-cross (v1.29-go1.22)"
332-
version: v1.29.0-go1.22.10-bullseye.0
332+
version: v1.29.0-go1.22.11-bullseye.0
333333
refPaths:
334334
- path: images/build/cross/variants.yaml
335335
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-]+)*))?)'"

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.32.0
31-
GO_VERSION ?= 1.23.4
31+
GO_VERSION ?= 1.23.5
3232
GO_MAJOR_VERSION ?= 1.23
3333
OS_CODENAME ?= bullseye
3434
REVISION ?= 0

images/build/cross/variants.yaml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,54 +11,54 @@ variants:
1111
v1.33-go1.23-bullseye:
1212
CONFIG: 'go1.23-bullseye'
1313
TYPE: 'default'
14-
IMAGE_VERSION: 'v1.33.0-go1.23.4-bullseye.0'
14+
IMAGE_VERSION: 'v1.33.0-go1.23.5-bullseye.0'
1515
KUBERNETES_VERSION: 'v1.33.0'
16-
GO_VERSION: '1.23.4'
16+
GO_VERSION: '1.23.5'
1717
GO_MAJOR_VERSION: '1.23'
1818
OS_CODENAME: 'bullseye'
1919
REVISION: '0'
2020
v1.32-go1.23-bullseye:
2121
CONFIG: 'go1.23-bullseye'
2222
TYPE: 'default'
23-
IMAGE_VERSION: 'v1.32.0-go1.23.4-bullseye.0'
23+
IMAGE_VERSION: 'v1.32.0-go1.23.5-bullseye.0'
2424
KUBERNETES_VERSION: 'v1.32.0'
25-
GO_VERSION: '1.23.4'
25+
GO_VERSION: '1.23.5'
2626
GO_MAJOR_VERSION: '1.23'
2727
OS_CODENAME: 'bullseye'
2828
REVISION: '0'
2929
v1.31-go1.23-bullseye:
3030
CONFIG: 'go1.23-bullseye'
3131
TYPE: 'default'
32-
IMAGE_VERSION: 'v1.31.0-go1.23.4-bullseye.0'
32+
IMAGE_VERSION: 'v1.31.0-go1.23.5-bullseye.0'
3333
KUBERNETES_VERSION: 'v1.31.0'
34-
GO_VERSION: '1.23.4'
34+
GO_VERSION: '1.23.5'
3535
GO_MAJOR_VERSION: '1.23'
3636
OS_CODENAME: 'bullseye'
3737
REVISION: '0'
3838
v1.31-go1.22-bullseye:
3939
CONFIG: 'go1.22-bullseye'
4040
TYPE: 'default'
41-
IMAGE_VERSION: 'v1.31.0-go1.22.10-bullseye.0'
41+
IMAGE_VERSION: 'v1.31.0-go1.22.11-bullseye.0'
4242
KUBERNETES_VERSION: 'v1.31.0'
43-
GO_VERSION: '1.22.10'
43+
GO_VERSION: '1.22.11'
4444
GO_MAJOR_VERSION: '1.22'
4545
OS_CODENAME: 'bullseye'
4646
REVISION: '0'
4747
v1.30-go1.22-bullseye:
4848
CONFIG: 'go1.22-bullseye'
4949
TYPE: 'default'
50-
IMAGE_VERSION: 'v1.30.0-go1.22.10-bullseye.0'
50+
IMAGE_VERSION: 'v1.30.0-go1.22.11-bullseye.0'
5151
KUBERNETES_VERSION: 'v1.30.0'
52-
GO_VERSION: '1.22.10'
52+
GO_VERSION: '1.22.11'
5353
GO_MAJOR_VERSION: '1.22'
5454
OS_CODENAME: 'bullseye'
5555
REVISION: '0'
5656
v1.29-go1.22-bullseye:
5757
CONFIG: 'go1.22-bullseye'
5858
TYPE: 'default'
59-
IMAGE_VERSION: 'v1.29.0-go1.22.10-bullseye.0'
59+
IMAGE_VERSION: 'v1.29.0-go1.22.11-bullseye.0'
6060
KUBERNETES_VERSION: 'v1.29.0'
61-
GO_VERSION: '1.22.10'
61+
GO_VERSION: '1.22.11'
6262
GO_MAJOR_VERSION: '1.22'
6363
OS_CODENAME: 'bullseye'
6464
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.23
2121
REVISION ?= 0
22-
GO_VERSION ?= 1.23.4
22+
GO_VERSION ?= 1.23.5
2323
OS_CODENAME ?= bookworm
2424

2525
# Build args

images/build/go-runner/variants.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@ variants:
99
DISTROLESS_IMAGE: 'static-debian12'
1010
go1.23-bookworm:
1111
CONFIG: 'go1.23-bookworm'
12-
IMAGE_VERSION: 'v2.4.0-go1.23.4-bookworm.0'
12+
IMAGE_VERSION: 'v2.4.0-go1.23.5-bookworm.0'
1313
GO_MAJOR_VERSION: '1.23'
1414
OS_CODENAME: 'bookworm'
1515
REVISION: '0'
16-
GO_VERSION: '1.23.4'
16+
GO_VERSION: '1.23.5'
1717
DISTROLESS_IMAGE: 'static-debian12'
1818
go1.22-bookworm:
1919
CONFIG: 'go1.22-bookworm'
20-
IMAGE_VERSION: 'v2.4.0-go1.22.10-bookworm.0'
20+
IMAGE_VERSION: 'v2.4.0-go1.22.11-bookworm.0'
2121
GO_MAJOR_VERSION: '1.22'
2222
OS_CODENAME: 'bookworm'
2323
REVISION: '0'
24-
GO_VERSION: '1.22.10'
24+
GO_VERSION: '1.22.11'
2525
DISTROLESS_IMAGE: 'static-debian12'

images/releng/ci/variants.yaml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,11 @@ variants:
66
REVISION: '0'
77
go1.23-bookworm:
88
CONFIG: 'go1.23-bookworm'
9-
GO_VERSION: '1.23.4'
9+
GO_VERSION: '1.23.5'
1010
OS_CODENAME: 'bookworm'
1111
REVISION: '0'
1212
go1.22-bookworm:
1313
CONFIG: 'go1.22-bookworm'
14-
GO_VERSION: '1.22.10'
15-
OS_CODENAME: 'bookworm'
16-
REVISION: '0'
17-
go1.21-bookworm:
18-
CONFIG: 'go1.21-bookworm'
19-
GO_VERSION: '1.21.13'
14+
GO_VERSION: '1.22.11'
2015
OS_CODENAME: 'bookworm'
2116
REVISION: '0'

0 commit comments

Comments
 (0)