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.5 #3909

Merged
merged 1 commit into from
Feb 5, 2025
+9 −17
Merged

Update k8s-cloud-builder and k8s-ci-builder to Go 1.23.5 #3909

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
14 changes: 3 additions & 11 deletions dependencies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ 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
version: v1.33.0-go1.23.5-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 @@ -396,7 +396,7 @@ dependencies:

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

# k8s-ci-builder
- name: "golang: releng tooling for k8s-ci-builder (master)"
version: 1.23.4
version: 1.23.5
refPaths:
- path: images/releng/k8s-ci-builder/Makefile
match: GO_VERSION_TOOLING\ \?=\ \d+.\d+(alpha|beta|rc)?\.?(\d+)?
Expand All @@ -443,32 +443,24 @@ dependencies:
- name: "golang: releng tooling for k8s-ci-builder (previous release branches: 1.32)"
version: 1.23.4
refPaths:
- path: images/releng/k8s-ci-builder/Makefile
match: GO_VERSION_TOOLING\ \?=\ \d+.\d+(alpha|beta|rc)?\.?(\d+)?
- path: images/releng/k8s-ci-builder/variants.yaml
match: "GO_VERSION_TOOLING: '\\d+.\\d+(alpha|beta|rc)?\\.?(\\d+)?'"

- name: "golang: releng tooling for k8s-ci-builder (previous release branches: 1.31)"
version: 1.23.4
refPaths:
- path: images/releng/k8s-ci-builder/Makefile
match: GO_VERSION_TOOLING\ \?=\ \d+.\d+(alpha|beta|rc)?\.?(\d+)?
- path: images/releng/k8s-ci-builder/variants.yaml
match: "GO_VERSION_TOOLING: '\\d+.\\d+(alpha|beta|rc)?\\.?(\\d+)?'"

- name: "golang: releng tooling for k8s-ci-builder (previous release branches: 1.30)"
version: 1.23.4
refPaths:
- path: images/releng/k8s-ci-builder/Makefile
match: GO_VERSION_TOOLING\ \?=\ \d+.\d+(alpha|beta|rc)?\.?(\d+)?
- path: images/releng/k8s-ci-builder/variants.yaml
match: "GO_VERSION_TOOLING: '\\d+.\\d+(alpha|beta|rc)?\\.?(\\d+)?'"

- name: "golang: releng tooling for k8s-ci-builder (previous release branches: 1.29)"
version: 1.23.4
refPaths:
- path: images/releng/k8s-ci-builder/Makefile
match: GO_VERSION_TOOLING\ \?=\ \d+.\d+(alpha|beta|rc)?\.?(\d+)?
- path: images/releng/k8s-ci-builder/variants.yaml
match: "GO_VERSION_TOOLING: '\\d+.\\d+(alpha|beta|rc)?\\.?(\\d+)?'"

Expand Down
2 changes: 1 addition & 1 deletion images/k8s-cloud-builder/variants.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
variants:
v1.33-cross1.23-bullseye:
CONFIG: 'cross1.23'
KUBE_CROSS_VERSION: 'v1.33.0-go1.23.4-bullseye.0'
KUBE_CROSS_VERSION: 'v1.33.0-go1.23.5-bullseye.0'
v1.32-cross1.23-bullseye:
CONFIG: 'cross1.23'
KUBE_CROSS_VERSION: 'v1.32.0-go1.23.4-bullseye.0'
Expand Down
4 changes: 2 additions & 2 deletions images/releng/k8s-ci-builder/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ IMAGE = $(REGISTRY)/$(IMGNAME)
TAG ?= $(shell git describe --tags --always --dirty)

# Build args
GO_VERSION ?= 1.23.4
GO_VERSION_TOOLING ?= 1.23.4
GO_VERSION ?= 1.23.5
GO_VERSION_TOOLING ?= 1.23.5
OS_CODENAME ?= bullseye
IMAGE_ARG ?= $(IMAGE):$(TAG)-$(CONFIG)

Expand Down
6 changes: 3 additions & 3 deletions images/releng/k8s-ci-builder/variants.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ variants:
default:
CONFIG: default
GO_VERSION: '1.22.10'
GO_VERSION_TOOLING: '1.23.4'
GO_VERSION_TOOLING: '1.23.5'
OS_CODENAME: 'bullseye'
next:
CONFIG: next
Expand All @@ -11,8 +11,8 @@ variants:
OS_CODENAME: 'bookworm'
'1.33':
CONFIG: '1.33'
GO_VERSION: '1.23.4'
GO_VERSION_TOOLING: '1.23.4'
GO_VERSION: '1.23.5'
GO_VERSION_TOOLING: '1.23.5'
OS_CODENAME: 'bullseye'
'1.32':
CONFIG: '1.32'
Expand Down