From 374cc9b09a1ddeaad0b5268008cb740c926d9c5b Mon Sep 17 00:00:00 2001 From: cpanato Date: Thu, 11 Jan 2024 16:41:30 +0100 Subject: [PATCH] Build k8s-ci-builder and k8s-cloud-bulider with Go 1.21.6 and 1.20.13 Signed-off-by: cpanato --- dependencies.yaml | 22 +++++++++++----------- images/k8s-cloud-builder/variants.yaml | 11 +++++++---- images/releng/k8s-ci-builder/Makefile | 2 +- images/releng/k8s-ci-builder/variants.yaml | 16 ++++++++++------ 4 files changed, 29 insertions(+), 22 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 0ab7b451eb5..6ea9aa38c42 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -63,7 +63,7 @@ dependencies: match: go \d+.\d+ - name: "golang: after kubernetes/kubernetes update" - version: 1.21.5 + version: 1.21.6 refPaths: - path: images/releng/k8s-ci-builder/Makefile match: GO_VERSION\ \?=\ \d+.\d+(alpha|beta|rc)?\.?(\d+)? @@ -247,25 +247,25 @@ dependencies: match: REVISION:\ '\d+' - name: "registry.k8s.io/build-image/kube-cross: dependents k8s-cloud-builder (v1.29-cross1.21)" - version: v1.29.0-go1.21.5-bullseye.0 + version: v1.29.0-go1.21.6-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.20)" - version: v1.28.0-go1.20.12-bullseye.0 + version: v1.28.0-go1.20.13-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.20)" - version: v1.27.0-go1.20.12-bullseye.0 + version: v1.27.0-go1.20.13-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.26-cross1.20)" - version: v1.26.0-go1.20.12-bullseye.0 + version: v1.26.0-go1.20.13-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-]+)*))?)'" @@ -303,7 +303,7 @@ dependencies: match: "CONFIG: 'go\\d+.\\d+-bullseye'" # Golang (previous release branches: 1.29) - - name: "golang (previous release branches: 1.28)" + - name: "golang (previous release branches: 1.29)" version: 1.21.6 refPaths: - path: images/build/cross/variants.yaml @@ -314,7 +314,7 @@ dependencies: match: \d+.\d+(alpha|beta|rc)?\.?(\d+)? - name: "golang: after kubernetes/kubernetes update (previous release branches: 1.29)" - version: 1.21.5 + version: 1.21.6 refPaths: - path: images/releng/k8s-ci-builder/variants.yaml match: \d+.\d+(alpha|beta|rc)?\.?(\d+)? @@ -331,13 +331,13 @@ dependencies: match: \d+.\d+(alpha|beta|rc)?\.?(\d+)? - name: "golang: after kubernetes/kubernetes update (previous release branches: master)" - version: 1.21.5 + version: 1.21.6 refPaths: - path: images/releng/k8s-ci-builder/variants.yaml match: \d+.\d+(alpha|beta|rc)?\.?(\d+)? - name: "golang: after kubernetes/kubernetes update (previous release branches: 1.28)" - version: 1.20.12 + version: 1.20.13 refPaths: - path: images/releng/k8s-ci-builder/variants.yaml match: \d+.\d+(alpha|beta|rc)?\.?(\d+)? @@ -354,7 +354,7 @@ dependencies: match: \d+.\d+(alpha|beta|rc)?\.?(\d+)? - name: "golang: after kubernetes/kubernetes update (previous release branches: 1.27)" - version: 1.20.12 + version: 1.20.13 refPaths: - path: images/releng/k8s-ci-builder/variants.yaml match: \d+.\d+(alpha|beta|rc)?\.?(\d+)? @@ -371,7 +371,7 @@ dependencies: match: \d+.\d+(alpha|beta|rc)?\.?(\d+)? - name: "golang: after kubernetes/kubernetes update (previous release branches: 1.26)" - version: 1.20.12 + version: 1.20.13 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 dc7872c1899..bbc0b884285 100644 --- a/images/k8s-cloud-builder/variants.yaml +++ b/images/k8s-cloud-builder/variants.yaml @@ -1,13 +1,16 @@ variants: + v1.30-cross1.21-bullseye: + CONFIG: 'cross1.21' + KUBE_CROSS_VERSION: 'v1.30.0-go1.21.6-bullseye.0' v1.29-cross1.21-bullseye: CONFIG: 'cross1.21' - KUBE_CROSS_VERSION: 'v1.29.0-go1.21.5-bullseye.0' + KUBE_CROSS_VERSION: 'v1.29.0-go1.21.6-bullseye.0' v1.28-cross1.20-bullseye: CONFIG: 'cross1.20' - KUBE_CROSS_VERSION: 'v1.28.0-go1.20.12-bullseye.0' + KUBE_CROSS_VERSION: 'v1.28.0-go1.20.13-bullseye.0' v1.27-cross1.20-bullseye: CONFIG: 'cross1.20' - KUBE_CROSS_VERSION: 'v1.27.0-go1.20.12-bullseye.0' + KUBE_CROSS_VERSION: 'v1.27.0-go1.20.13-bullseye.0' v1.26-cross1.20-bullseye: CONFIG: 'cross1.20' - KUBE_CROSS_VERSION: 'v1.26.0-go1.20.12-bullseye.0' + KUBE_CROSS_VERSION: 'v1.26.0-go1.20.13-bullseye.0' diff --git a/images/releng/k8s-ci-builder/Makefile b/images/releng/k8s-ci-builder/Makefile index 572c512966a..0be663af2a7 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.21.5 +GO_VERSION ?= 1.21.6 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 9a92d51fde4..7820cfe22c3 100644 --- a/images/releng/k8s-ci-builder/variants.yaml +++ b/images/releng/k8s-ci-builder/variants.yaml @@ -1,25 +1,29 @@ variants: default: CONFIG: default - GO_VERSION: '1.21.5' + GO_VERSION: '1.21.6' OS_CODENAME: 'bullseye' next: CONFIG: next - GO_VERSION: '1.21.5' + GO_VERSION: '1.21.6' OS_CODENAME: 'bookworm' + '1.30': + CONFIG: '1.30' + GO_VERSION: '1.21.6' + OS_CODENAME: 'bullseye' '1.29': CONFIG: '1.29' - GO_VERSION: '1.21.5' + GO_VERSION: '1.21.6' OS_CODENAME: 'bullseye' '1.28': CONFIG: '1.28' - GO_VERSION: '1.20.12' + GO_VERSION: '1.20.13' OS_CODENAME: 'bullseye' '1.27': CONFIG: '1.27' - GO_VERSION: '1.20.12' + GO_VERSION: '1.20.13' OS_CODENAME: 'bullseye' '1.26': CONFIG: '1.26' - GO_VERSION: '1.20.12' + GO_VERSION: '1.20.13' OS_CODENAME: 'bullseye'