Skip to content

Commit

Permalink
k8s-cloud-builder/k8s-ci-builder: build using go1.18.3 and go1.17.11
Browse files Browse the repository at this point in the history
Signed-off-by: cpanato <ctadeu@gmail.com>
  • Loading branch information
cpanato committed Jun 7, 2022
1 parent 491b2be commit 7afe8bb
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 15 deletions.
8 changes: 4 additions & 4 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ dependencies:
match: go \d+.\d+

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

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

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

- name: "golang: after kubernetes/kubernetes update (previous release branches: 1.23)"
version: 1.17.10
version: 1.17.11
refPaths:
- path: images/releng/k8s-ci-builder/variants.yaml
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
Expand Down
8 changes: 4 additions & 4 deletions images/k8s-cloud-builder/variants.yaml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
variants:
v1.25-cross1.18-bullseye:
CONFIG: 'cross1.18'
KUBE_CROSS_VERSION: 'v1.25.0-go1.18.2-bullseye.0'
KUBE_CROSS_VERSION: 'v1.25.0-go1.18.3-bullseye.0'
v1.24-cross1.18-bullseye:
CONFIG: 'cross1.18'
KUBE_CROSS_VERSION: 'v1.24.0-go1.18.2-bullseye.0'
KUBE_CROSS_VERSION: 'v1.24.0-go1.18.3-bullseye.0'
v1.24-cross1.17-bullseye:
CONFIG: 'cross1.17'
KUBE_CROSS_VERSION: 'v1.24.0-go1.17.10-bullseye.0'
KUBE_CROSS_VERSION: 'v1.24.0-go1.17.11-bullseye.0'
v1.23-cross1.17-bullseye:
CONFIG: 'cross1.17'
KUBE_CROSS_VERSION: 'v1.23.0-go1.17.10-bullseye.0'
KUBE_CROSS_VERSION: 'v1.23.0-go1.17.11-bullseye.0'
v1.22-cross1.16-buster:
CONFIG: 'cross1.16'
KUBE_CROSS_VERSION: 'v1.22.0-go1.16.15-buster.0'
Expand Down
2 changes: 1 addition & 1 deletion images/releng/k8s-ci-builder/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ ARG OS_CODENAME

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

WORKDIR /go/src/k8s.io/release

Expand Down
2 changes: 1 addition & 1 deletion images/releng/k8s-ci-builder/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ IMAGE = $(REGISTRY)/$(IMGNAME)
TAG ?= $(shell git describe --tags --always --dirty)

# Build args
GO_VERSION ?= 1.18.2
GO_VERSION ?= 1.18.3
OS_CODENAME ?= bullseye
IMAGE_ARG ?= $(IMAGE):$(TAG)-$(CONFIG)

Expand Down
10 changes: 5 additions & 5 deletions images/releng/k8s-ci-builder/variants.yaml
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
variants:
default:
CONFIG: default
GO_VERSION: '1.18.2'
GO_VERSION: '1.18.3'
OS_CODENAME: 'bullseye'
next:
CONFIG: next
GO_VERSION: '1.18.2'
GO_VERSION: '1.18.3'
OS_CODENAME: 'bullseye'
'1.25':
CONFIG: '1.25'
GO_VERSION: '1.18.2'
GO_VERSION: '1.18.3'
OS_CODENAME: 'bullseye'
'1.24':
CONFIG: '1.24'
GO_VERSION: '1.18.2'
GO_VERSION: '1.18.3'
OS_CODENAME: 'bullseye'
'1.23':
CONFIG: '1.23'
GO_VERSION: '1.17.10'
GO_VERSION: '1.17.11'
OS_CODENAME: 'bullseye'
'1.22':
CONFIG: '1.22'
Expand Down

0 comments on commit 7afe8bb

Please sign in to comment.