Skip to content

Commit e2f7399

Browse files
authored
Merge pull request #3807 from haitch/haitao/cloud-ci-builder_golang_bump_oct
Update k8s-cloud-builder and k8s-ci-builder to Go 1.22.8/1.23.2
2 parents 81846bb + b162c3f commit e2f7399

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
@@ -298,32 +298,32 @@ dependencies:
298298
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-]+)*))?)'"
299299

300300
- name: "registry.k8s.io/build-image/kube-cross: dependents k8s-cloud-builder (v1.31-cross1.23)"
301-
version: v1.31.0-go1.23.0-bullseye.0
301+
version: v1.31.0-go1.23.2-bullseye.0
302302
refPaths:
303303
- path: images/k8s-cloud-builder/variants.yaml
304304
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-]+)*))?)'"
305305

306306
# TODO: remove this after upgrade to Go 1.23 is finalized and there's on risk of reverting
307307
- name: "registry.k8s.io/build-image/kube-cross: dependents k8s-cloud-builder (v1.31-cross1.22)"
308-
version: v1.31.0-go1.22.6-bullseye.0
308+
version: v1.31.0-go1.22.8-bullseye.0
309309
refPaths:
310310
- path: images/k8s-cloud-builder/variants.yaml
311311
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-]+)*))?)'"
312312

313313
- name: "registry.k8s.io/build-image/kube-cross: dependents k8s-cloud-builder (v1.30-cross1.22)"
314-
version: v1.30.0-go1.22.6-bullseye.0
314+
version: v1.30.0-go1.22.8-bullseye.0
315315
refPaths:
316316
- path: images/k8s-cloud-builder/variants.yaml
317317
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-]+)*))?)'"
318318

319319
- name: "registry.k8s.io/build-image/kube-cross: dependents k8s-cloud-builder (v1.29-cross1.22)"
320-
version: v1.29.0-go1.22.6-bullseye.0
320+
version: v1.29.0-go1.22.8-bullseye.0
321321
refPaths:
322322
- path: images/k8s-cloud-builder/variants.yaml
323323
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-]+)*))?)'"
324324

325325
- name: "registry.k8s.io/build-image/kube-cross: dependents k8s-cloud-builder (v1.28-cross1.22)"
326-
version: v1.28.0-go1.22.6-bullseye.0
326+
version: v1.28.0-go1.22.8-bullseye.0
327327
refPaths:
328328
- path: images/k8s-cloud-builder/variants.yaml
329329
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-]+)*))?)'"
@@ -346,28 +346,28 @@ dependencies:
346346

347347
# Golang (previous release branch: 1.31)
348348
- name: "golang: after kubernetes/kubernetes update (previous release branches: 1.31)"
349-
version: 1.22.6
349+
version: 1.22.8
350350
refPaths:
351351
- path: images/releng/k8s-ci-builder/variants.yaml
352352
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
353353

354354
# Golang (previous release branch: 1.30)
355355
- name: "golang: after kubernetes/kubernetes update (previous release branches: 1.30)"
356-
version: 1.22.6
356+
version: 1.22.8
357357
refPaths:
358358
- path: images/releng/k8s-ci-builder/variants.yaml
359359
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
360360

361361
# Golang (previous release branch: 1.29)
362362
- name: "golang: after kubernetes/kubernetes update (previous release branches: 1.29)"
363-
version: 1.22.6
363+
version: 1.22.8
364364
refPaths:
365365
- path: images/releng/k8s-ci-builder/variants.yaml
366366
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
367367

368368
# Golang (previous release branch: 1.28)
369369
- name: "golang: after kubernetes/kubernetes update (previous release branches: 1.28)"
370-
version: 1.22.6
370+
version: 1.22.8
371371
refPaths:
372372
- path: images/releng/k8s-ci-builder/variants.yaml
373373
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?

images/k8s-cloud-builder/variants.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@ variants:
44
KUBE_CROSS_VERSION: 'v1.32.0-go1.23.2-bullseye.0'
55
v1.31-cross1.23-bullseye:
66
CONFIG: 'cross1.23'
7-
KUBE_CROSS_VERSION: 'v1.31.0-go1.23.0-bullseye.0'
7+
KUBE_CROSS_VERSION: 'v1.31.0-go1.23.2-bullseye.0'
88
# TODO: remove this after upgrade to Go 1.23 is finalized and there's on risk of reverting
99
v1.31-cross1.22-bullseye:
1010
CONFIG: 'cross1.22'
11-
KUBE_CROSS_VERSION: 'v1.31.0-go1.22.6-bullseye.0'
11+
KUBE_CROSS_VERSION: 'v1.31.0-go1.22.8-bullseye.0'
1212
v1.30-cross1.22-bullseye:
1313
CONFIG: 'cross1.22'
14-
KUBE_CROSS_VERSION: 'v1.30.0-go1.22.6-bullseye.0'
14+
KUBE_CROSS_VERSION: 'v1.30.0-go1.22.8-bullseye.0'
1515
v1.29-cross1.22-bullseye:
1616
CONFIG: 'cross1.21'
17-
KUBE_CROSS_VERSION: 'v1.29.0-go1.22.6-bullseye.0'
17+
KUBE_CROSS_VERSION: 'v1.29.0-go1.22.8-bullseye.0'
1818
v1.28-cross1.22-bullseye:
1919
CONFIG: 'cross1.20'
20-
KUBE_CROSS_VERSION: 'v1.28.0-go1.22.6-bullseye.0'
20+
KUBE_CROSS_VERSION: 'v1.28.0-go1.22.8-bullseye.0'
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
variants:
22
default:
33
CONFIG: default
4-
GO_VERSION: '1.22.6'
4+
GO_VERSION: '1.22.8'
55
OS_CODENAME: 'bullseye'
66
next:
77
CONFIG: next
@@ -13,17 +13,17 @@ variants:
1313
OS_CODENAME: 'bullseye'
1414
'1.31':
1515
CONFIG: '1.31'
16-
GO_VERSION: '1.22.6'
16+
GO_VERSION: '1.22.8'
1717
OS_CODENAME: 'bullseye'
1818
'1.30':
1919
CONFIG: '1.30'
20-
GO_VERSION: '1.22.6'
20+
GO_VERSION: '1.22.8'
2121
OS_CODENAME: 'bullseye'
2222
'1.29':
2323
CONFIG: '1.29'
24-
GO_VERSION: '1.22.6'
24+
GO_VERSION: '1.22.8'
2525
OS_CODENAME: 'bullseye'
2626
'1.28':
2727
CONFIG: '1.28'
28-
GO_VERSION: '1.22.6'
28+
GO_VERSION: '1.22.8'
2929
OS_CODENAME: 'bullseye'

0 commit comments

Comments
 (0)