From c76dba62dfc031ef69fe9701154a2adda6823e81 Mon Sep 17 00:00:00 2001 From: cpanato Date: Thu, 29 Aug 2024 10:05:34 +0200 Subject: [PATCH] Update k8s-cloud-builder and k8s-ci-builder to Go 1.22.6 Signed-off-by: cpanato --- dependencies.yaml | 35 ++++------------------ images/k8s-cloud-builder/variants.yaml | 11 +++---- images/releng/k8s-ci-builder/variants.yaml | 14 ++++----- 3 files changed, 15 insertions(+), 45 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 8fe61693c6a..95aba85c7d2 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -254,31 +254,25 @@ dependencies: # 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.5-bullseye.0 + version: v1.31.0-go1.22.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.30-cross1.22)" - version: v1.30.0-go1.22.5-bullseye.0 + version: v1.30.0-go1.22.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.29-cross1.22)" - version: v1.29.0-go1.22.5-bullseye.0 + version: v1.29.0-go1.22.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.22)" - version: v1.28.0-go1.22.5-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.22)" - version: v1.27.0-go1.22.5-bullseye.0 + version: v1.28.0-go1.22.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-]+)*))?)'" @@ -328,7 +322,7 @@ dependencies: match: \d+.\d+(alpha|beta|rc)?\.?(\d+)? - name: "golang: after kubernetes/kubernetes update (previous release branches: 1.30)" - version: 1.22.5 + version: 1.22.6 refPaths: - path: images/releng/k8s-ci-builder/variants.yaml match: \d+.\d+(alpha|beta|rc)?\.?(\d+)? @@ -345,7 +339,7 @@ dependencies: match: \d+.\d+(alpha|beta|rc)?\.?(\d+)? - name: "golang: after kubernetes/kubernetes update (previous release branches: 1.29)" - version: 1.22.5 + version: 1.22.6 refPaths: - path: images/releng/k8s-ci-builder/variants.yaml match: \d+.\d+(alpha|beta|rc)?\.?(\d+)? @@ -368,25 +362,8 @@ dependencies: match: \d+.\d+(alpha|beta|rc)?\.?(\d+)? - name: "golang: after kubernetes/kubernetes update (previous release branches: 1.28)" - version: 1.22.5 - refPaths: - - path: images/releng/k8s-ci-builder/variants.yaml - match: \d+.\d+(alpha|beta|rc)?\.?(\d+)? - - # Golang (previous release branches: 1.27) - - name: "golang (previous release branches: 1.27)" version: 1.22.6 refPaths: - - path: images/build/cross/variants.yaml - match: \d+.\d+(alpha|beta|rc)?\.?(\d+)? - - path: images/build/go-runner/variants.yaml - match: \d+.\d+(alpha|beta|rc)?\.?(\d+)? - - path: images/releng/ci/variants.yaml - match: \d+.\d+(alpha|beta|rc)?\.?(\d+)? - - - name: "golang: after kubernetes/kubernetes update (previous release branches: 1.27)" - version: 1.22.5 - 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 aff60390c6e..aae9be82076 100644 --- a/images/k8s-cloud-builder/variants.yaml +++ b/images/k8s-cloud-builder/variants.yaml @@ -5,16 +5,13 @@ variants: # 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.5-bullseye.0' + KUBE_CROSS_VERSION: 'v1.31.0-go1.22.6-bullseye.0' v1.30-cross1.22-bullseye: CONFIG: 'cross1.22' - KUBE_CROSS_VERSION: 'v1.30.0-go1.22.5-bullseye.0' + KUBE_CROSS_VERSION: 'v1.30.0-go1.22.6-bullseye.0' v1.29-cross1.22-bullseye: CONFIG: 'cross1.21' - KUBE_CROSS_VERSION: 'v1.29.0-go1.22.5-bullseye.0' + KUBE_CROSS_VERSION: 'v1.29.0-go1.22.6-bullseye.0' v1.28-cross1.22-bullseye: CONFIG: 'cross1.20' - KUBE_CROSS_VERSION: 'v1.28.0-go1.22.5-bullseye.0' - v1.27-cross1.22-bullseye: - CONFIG: 'cross1.20' - KUBE_CROSS_VERSION: 'v1.27.0-go1.22.5-bullseye.0' + KUBE_CROSS_VERSION: 'v1.28.0-go1.22.6-bullseye.0' diff --git a/images/releng/k8s-ci-builder/variants.yaml b/images/releng/k8s-ci-builder/variants.yaml index b8d9a2578d7..29fe0bfca42 100644 --- a/images/releng/k8s-ci-builder/variants.yaml +++ b/images/releng/k8s-ci-builder/variants.yaml @@ -1,7 +1,7 @@ variants: default: CONFIG: default - GO_VERSION: '1.22.5' + GO_VERSION: '1.22.6' OS_CODENAME: 'bullseye' next: CONFIG: next @@ -9,21 +9,17 @@ variants: OS_CODENAME: 'bookworm' '1.31': CONFIG: '1.31' - GO_VERSION: '1.23rc2' + GO_VERSION: '1.22.6' OS_CODENAME: 'bullseye' '1.30': CONFIG: '1.30' - GO_VERSION: '1.22.5' + GO_VERSION: '1.22.6' OS_CODENAME: 'bullseye' '1.29': CONFIG: '1.29' - GO_VERSION: '1.22.5' + GO_VERSION: '1.22.6' OS_CODENAME: 'bullseye' '1.28': CONFIG: '1.28' - GO_VERSION: '1.22.5' - OS_CODENAME: 'bullseye' - '1.27': - CONFIG: '1.27' - GO_VERSION: '1.22.5' + GO_VERSION: '1.22.6' OS_CODENAME: 'bullseye'