From 8d661a6a24cceb09641b69f6ce2f9992efebf3a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20Mudrini=C4=87?= Date: Tue, 11 Jun 2024 14:52:41 +0200 Subject: [PATCH] Update k8s-cloud-builder and k8s-ci-builder to Go 1.22.4 and 1.21.11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marko Mudrinić --- dependencies.yaml | 18 +++++++++--------- images/k8s-cloud-builder/variants.yaml | 10 +++++----- images/releng/k8s-ci-builder/Makefile | 2 +- images/releng/k8s-ci-builder/variants.yaml | 14 +++++++------- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 5fcb74a6f5f4..334f5f4f6755 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -71,7 +71,7 @@ dependencies: match: go \d+.\d+ - name: "golang: after kubernetes/kubernetes update" - version: 1.22.3 + version: 1.22.4 refPaths: - path: images/releng/k8s-ci-builder/Makefile match: GO_VERSION\ \?=\ \d+.\d+(alpha|beta|rc)?\.?(\d+)? @@ -247,31 +247,31 @@ dependencies: match: REVISION:\ '\d+' - name: "registry.k8s.io/build-image/kube-cross: dependents k8s-cloud-builder (v1.31-cross1.22)" - version: v1.31.0-go1.22.3-bullseye.0 + version: v1.31.0-go1.22.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.30-cross1.22)" - version: v1.30.0-go1.22.3-bullseye.0 + version: v1.30.0-go1.22.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.29-cross1.21)" - version: v1.29.0-go1.21.10-bullseye.0 + version: v1.29.0-go1.21.11-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.21)" - version: v1.28.0-go1.21.10-bullseye.0 + version: v1.28.0-go1.21.11-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.27-cross1.21)" - version: v1.27.0-go1.21.10-bullseye.0 + version: v1.27.0-go1.21.11-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-]+)*))?)'" @@ -337,7 +337,7 @@ dependencies: match: \d+.\d+(alpha|beta|rc)?\.?(\d+)? - name: "golang: after kubernetes/kubernetes update (previous release branches: 1.29)" - version: 1.21.10 + version: 1.21.11 refPaths: - path: images/releng/k8s-ci-builder/variants.yaml match: \d+.\d+(alpha|beta|rc)?\.?(\d+)? @@ -360,7 +360,7 @@ dependencies: match: \d+.\d+(alpha|beta|rc)?\.?(\d+)? - name: "golang: after kubernetes/kubernetes update (previous release branches: 1.28)" - version: 1.21.10 + version: 1.21.11 refPaths: - path: images/releng/k8s-ci-builder/variants.yaml match: \d+.\d+(alpha|beta|rc)?\.?(\d+)? @@ -377,7 +377,7 @@ dependencies: match: \d+.\d+(alpha|beta|rc)?\.?(\d+)? - name: "golang: after kubernetes/kubernetes update (previous release branches: 1.27)" - version: 1.21.10 + version: 1.21.11 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 afa249b9f146..53d409fca4c0 100644 --- a/images/k8s-cloud-builder/variants.yaml +++ b/images/k8s-cloud-builder/variants.yaml @@ -1,16 +1,16 @@ variants: v1.31-cross1.22-bullseye: CONFIG: 'cross1.22' - KUBE_CROSS_VERSION: 'v1.31.0-go1.22.3-bullseye.0' + KUBE_CROSS_VERSION: 'v1.31.0-go1.22.4-bullseye.0' v1.30-cross1.22-bullseye: CONFIG: 'cross1.22' - KUBE_CROSS_VERSION: 'v1.30.0-go1.22.3-bullseye.0' + KUBE_CROSS_VERSION: 'v1.30.0-go1.22.4-bullseye.0' v1.29-cross1.21-bullseye: CONFIG: 'cross1.21' - KUBE_CROSS_VERSION: 'v1.29.0-go1.21.10-bullseye.0' + KUBE_CROSS_VERSION: 'v1.29.0-go1.21.11-bullseye.0' v1.28-cross1.20-bullseye: CONFIG: 'cross1.20' - KUBE_CROSS_VERSION: 'v1.28.0-go1.21.10-bullseye.0' + KUBE_CROSS_VERSION: 'v1.28.0-go1.21.11-bullseye.0' v1.27-cross1.20-bullseye: CONFIG: 'cross1.20' - KUBE_CROSS_VERSION: 'v1.27.0-go1.21.10-bullseye.0' + KUBE_CROSS_VERSION: 'v1.27.0-go1.21.11-bullseye.0' diff --git a/images/releng/k8s-ci-builder/Makefile b/images/releng/k8s-ci-builder/Makefile index c203ef6e50a8..fc7c122d357e 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.22.3 +GO_VERSION ?= 1.22.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 d7a33f255a22..f1cdc5aa15c9 100644 --- a/images/releng/k8s-ci-builder/variants.yaml +++ b/images/releng/k8s-ci-builder/variants.yaml @@ -1,29 +1,29 @@ variants: default: CONFIG: default - GO_VERSION: '1.22.3' + GO_VERSION: '1.22.4' OS_CODENAME: 'bullseye' next: CONFIG: next - GO_VERSION: '1.22.3' + GO_VERSION: '1.22.4' OS_CODENAME: 'bookworm' '1.31': CONFIG: '1.31' - GO_VERSION: '1.22.3' + GO_VERSION: '1.22.4' OS_CODENAME: 'bullseye' '1.30': CONFIG: '1.30' - GO_VERSION: '1.22.3' + GO_VERSION: '1.22.4' OS_CODENAME: 'bullseye' '1.29': CONFIG: '1.29' - GO_VERSION: '1.21.10' + GO_VERSION: '1.21.11' OS_CODENAME: 'bullseye' '1.28': CONFIG: '1.28' - GO_VERSION: '1.21.10' + GO_VERSION: '1.21.11' OS_CODENAME: 'bullseye' '1.27': CONFIG: '1.27' - GO_VERSION: '1.21.10' + GO_VERSION: '1.21.11' OS_CODENAME: 'bullseye'