From 426129f9e324269852f651edf98477a2878069ab Mon Sep 17 00:00:00 2001 From: cpanato Date: Mon, 30 Dec 2024 16:45:02 +0100 Subject: [PATCH] Update k8s-cloud-builder and k8s-ci-builder to Go 1.23.4/1.22.10 Signed-off-by: cpanato --- dependencies.yaml | 26 +++++++++++++--------- images/k8s-cloud-builder/variants.yaml | 13 ++++++----- images/releng/k8s-ci-builder/Makefile | 2 +- images/releng/k8s-ci-builder/variants.yaml | 17 +++++++++----- 4 files changed, 36 insertions(+), 22 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 5c8a5ac743e..6b11b627ce9 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -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-]+)*))?)'" @@ -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+)? @@ -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+)? diff --git a/images/k8s-cloud-builder/variants.yaml b/images/k8s-cloud-builder/variants.yaml index 80c61380604..f669e4603f3 100644 --- a/images/k8s-cloud-builder/variants.yaml +++ b/images/k8s-cloud-builder/variants.yaml @@ -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' diff --git a/images/releng/k8s-ci-builder/Makefile b/images/releng/k8s-ci-builder/Makefile index 10ed719bf51..106b53139c0 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.23.3 +GO_VERSION ?= 1.23.4 GO_VERSION_TOOLING ?= 1.23.4 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 9d9c1726445..908b34b807f 100644 --- a/images/releng/k8s-ci-builder/variants.yaml +++ b/images/releng/k8s-ci-builder/variants.yaml @@ -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'