Skip to content

Commit f42d376

Browse files
authored
Merge pull request #3495 from cpanato/bump-clooud-ci-builder
Build k8s-ci-builder and k8s-cloud-bulider with Go 1.22.1 and 1.21.8
2 parents 5cdeee7 + ce24db0 commit f42d376

File tree

4 files changed

+23
-23
lines changed

4 files changed

+23
-23
lines changed

dependencies.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ dependencies:
6767
match: go \d+.\d+
6868

6969
- name: "golang: after kubernetes/kubernetes update"
70-
version: 1.22
70+
version: 1.22.1
7171
refPaths:
7272
- path: images/releng/k8s-ci-builder/Makefile
7373
match: GO_VERSION\ \?=\ \d+.\d+(alpha|beta|rc)?\.?(\d+)?
@@ -242,31 +242,31 @@ dependencies:
242242
match: REVISION:\ '\d+'
243243

244244
- name: "registry.k8s.io/build-image/kube-cross: dependents k8s-cloud-builder (v1.30-cross1.22)"
245-
version: v1.30.0-go1.22.0-bullseye.0
245+
version: v1.30.0-go1.22.1-bullseye.0
246246
refPaths:
247247
- path: images/k8s-cloud-builder/variants.yaml
248248
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-]+)*))?)'"
249249

250250
- name: "registry.k8s.io/build-image/kube-cross: dependents k8s-cloud-builder (v1.29-cross1.21)"
251-
version: v1.29.0-go1.21.7-bullseye.0
251+
version: v1.29.0-go1.21.8-bullseye.0
252252
refPaths:
253253
- path: images/k8s-cloud-builder/variants.yaml
254254
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-]+)*))?)'"
255255

256256
- name: "registry.k8s.io/build-image/kube-cross: dependents k8s-cloud-builder (v1.28-cross1.21)"
257-
version: v1.28.0-go1.21.7-bullseye.0
257+
version: v1.28.0-go1.21.8-bullseye.0
258258
refPaths:
259259
- path: images/k8s-cloud-builder/variants.yaml
260260
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-]+)*))?)'"
261261

262262
- name: "registry.k8s.io/build-image/kube-cross: dependents k8s-cloud-builder (v1.27-cross1.21)"
263-
version: v1.27.0-go1.21.7-bullseye.0
263+
version: v1.27.0-go1.21.8-bullseye.0
264264
refPaths:
265265
- path: images/k8s-cloud-builder/variants.yaml
266266
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-]+)*))?)'"
267267

268268
- name: "registry.k8s.io/build-image/kube-cross: dependents k8s-cloud-builder (v1.26-cross1.21)"
269-
version: v1.26.0-go1.21.7-bullseye.0
269+
version: v1.26.0-go1.21.8-bullseye.0
270270
refPaths:
271271
- path: images/k8s-cloud-builder/variants.yaml
272272
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-]+)*))?)'"
@@ -315,7 +315,7 @@ dependencies:
315315
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
316316

317317
- name: "golang: after kubernetes/kubernetes update (previous release branches: 1.29)"
318-
version: 1.21.7
318+
version: 1.21.8
319319
refPaths:
320320
- path: images/releng/k8s-ci-builder/variants.yaml
321321
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
@@ -338,7 +338,7 @@ dependencies:
338338
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
339339

340340
- name: "golang: after kubernetes/kubernetes update (previous release branches: 1.28)"
341-
version: 1.21.7
341+
version: 1.21.8
342342
refPaths:
343343
- path: images/releng/k8s-ci-builder/variants.yaml
344344
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
@@ -355,7 +355,7 @@ dependencies:
355355
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
356356

357357
- name: "golang: after kubernetes/kubernetes update (previous release branches: 1.27)"
358-
version: 1.21.7
358+
version: 1.21.8
359359
refPaths:
360360
- path: images/releng/k8s-ci-builder/variants.yaml
361361
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
@@ -372,7 +372,7 @@ dependencies:
372372
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
373373

374374
- name: "golang: after kubernetes/kubernetes update (previous release branches: 1.26)"
375-
version: 1.21.7
375+
version: 1.21.8
376376
refPaths:
377377
- path: images/releng/k8s-ci-builder/variants.yaml
378378
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
variants:
22
v1.30-cross1.22-bullseye:
33
CONFIG: 'cross1.22'
4-
KUBE_CROSS_VERSION: 'v1.30.0-go1.22.0-bullseye.0'
4+
KUBE_CROSS_VERSION: 'v1.30.0-go1.22.1-bullseye.0'
55
v1.29-cross1.21-bullseye:
66
CONFIG: 'cross1.21'
7-
KUBE_CROSS_VERSION: 'v1.29.0-go1.21.7-bullseye.0'
7+
KUBE_CROSS_VERSION: 'v1.29.0-go1.21.8-bullseye.0'
88
v1.28-cross1.20-bullseye:
99
CONFIG: 'cross1.20'
10-
KUBE_CROSS_VERSION: 'v1.28.0-go1.21.7-bullseye.0'
10+
KUBE_CROSS_VERSION: 'v1.28.0-go1.21.8-bullseye.0'
1111
v1.27-cross1.20-bullseye:
1212
CONFIG: 'cross1.20'
13-
KUBE_CROSS_VERSION: 'v1.27.0-go1.21.7-bullseye.0'
13+
KUBE_CROSS_VERSION: 'v1.27.0-go1.21.8-bullseye.0'
1414
v1.26-cross1.20-bullseye:
1515
CONFIG: 'cross1.20'
16-
KUBE_CROSS_VERSION: 'v1.26.0-go1.21.7-bullseye.0'
16+
KUBE_CROSS_VERSION: 'v1.26.0-go1.21.8-bullseye.0'

images/releng/k8s-ci-builder/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ IMAGE = $(REGISTRY)/$(IMGNAME)
2424
TAG ?= $(shell git describe --tags --always --dirty)
2525

2626
# Build args
27-
GO_VERSION ?= 1.22.0
27+
GO_VERSION ?= 1.22.1
2828
OS_CODENAME ?= bullseye
2929
IMAGE_ARG ?= $(IMAGE):$(TAG)-$(CONFIG)
3030

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
variants:
22
default:
33
CONFIG: default
4-
GO_VERSION: '1.21.7'
4+
GO_VERSION: '1.22.1'
55
OS_CODENAME: 'bullseye'
66
next:
77
CONFIG: next
8-
GO_VERSION: '1.22.0'
8+
GO_VERSION: '1.22.1'
99
OS_CODENAME: 'bookworm'
1010
'1.30':
1111
CONFIG: '1.30'
12-
GO_VERSION: '1.22.0'
12+
GO_VERSION: '1.22.1'
1313
OS_CODENAME: 'bullseye'
1414
'1.29':
1515
CONFIG: '1.29'
16-
GO_VERSION: '1.21.7'
16+
GO_VERSION: '1.21.8'
1717
OS_CODENAME: 'bullseye'
1818
'1.28':
1919
CONFIG: '1.28'
20-
GO_VERSION: '1.21.7'
20+
GO_VERSION: '1.21.8'
2121
OS_CODENAME: 'bullseye'
2222
'1.27':
2323
CONFIG: '1.27'
24-
GO_VERSION: '1.21.7'
24+
GO_VERSION: '1.21.8'
2525
OS_CODENAME: 'bullseye'
2626
'1.26':
2727
CONFIG: '1.26'
28-
GO_VERSION: '1.21.7'
28+
GO_VERSION: '1.21.8'
2929
OS_CODENAME: 'bullseye'

0 commit comments

Comments
 (0)