From ded9aa14ae47ceb489db2937ef66caaacc46fbc1 Mon Sep 17 00:00:00 2001 From: cpanato Date: Fri, 5 Apr 2024 16:42:36 +0200 Subject: [PATCH] Build k8s-ci-builder and k8s-cloud-bulider with Go 1.22.2 Signed-off-by: cpanato --- dependencies.yaml | 4 ++-- images/k8s-cloud-builder/variants.yaml | 2 +- images/releng/k8s-ci-builder/Makefile | 2 +- images/releng/k8s-ci-builder/variants.yaml | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index cf7dc32e63ea..7cf0c0702e2f 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.1 + version: 1.22.2 refPaths: - path: images/releng/k8s-ci-builder/Makefile match: GO_VERSION\ \?=\ \d+.\d+(alpha|beta|rc)?\.?(\d+)? @@ -226,7 +226,7 @@ dependencies: match: REVISION:\ '\d+' - name: "registry.k8s.io/build-image/kube-cross: dependents k8s-cloud-builder (v1.30-cross1.22)" - version: v1.30.0-go1.22.1-bullseye.0 + version: v1.30.0-go1.22.2-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 493883c9f973..dec3f3a5ad9b 100644 --- a/images/k8s-cloud-builder/variants.yaml +++ b/images/k8s-cloud-builder/variants.yaml @@ -1,7 +1,7 @@ variants: v1.30-cross1.22-bullseye: CONFIG: 'cross1.22' - KUBE_CROSS_VERSION: 'v1.30.0-go1.22.1-bullseye.0' + KUBE_CROSS_VERSION: 'v1.30.0-go1.22.2-bullseye.0' v1.29-cross1.21-bullseye: CONFIG: 'cross1.21' KUBE_CROSS_VERSION: 'v1.29.0-go1.21.8-bullseye.0' diff --git a/images/releng/k8s-ci-builder/Makefile b/images/releng/k8s-ci-builder/Makefile index 65e5bb0f56be..baffde484efb 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.1 +GO_VERSION ?= 1.22.2 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 d6caca4aca70..415610780fc9 100644 --- a/images/releng/k8s-ci-builder/variants.yaml +++ b/images/releng/k8s-ci-builder/variants.yaml @@ -1,15 +1,15 @@ variants: default: CONFIG: default - GO_VERSION: '1.22.1' + GO_VERSION: '1.22.2' OS_CODENAME: 'bullseye' next: CONFIG: next - GO_VERSION: '1.22.1' + GO_VERSION: '1.22.2' OS_CODENAME: 'bookworm' '1.30': CONFIG: '1.30' - GO_VERSION: '1.22.1' + GO_VERSION: '1.22.2' OS_CODENAME: 'bullseye' '1.29': CONFIG: '1.29'