Skip to content

Commit 24b891a

Browse files
authored
Merge pull request #4065 from cpanato/updatebuilders
Update k8s-cloud-builder and k8s-ci-builder to Go v1.24.5 and v1.23.11
2 parents 33a2cc0 + a53fbe7 commit 24b891a

File tree

3 files changed

+19
-46
lines changed

3 files changed

+19
-46
lines changed

dependencies.yaml

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

327327
- name: "registry.k8s.io/build-image/kube-cross: dependents k8s-cloud-builder (v1.33-cross1.24)"
328-
version: v1.33.0-go1.24.4-bullseye.0
328+
version: v1.33.0-go1.24.5-bullseye.0
329329
refPaths:
330330
- path: images/k8s-cloud-builder/variants.yaml
331331
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-]+)*))?)'"
332332

333333
- name: "registry.k8s.io/build-image/kube-cross: dependents k8s-cloud-builder (v1.32-cross1.23)"
334-
version: v1.32.0-go1.23.10-bullseye.0
334+
version: v1.32.0-go1.23.11-bullseye.0
335335
refPaths:
336336
- path: images/k8s-cloud-builder/variants.yaml
337337
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-]+)*))?)'"
338338

339339
- name: "registry.k8s.io/build-image/kube-cross: dependents k8s-cloud-builder (v1.31-cross1.23)"
340-
version: v1.31.0-go1.23.10-bullseye.0
341-
refPaths:
342-
- path: images/k8s-cloud-builder/variants.yaml
343-
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-]+)*))?)'"
344-
345-
- name: "registry.k8s.io/build-image/kube-cross: dependents k8s-cloud-builder (v1.30-cross1.23)"
346-
version: v1.30.0-go1.23.10-bullseye.0
340+
version: v1.31.0-go1.23.11-bullseye.0
347341
refPaths:
348342
- path: images/k8s-cloud-builder/variants.yaml
349343
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-]+)*))?)'"
@@ -366,28 +360,21 @@ dependencies:
366360

367361
# Golang (previous release branch: 1.33)
368362
- name: "golang: after kubernetes/kubernetes update (previous release branches: 1.33)"
369-
version: 1.24.4
363+
version: 1.24.5
370364
refPaths:
371365
- path: images/releng/k8s-ci-builder/variants.yaml
372366
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
373367

374368
# Golang (previous release branch: 1.32)
375369
- name: "golang: after kubernetes/kubernetes update (previous release branches: 1.32)"
376-
version: 1.23.10
370+
version: 1.23.11
377371
refPaths:
378372
- path: images/releng/k8s-ci-builder/variants.yaml
379373
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
380374

381375
# Golang (previous release branch: 1.31)
382376
- name: "golang: after kubernetes/kubernetes update (previous release branches: 1.31)"
383-
version: 1.23.10
384-
refPaths:
385-
- path: images/releng/k8s-ci-builder/variants.yaml
386-
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
387-
388-
# Golang (previous release branch: 1.30)
389-
- name: "golang: after kubernetes/kubernetes update (previous release branches: 1.30)"
390-
version: 1.23.10
377+
version: 1.23.11
391378
refPaths:
392379
- path: images/releng/k8s-ci-builder/variants.yaml
393380
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
@@ -402,25 +389,19 @@ dependencies:
402389
match: "GO_VERSION_TOOLING: '\\d+.\\d+(alpha|beta|rc)?\\.?(\\d+)?'"
403390

404391
- name: "golang: releng tooling for k8s-ci-builder (previous release branches: 1.33)"
405-
version: 1.24.4
392+
version: 1.24.5
406393
refPaths:
407394
- path: images/releng/k8s-ci-builder/variants.yaml
408395
match: "GO_VERSION_TOOLING: '\\d+.\\d+(alpha|beta|rc)?\\.?(\\d+)?'"
409396

410397
- name: "golang: releng tooling for k8s-ci-builder (previous release branches: 1.32)"
411-
version: 1.24.4
398+
version: 1.24.5
412399
refPaths:
413400
- path: images/releng/k8s-ci-builder/variants.yaml
414401
match: "GO_VERSION_TOOLING: '\\d+.\\d+(alpha|beta|rc)?\\.?(\\d+)?'"
415402

416403
- name: "golang: releng tooling for k8s-ci-builder (previous release branches: 1.31)"
417-
version: 1.24.4
418-
refPaths:
419-
- path: images/releng/k8s-ci-builder/variants.yaml
420-
match: "GO_VERSION_TOOLING: '\\d+.\\d+(alpha|beta|rc)?\\.?(\\d+)?'"
421-
422-
- name: "golang: releng tooling for k8s-ci-builder (previous release branches: 1.30)"
423-
version: 1.24.4
404+
version: 1.24.5
424405
refPaths:
425406
- path: images/releng/k8s-ci-builder/variants.yaml
426407
match: "GO_VERSION_TOOLING: '\\d+.\\d+(alpha|beta|rc)?\\.?(\\d+)?'"

images/k8s-cloud-builder/variants.yaml

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

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

Lines changed: 7 additions & 12 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.4'
10+
GO_VERSION_TOOLING: '1.24.5'
1111
OS_CODENAME: 'bookworm'
1212
'1.34':
1313
CONFIG: '1.34'
@@ -16,21 +16,16 @@ variants:
1616
OS_CODENAME: 'bullseye'
1717
'1.33':
1818
CONFIG: '1.33'
19-
GO_VERSION: '1.24.4'
20-
GO_VERSION_TOOLING: '1.24.4'
19+
GO_VERSION: '1.24.5'
20+
GO_VERSION_TOOLING: '1.24.5'
2121
OS_CODENAME: 'bullseye'
2222
'1.32':
2323
CONFIG: '1.32'
24-
GO_VERSION: '1.23.10'
25-
GO_VERSION_TOOLING: '1.24.4'
24+
GO_VERSION: '1.23.11'
25+
GO_VERSION_TOOLING: '1.24.5'
2626
OS_CODENAME: 'bullseye'
2727
'1.31':
2828
CONFIG: '1.31'
29-
GO_VERSION: '1.23.10'
30-
GO_VERSION_TOOLING: '1.24.4'
31-
OS_CODENAME: 'bullseye'
32-
'1.30':
33-
CONFIG: '1.30'
34-
GO_VERSION: '1.23.10'
35-
GO_VERSION_TOOLING: '1.24.4'
29+
GO_VERSION: '1.23.11'
30+
GO_VERSION_TOOLING: '1.24.5'
3631
OS_CODENAME: 'bullseye'

0 commit comments

Comments
 (0)