Skip to content

Commit 5bd87f4

Browse files
authored
Merge pull request #4093 from cpanato/update-builder
Update k8s-cloud-builder and k8s-ci-builder to Go v1.24.6 and v1.23.12
2 parents 85fff8d + 9ba091e commit 5bd87f4

File tree

3 files changed

+19
-19
lines changed

3 files changed

+19
-19
lines changed

dependencies.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -303,19 +303,19 @@ dependencies:
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-]+)*))?)'"
304304

305305
- name: "registry.k8s.io/build-image/kube-cross: dependents k8s-cloud-builder (v1.33-cross1.24)"
306-
version: v1.33.0-go1.24.5-bullseye.0
306+
version: v1.33.0-go1.24.6-bullseye.0
307307
refPaths:
308308
- path: images/k8s-cloud-builder/variants.yaml
309309
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-]+)*))?)'"
310310

311311
- name: "registry.k8s.io/build-image/kube-cross: dependents k8s-cloud-builder (v1.32-cross1.23)"
312-
version: v1.32.0-go1.23.11-bullseye.0
312+
version: v1.32.0-go1.23.12-bullseye.0
313313
refPaths:
314314
- path: images/k8s-cloud-builder/variants.yaml
315315
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-]+)*))?)'"
316316

317317
- name: "registry.k8s.io/build-image/kube-cross: dependents k8s-cloud-builder (v1.31-cross1.23)"
318-
version: v1.31.0-go1.23.11-bullseye.0
318+
version: v1.31.0-go1.23.12-bullseye.0
319319
refPaths:
320320
- path: images/k8s-cloud-builder/variants.yaml
321321
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-]+)*))?)'"
@@ -338,21 +338,21 @@ dependencies:
338338

339339
# Golang (previous release branch: 1.33)
340340
- name: "golang: after kubernetes/kubernetes update (previous release branches: 1.33)"
341-
version: 1.24.5
341+
version: 1.24.6
342342
refPaths:
343343
- path: images/releng/k8s-ci-builder/variants.yaml
344344
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
345345

346346
# Golang (previous release branch: 1.32)
347347
- name: "golang: after kubernetes/kubernetes update (previous release branches: 1.32)"
348-
version: 1.23.11
348+
version: 1.23.12
349349
refPaths:
350350
- path: images/releng/k8s-ci-builder/variants.yaml
351351
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
352352

353353
# Golang (previous release branch: 1.31)
354354
- name: "golang: after kubernetes/kubernetes update (previous release branches: 1.31)"
355-
version: 1.23.11
355+
version: 1.23.12
356356
refPaths:
357357
- path: images/releng/k8s-ci-builder/variants.yaml
358358
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
@@ -367,19 +367,19 @@ dependencies:
367367
match: "GO_VERSION_TOOLING: '\\d+.\\d+(alpha|beta|rc)?\\.?(\\d+)?'"
368368

369369
- name: "golang: releng tooling for k8s-ci-builder (previous release branches: 1.33)"
370-
version: 1.24.5
370+
version: 1.24.6
371371
refPaths:
372372
- path: images/releng/k8s-ci-builder/variants.yaml
373373
match: "GO_VERSION_TOOLING: '\\d+.\\d+(alpha|beta|rc)?\\.?(\\d+)?'"
374374

375375
- name: "golang: releng tooling for k8s-ci-builder (previous release branches: 1.32)"
376-
version: 1.24.5
376+
version: 1.24.6
377377
refPaths:
378378
- path: images/releng/k8s-ci-builder/variants.yaml
379379
match: "GO_VERSION_TOOLING: '\\d+.\\d+(alpha|beta|rc)?\\.?(\\d+)?'"
380380

381381
- name: "golang: releng tooling for k8s-ci-builder (previous release branches: 1.31)"
382-
version: 1.24.5
382+
version: 1.24.6
383383
refPaths:
384384
- path: images/releng/k8s-ci-builder/variants.yaml
385385
match: "GO_VERSION_TOOLING: '\\d+.\\d+(alpha|beta|rc)?\\.?(\\d+)?'"

images/k8s-cloud-builder/variants.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ variants:
44
KUBE_CROSS_VERSION: 'v1.34.0-go1.24.6-bullseye.0'
55
v1.33-cross1.24-bullseye:
66
CONFIG: 'cross1.24'
7-
KUBE_CROSS_VERSION: 'v1.33.0-go1.24.5-bullseye.0'
7+
KUBE_CROSS_VERSION: 'v1.33.0-go1.24.6-bullseye.0'
88
v1.32-cross1.23-bullseye:
99
CONFIG: 'cross1.23'
10-
KUBE_CROSS_VERSION: 'v1.32.0-go1.23.11-bullseye.0'
10+
KUBE_CROSS_VERSION: 'v1.32.0-go1.23.12-bullseye.0'
1111
v1.31-cross1.23-bullseye:
1212
CONFIG: 'cross1.23'
13-
KUBE_CROSS_VERSION: 'v1.31.0-go1.23.11-bullseye.0'
13+
KUBE_CROSS_VERSION: 'v1.31.0-go1.23.12-bullseye.0'

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ variants:
77
next:
88
CONFIG: next
99
GO_VERSION: '1.25rc2'
10-
GO_VERSION_TOOLING: '1.24.5'
10+
GO_VERSION_TOOLING: '1.24.6'
1111
OS_CODENAME: 'bookworm'
1212
'1.34':
1313
CONFIG: '1.34'
@@ -16,16 +16,16 @@ variants:
1616
OS_CODENAME: 'bullseye'
1717
'1.33':
1818
CONFIG: '1.33'
19-
GO_VERSION: '1.24.5'
20-
GO_VERSION_TOOLING: '1.24.5'
19+
GO_VERSION: '1.24.6'
20+
GO_VERSION_TOOLING: '1.24.6'
2121
OS_CODENAME: 'bullseye'
2222
'1.32':
2323
CONFIG: '1.32'
24-
GO_VERSION: '1.23.11'
25-
GO_VERSION_TOOLING: '1.24.5'
24+
GO_VERSION: '1.23.12'
25+
GO_VERSION_TOOLING: '1.24.6'
2626
OS_CODENAME: 'bullseye'
2727
'1.31':
2828
CONFIG: '1.31'
29-
GO_VERSION: '1.23.11'
30-
GO_VERSION_TOOLING: '1.24.5'
29+
GO_VERSION: '1.23.12'
30+
GO_VERSION_TOOLING: '1.24.6'
3131
OS_CODENAME: 'bullseye'

0 commit comments

Comments
 (0)