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

Update k8s-cloud-builder and k8s-ci-builder to Go 1.22.7/1.23.1 #3777

Closed
Closed
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
20 changes: 10 additions & 10 deletions 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.23.0
version: 1.23.1
refPaths:
- path: images/releng/k8s-ci-builder/Makefile
match: GO_VERSION\ \?=\ \d+.\d+(alpha|beta|rc)?\.?(\d+)?
Expand Down Expand Up @@ -247,38 +247,38 @@ dependencies:
match: REVISION:\ '\d+'

- name: "registry.k8s.io/build-image/kube-cross: dependents k8s-cloud-builder (v1.32-cross1.23)"
version: v1.32.0-go1.23.0-bullseye.0
version: v1.32.0-go1.23.1-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-]+)*))?)'"

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

- name: "registry.k8s.io/build-image/kube-cross: dependents k8s-cloud-builder (v1.30-cross1.22)"
version: v1.30.0-go1.22.6-bullseye.0
version: v1.30.0-go1.22.7-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-]+)*))?)'"

- name: "registry.k8s.io/build-image/kube-cross: dependents k8s-cloud-builder (v1.29-cross1.22)"
version: v1.29.0-go1.22.6-bullseye.0
version: v1.29.0-go1.22.7-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-]+)*))?)'"

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

- name: "golang: after kubernetes/kubernetes update (previous release branches: 1.30)"
version: 1.22.6
version: 1.22.7
refPaths:
- path: images/releng/k8s-ci-builder/variants.yaml
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
Expand All @@ -345,7 +345,7 @@ dependencies:
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?

- name: "golang: after kubernetes/kubernetes update (previous release branches: 1.29)"
version: 1.22.6
version: 1.22.7
refPaths:
- path: images/releng/k8s-ci-builder/variants.yaml
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
Expand All @@ -368,7 +368,7 @@ dependencies:
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?

- name: "golang: after kubernetes/kubernetes update (previous release branches: 1.28)"
version: 1.22.6
version: 1.22.7
refPaths:
- path: images/releng/k8s-ci-builder/variants.yaml
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
Expand Down
12 changes: 6 additions & 6 deletions images/k8s-cloud-builder/variants.yaml
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
variants:
v1.32-cross1.23-bullseye:
CONFIG: 'cross1.23'
KUBE_CROSS_VERSION: 'v1.32.0-go1.23.0-bullseye.0'
KUBE_CROSS_VERSION: 'v1.32.0-go1.23.1-bullseye.0'
v1.31-cross1.23-bullseye:
CONFIG: 'cross1.23'
KUBE_CROSS_VERSION: 'v1.31.0-go1.23.0-bullseye.0'
KUBE_CROSS_VERSION: 'v1.31.0-go1.23.1-bullseye.0'
# TODO: remove this after upgrade to Go 1.23 is finalized and there's on risk of reverting
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

when shall we remove this? from release notes, 1.31.1 is still build with go 1.22.6, I think it's not finalized yet.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

v1.31-cross1.22-bullseye:
CONFIG: 'cross1.22'
KUBE_CROSS_VERSION: 'v1.31.0-go1.22.6-bullseye.0'
KUBE_CROSS_VERSION: 'v1.31.0-go1.22.7-bullseye.0'
v1.30-cross1.22-bullseye:
CONFIG: 'cross1.22'
KUBE_CROSS_VERSION: 'v1.30.0-go1.22.6-bullseye.0'
KUBE_CROSS_VERSION: 'v1.30.0-go1.22.7-bullseye.0'
v1.29-cross1.22-bullseye:
CONFIG: 'cross1.21'
KUBE_CROSS_VERSION: 'v1.29.0-go1.22.6-bullseye.0'
KUBE_CROSS_VERSION: 'v1.29.0-go1.22.7-bullseye.0'
v1.28-cross1.22-bullseye:
CONFIG: 'cross1.20'
KUBE_CROSS_VERSION: 'v1.28.0-go1.22.6-bullseye.0'
KUBE_CROSS_VERSION: 'v1.28.0-go1.22.7-bullseye.0'
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.23.0
GO_VERSION ?= 1.23.1
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.22.6'
GO_VERSION: '1.22.7'
OS_CODENAME: 'bullseye'
next:
CONFIG: next
GO_VERSION: '1.23.0'
GO_VERSION: '1.23.1'
OS_CODENAME: 'bookworm'
'1.32':
CONFIG: '1.32'
GO_VERSION: '1.23.0'
GO_VERSION: '1.23.1'
OS_CODENAME: 'bullseye'
'1.31':
CONFIG: '1.31'
GO_VERSION: '1.22.6'
GO_VERSION: '1.22.7'
OS_CODENAME: 'bullseye'
'1.30':
CONFIG: '1.30'
GO_VERSION: '1.22.6'
GO_VERSION: '1.22.7'
OS_CODENAME: 'bullseye'
'1.29':
CONFIG: '1.29'
GO_VERSION: '1.22.6'
GO_VERSION: '1.22.7'
OS_CODENAME: 'bullseye'
'1.28':
CONFIG: '1.28'
GO_VERSION: '1.22.6'
GO_VERSION: '1.22.7'
OS_CODENAME: 'bullseye'