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.

Sign up for GitHub

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.23.4/1.22.10 #3873

Merged
merged 1 commit into from
Jan 8, 2025
+36 −22
Merged

Update k8s-cloud-builder and k8s-ci-builder to Go 1.23.4/1.22.10 #3873

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 16 additions & 10 deletions dependencies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,33 +316,39 @@ dependencies:

# kube-cross dependents (i.e. k8s-cloud-builder)
# To be updated after kubernetes/kubernetes update)
- name: "registry.k8s.io/build-image/kube-cross: dependents k8s-cloud-builder (v1.33-cross1.23)"
version: v1.33.0-go1.23.4-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.32-cross1.23)"
version: v1.32.0-go1.23.3-bullseye.0
version: v1.32.0-go1.23.4-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.2-bullseye.0
version: v1.31.0-go1.23.4-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.9-bullseye.0
version: v1.31.0-go1.22.10-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.9-bullseye.0
version: v1.30.0-go1.22.10-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.9-bullseye.0
version: v1.29.0-go1.22.10-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 @@ -356,7 +362,7 @@ dependencies:

# Golang (current release branch: master)
- name: "golang: after kubernetes/kubernetes update (master)"
version: 1.23.3
version: 1.23.4
refPaths:
- path: images/releng/k8s-ci-builder/Makefile
match: GO_VERSION\ \?=\ \d+.\d+(alpha|beta|rc)?\.?(\d+)?
Expand All @@ -365,28 +371,28 @@ dependencies:

# Golang (previous release branch: 1.32)
- name: "golang: after kubernetes/kubernetes update (previous release branches: 1.32)"
version: 1.23.3
version: 1.23.4
refPaths:
- path: images/releng/k8s-ci-builder/variants.yaml
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?

# Golang (previous release branch: 1.31)
- name: "golang: after kubernetes/kubernetes update (previous release branches: 1.31)"
version: 1.22.9
version: 1.22.10
refPaths:
- path: images/releng/k8s-ci-builder/variants.yaml
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?

# Golang (previous release branch: 1.30)
- name: "golang: after kubernetes/kubernetes update (previous release branches: 1.30)"
version: 1.22.9
version: 1.22.10
refPaths:
- path: images/releng/k8s-ci-builder/variants.yaml
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?

# Golang (previous release branch: 1.29)
- name: "golang: after kubernetes/kubernetes update (previous release branches: 1.29)"
version: 1.22.9
version: 1.22.10
refPaths:
- path: images/releng/k8s-ci-builder/variants.yaml
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
Expand Down
13 changes: 8 additions & 5 deletions images/k8s-cloud-builder/variants.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
variants:
v1.33-cross1.23-bullseye:
CONFIG: 'cross1.23'
KUBE_CROSS_VERSION: 'v1.33.0-go1.23.4-bullseye.0'
v1.32-cross1.23-bullseye:
CONFIG: 'cross1.23'
KUBE_CROSS_VERSION: 'v1.32.0-go1.23.3-bullseye.0'
KUBE_CROSS_VERSION: 'v1.32.0-go1.23.4-bullseye.0'
v1.31-cross1.23-bullseye:
CONFIG: 'cross1.23'
KUBE_CROSS_VERSION: 'v1.31.0-go1.23.2-bullseye.0'
KUBE_CROSS_VERSION: 'v1.31.0-go1.23.4-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.9-bullseye.0'
KUBE_CROSS_VERSION: 'v1.31.0-go1.22.10-bullseye.0'
v1.30-cross1.22-bullseye:
CONFIG: 'cross1.22'
KUBE_CROSS_VERSION: 'v1.30.0-go1.22.9-bullseye.0'
KUBE_CROSS_VERSION: 'v1.30.0-go1.22.10-bullseye.0'
v1.29-cross1.22-bullseye:
CONFIG: 'cross1.21'
KUBE_CROSS_VERSION: 'v1.29.0-go1.22.9-bullseye.0'
KUBE_CROSS_VERSION: 'v1.29.0-go1.22.10-bullseye.0'
2 changes: 1 addition & 1 deletion images/releng/k8s-ci-builder/Makefile
View file
Open in desktop
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.3
GO_VERSION ?= 1.23.4
GO_VERSION_TOOLING ?= 1.23.4
OS_CODENAME ?= bullseye
IMAGE_ARG ?= $(IMAGE):$(TAG)-$(CONFIG)
Expand Down
17 changes: 11 additions & 6 deletions images/releng/k8s-ci-builder/variants.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,36 @@
variants:
default:
CONFIG: default
GO_VERSION: '1.22.9'
GO_VERSION: '1.22.10'
GO_VERSION_TOOLING: '1.23.4'
OS_CODENAME: 'bullseye'
next:
CONFIG: next
GO_VERSION: '1.23.3'
GO_VERSION: '1.23.4'
GO_VERSION_TOOLING: '1.23.4'
OS_CODENAME: 'bookworm'
'1.33':
CONFIG: '1.33'
GO_VERSION: '1.23.4'
GO_VERSION_TOOLING: '1.23.4'
OS_CODENAME: 'bullseye'
'1.32':
CONFIG: '1.32'
GO_VERSION: '1.23.3'
GO_VERSION: '1.23.4'
GO_VERSION_TOOLING: '1.23.4'
OS_CODENAME: 'bullseye'
'1.31':
CONFIG: '1.31'
GO_VERSION: '1.22.9'
GO_VERSION: '1.22.10'
GO_VERSION_TOOLING: '1.23.4'
OS_CODENAME: 'bullseye'
'1.30':
CONFIG: '1.30'
GO_VERSION: '1.22.9'
GO_VERSION: '1.22.10'
GO_VERSION_TOOLING: '1.23.4'
OS_CODENAME: 'bullseye'
'1.29':
CONFIG: '1.29'
GO_VERSION: '1.22.9'
GO_VERSION: '1.22.10'
GO_VERSION_TOOLING: '1.23.4'
OS_CODENAME: 'bullseye'
Loading