Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add k8s-cloud-builder and k8s-ci-builder for Go 1.23rc2 #3690

Merged
merged 1 commit into from
Jul 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ dependencies:
match: go \d+.\d+

- name: "golang: after kubernetes/kubernetes update"
version: 1.22.5
version: 1.23rc2
refPaths:
- path: images/releng/k8s-ci-builder/Makefile
match: GO_VERSION\ \?=\ \d+.\d+(alpha|beta|rc)?\.?(\d+)?
Expand Down Expand Up @@ -266,6 +266,13 @@ dependencies:
- path: images/build/cross/variants.yaml
match: REVISION:\ '\d+'

- name: "registry.k8s.io/build-image/kube-cross: dependents k8s-cloud-builder (v1.31-cross1.23)"
version: v1.31.0-go1.23rc2-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-]+)*))?)'"

# TODO: remove this after upgrade to Go 1.23 is finalized and there's on risk of reverting
- name: "registry.k8s.io/build-image/kube-cross: dependents k8s-cloud-builder (v1.31-cross1.22)"
version: v1.31.0-go1.22.5-bullseye.0
refPaths:
Expand Down
4 changes: 4 additions & 0 deletions images/k8s-cloud-builder/variants.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
variants:
v1.31-cross1.23-bullseye:
CONFIG: 'cross1.23'
KUBE_CROSS_VERSION: 'v1.31.0-go1.23rc2-bullseye.0'
# TODO: remove this after upgrade to Go 1.23 is finalized and there's on risk of reverting
v1.31-cross1.22-bullseye:
CONFIG: 'cross1.22'
KUBE_CROSS_VERSION: 'v1.31.0-go1.22.5-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.22.5
GO_VERSION ?= 1.23rc2
OS_CODENAME ?= bullseye
IMAGE_ARG ?= $(IMAGE):$(TAG)-$(CONFIG)

Expand Down
2 changes: 1 addition & 1 deletion images/releng/k8s-ci-builder/variants.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ variants:
OS_CODENAME: 'bookworm'
'1.31':
CONFIG: '1.31'
GO_VERSION: '1.22.5'
GO_VERSION: '1.23rc2'
OS_CODENAME: 'bullseye'
'1.30':
CONFIG: '1.30'
Expand Down