diff --git a/dependencies.yaml b/dependencies.yaml index 5e6bbce758a..73d8534f0e1 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -71,7 +71,7 @@ dependencies: match: go \d+.\d+ - name: "golang: after kubernetes/kubernetes update" - version: 1.23rc2 + version: 1.23.0 refPaths: - path: images/releng/k8s-ci-builder/Makefile match: GO_VERSION\ \?=\ \d+.\d+(alpha|beta|rc)?\.?(\d+)? @@ -246,8 +246,14 @@ dependencies: - path: images/build/cross/variants.yaml 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 + 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.23rc2-bullseye.0 + version: v1.31.0-go1.23.0-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-]+)*))?)'" diff --git a/images/k8s-cloud-builder/variants.yaml b/images/k8s-cloud-builder/variants.yaml index aae9be82076..ac952d8ce10 100644 --- a/images/k8s-cloud-builder/variants.yaml +++ b/images/k8s-cloud-builder/variants.yaml @@ -1,7 +1,10 @@ variants: + v1.32-cross1.23-bullseye: + CONFIG: 'cross1.23' + KUBE_CROSS_VERSION: 'v1.32.0-go1.23.0-bullseye.0' v1.31-cross1.23-bullseye: CONFIG: 'cross1.23' - KUBE_CROSS_VERSION: 'v1.31.0-go1.23rc2-bullseye.0' + KUBE_CROSS_VERSION: 'v1.31.0-go1.23.0-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' diff --git a/images/releng/k8s-ci-builder/Makefile b/images/releng/k8s-ci-builder/Makefile index 018e79edaf6..481fca7fdb1 100644 --- a/images/releng/k8s-ci-builder/Makefile +++ b/images/releng/k8s-ci-builder/Makefile @@ -24,7 +24,7 @@ IMAGE = $(REGISTRY)/$(IMGNAME) TAG ?= $(shell git describe --tags --always --dirty) # Build args -GO_VERSION ?= 1.23rc2 +GO_VERSION ?= 1.23.0 OS_CODENAME ?= bullseye IMAGE_ARG ?= $(IMAGE):$(TAG)-$(CONFIG) diff --git a/images/releng/k8s-ci-builder/variants.yaml b/images/releng/k8s-ci-builder/variants.yaml index 29fe0bfca42..7acf88d5793 100644 --- a/images/releng/k8s-ci-builder/variants.yaml +++ b/images/releng/k8s-ci-builder/variants.yaml @@ -5,8 +5,12 @@ variants: OS_CODENAME: 'bullseye' next: CONFIG: next - GO_VERSION: '1.23rc2' + GO_VERSION: '1.23.0' OS_CODENAME: 'bookworm' + '1.32': + CONFIG: '1.32' + GO_VERSION: '1.23.0' + OS_CODENAME: 'bullseye' '1.31': CONFIG: '1.31' GO_VERSION: '1.22.6'