Skip to content

Commit 8fdedd4

Browse files
authored
Merge pull request #2547 from cpanato/cloud-builder-go118
k8s-cloud-builder/k8s-ci-builder: build using go1.18.3 and go1.17.11
2 parents 491b2be + 7afe8bb commit 8fdedd4

File tree

5 files changed

+15
-15
lines changed

5 files changed

+15
-15
lines changed

dependencies.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ dependencies:
100100
match: go \d+.\d+
101101

102102
- name: "golang: after kubernetes/kubernetes update"
103-
version: 1.18.2
103+
version: 1.18.3
104104
refPaths:
105105
- path: images/releng/k8s-ci-builder/Dockerfile
106106
match: FROM golang:\d+.\d+(alpha|beta|rc)?\.?(\d+)-\${OS_CODENAME} AS builder
@@ -181,7 +181,7 @@ dependencies:
181181
match: REVISION:\ '\d+'
182182

183183
- name: "k8s.gcr.io/build-image/kube-cross: dependents bullseye"
184-
version: v1.25.0-go1.18.2-bullseye.0
184+
version: v1.25.0-go1.18.3-bullseye.0
185185
refPaths:
186186
- path: images/k8s-cloud-builder/variants.yaml
187187
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-]+)*))?)'"
@@ -231,7 +231,7 @@ dependencies:
231231
match: "CONFIG: 'go\\d+.\\d+-bullseye'"
232232

233233
- name: "k8s.gcr.io/build-image/kube-cross: dependents (next candidate)"
234-
version: v1.25.0-go1.18.2-bullseye.0
234+
version: v1.25.0-go1.18.3-bullseye.0
235235
refPaths:
236236
- path: images/k8s-cloud-builder/variants.yaml
237237
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-]+)*))?)'"
@@ -248,7 +248,7 @@ dependencies:
248248
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
249249

250250
- name: "golang: after kubernetes/kubernetes update (previous release branches: 1.23)"
251-
version: 1.17.10
251+
version: 1.17.11
252252
refPaths:
253253
- path: images/releng/k8s-ci-builder/variants.yaml
254254
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?

images/k8s-cloud-builder/variants.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
variants:
22
v1.25-cross1.18-bullseye:
33
CONFIG: 'cross1.18'
4-
KUBE_CROSS_VERSION: 'v1.25.0-go1.18.2-bullseye.0'
4+
KUBE_CROSS_VERSION: 'v1.25.0-go1.18.3-bullseye.0'
55
v1.24-cross1.18-bullseye:
66
CONFIG: 'cross1.18'
7-
KUBE_CROSS_VERSION: 'v1.24.0-go1.18.2-bullseye.0'
7+
KUBE_CROSS_VERSION: 'v1.24.0-go1.18.3-bullseye.0'
88
v1.24-cross1.17-bullseye:
99
CONFIG: 'cross1.17'
10-
KUBE_CROSS_VERSION: 'v1.24.0-go1.17.10-bullseye.0'
10+
KUBE_CROSS_VERSION: 'v1.24.0-go1.17.11-bullseye.0'
1111
v1.23-cross1.17-bullseye:
1212
CONFIG: 'cross1.17'
13-
KUBE_CROSS_VERSION: 'v1.23.0-go1.17.10-bullseye.0'
13+
KUBE_CROSS_VERSION: 'v1.23.0-go1.17.11-bullseye.0'
1414
v1.22-cross1.16-buster:
1515
CONFIG: 'cross1.16'
1616
KUBE_CROSS_VERSION: 'v1.22.0-go1.16.15-buster.0'

images/releng/k8s-ci-builder/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ARG OS_CODENAME
1717

1818
# The Golang version for the builder image should always be explicitly set to
1919
# the Golang version of the kubernetes/kubernetes active development branch
20-
FROM golang:1.18.2-${OS_CODENAME} AS builder
20+
FROM golang:1.18.3-${OS_CODENAME} AS builder
2121

2222
WORKDIR /go/src/k8s.io/release
2323

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.18.2
27+
GO_VERSION ?= 1.18.3
2828
OS_CODENAME ?= bullseye
2929
IMAGE_ARG ?= $(IMAGE):$(TAG)-$(CONFIG)
3030

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
variants:
22
default:
33
CONFIG: default
4-
GO_VERSION: '1.18.2'
4+
GO_VERSION: '1.18.3'
55
OS_CODENAME: 'bullseye'
66
next:
77
CONFIG: next
8-
GO_VERSION: '1.18.2'
8+
GO_VERSION: '1.18.3'
99
OS_CODENAME: 'bullseye'
1010
'1.25':
1111
CONFIG: '1.25'
12-
GO_VERSION: '1.18.2'
12+
GO_VERSION: '1.18.3'
1313
OS_CODENAME: 'bullseye'
1414
'1.24':
1515
CONFIG: '1.24'
16-
GO_VERSION: '1.18.2'
16+
GO_VERSION: '1.18.3'
1717
OS_CODENAME: 'bullseye'
1818
'1.23':
1919
CONFIG: '1.23'
20-
GO_VERSION: '1.17.10'
20+
GO_VERSION: '1.17.11'
2121
OS_CODENAME: 'bullseye'
2222
'1.22':
2323
CONFIG: '1.22'

0 commit comments

Comments
 (0)