Skip to content

Commit

Permalink
Build k8s-ci-builder and k8s-cloud-bulider with Go 1.22.0 and 1.21.7
Browse files Browse the repository at this point in the history
Signed-off-by: cpanato <ctadeu@gmail.com>
  • Loading branch information
cpanato committed Feb 10, 2024
1 parent e643549 commit 0046aa3
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 18 deletions.
18 changes: 9 additions & 9 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ dependencies:
match: go \d+.\d+

- name: "golang: after kubernetes/kubernetes update"
version: 1.21.6
version: 1.22
refPaths:
- path: images/releng/k8s-ci-builder/Makefile
match: GO_VERSION\ \?=\ \d+.\d+(alpha|beta|rc)?\.?(\d+)?
Expand Down Expand Up @@ -264,7 +264,7 @@ dependencies:
match: REVISION:\ '\d+'

- name: "registry.k8s.io/build-image/kube-cross: dependents k8s-cloud-builder (v1.30-cross1.22)"
version: v1.30.0-go1.22rc2-bullseye.0
version: v1.30.0-go1.22-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 @@ -343,14 +343,14 @@ dependencies:
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?

- name: "golang: after kubernetes/kubernetes update (previous release branches: 1.29)"
version: 1.21.6
version: 1.21.7
refPaths:
- path: images/releng/k8s-ci-builder/variants.yaml
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?

# Golang (previous release branches: 1.28)
- name: "golang (previous release branches: 1.28)"
version: 1.20.14
version: 1.21.7
refPaths:
- path: images/build/cross/variants.yaml
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
Expand All @@ -360,13 +360,13 @@ dependencies:
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?

- name: "golang: after kubernetes/kubernetes update (previous release branches: master)"
version: 1.21.6
version: 1.22
refPaths:
- path: images/releng/k8s-ci-builder/variants.yaml
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?

- name: "golang: after kubernetes/kubernetes update (previous release branches: 1.28)"
version: 1.20.13
version: 1.21.7
refPaths:
- path: images/releng/k8s-ci-builder/variants.yaml
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
Expand All @@ -383,14 +383,14 @@ dependencies:
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?

- name: "golang: after kubernetes/kubernetes update (previous release branches: 1.27)"
version: 1.20.13
version: 1.21.7
refPaths:
- path: images/releng/k8s-ci-builder/variants.yaml
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?

# Golang (previous release branches: 1.26)
- name: "golang (previous release branches: 1.26)"
version: 1.20.14
version: 1.21.7
refPaths:
- path: images/build/cross/variants.yaml
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
Expand All @@ -400,7 +400,7 @@ dependencies:
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?

- name: "golang: after kubernetes/kubernetes update (previous release branches: 1.26)"
version: 1.20.13
version: 1.21.7
refPaths:
- path: images/releng/k8s-ci-builder/variants.yaml
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
Expand Down
2 changes: 1 addition & 1 deletion images/k8s-cloud-builder/variants.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
variants:
v1.30-cross1.22-bullseye:
CONFIG: 'cross1.22'
KUBE_CROSS_VERSION: 'v1.30.0-go1.22rc2-bullseye.0'
KUBE_CROSS_VERSION: 'v1.30.0-go1.22-bullseye.0'
v1.30-cross1.21-bullseye:
CONFIG: 'cross1.21'
KUBE_CROSS_VERSION: 'v1.30.0-go1.21.6-bullseye.0'
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.21.6
GO_VERSION ?= 1.22
OS_CODENAME ?= bullseye
IMAGE_ARG ?= $(IMAGE):$(TAG)-$(CONFIG)

Expand Down
14 changes: 7 additions & 7 deletions images/releng/k8s-ci-builder/variants.yaml
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
variants:
default:
CONFIG: default
GO_VERSION: '1.21.6'
GO_VERSION: '1.21.7'
OS_CODENAME: 'bullseye'
next:
CONFIG: next
GO_VERSION: '1.22rc2'
GO_VERSION: '1.22'
OS_CODENAME: 'bookworm'
'1.30':
CONFIG: '1.30'
GO_VERSION: '1.22rc2'
GO_VERSION: '1.22'
OS_CODENAME: 'bullseye'
'1.29':
CONFIG: '1.29'
GO_VERSION: '1.21.6'
GO_VERSION: '1.21.7'
OS_CODENAME: 'bullseye'
'1.28':
CONFIG: '1.28'
GO_VERSION: '1.20.13'
GO_VERSION: '1.21.7'
OS_CODENAME: 'bullseye'
'1.27':
CONFIG: '1.27'
GO_VERSION: '1.20.13'
GO_VERSION: '1.21.7'
OS_CODENAME: 'bullseye'
'1.26':
CONFIG: '1.26'
GO_VERSION: '1.20.13'
GO_VERSION: '1.21.7'
OS_CODENAME: 'bullseye'

0 comments on commit 0046aa3

Please sign in to comment.