From eaad097f0c917d9ba1b3b4dd1d8ebb7e88e82736 Mon Sep 17 00:00:00 2001 From: cpanato Date: Fri, 5 Apr 2024 23:28:41 +0200 Subject: [PATCH] Build k8s-ci-builder and k8s-cloud-bulider with Go 1.21.9 Signed-off-by: cpanato --- dependencies.yaml | 24 ++++++---------------- images/k8s-cloud-builder/variants.yaml | 9 +++----- images/releng/k8s-ci-builder/variants.yaml | 10 +++------ 3 files changed, 12 insertions(+), 31 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 6b2a4bad0bf..7ba8bf0aa8f 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -232,25 +232,19 @@ dependencies: 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.8-bullseye.0 + version: v1.29.0-go1.21.9-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.8-bullseye.0 + version: v1.28.0-go1.21.9-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.8-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.21)" - version: v1.26.0-go1.21.8-bullseye.0 + version: v1.27.0-go1.21.9-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-]+)*))?)'" @@ -299,7 +293,7 @@ dependencies: match: \d+.\d+(alpha|beta|rc)?\.?(\d+)? - name: "golang: after kubernetes/kubernetes update (previous release branches: 1.29)" - version: 1.21.8 + version: 1.21.9 refPaths: - path: images/releng/k8s-ci-builder/variants.yaml match: \d+.\d+(alpha|beta|rc)?\.?(\d+)? @@ -322,7 +316,7 @@ dependencies: match: \d+.\d+(alpha|beta|rc)?\.?(\d+)? - name: "golang: after kubernetes/kubernetes update (previous release branches: 1.28)" - version: 1.21.8 + version: 1.21.9 refPaths: - path: images/releng/k8s-ci-builder/variants.yaml match: \d+.\d+(alpha|beta|rc)?\.?(\d+)? @@ -339,13 +333,7 @@ dependencies: match: \d+.\d+(alpha|beta|rc)?\.?(\d+)? - name: "golang: after kubernetes/kubernetes update (previous release branches: 1.27)" - version: 1.21.8 - 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.26)" - version: 1.21.8 + version: 1.21.9 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 dec3f3a5ad9..f7f443d86b9 100644 --- a/images/k8s-cloud-builder/variants.yaml +++ b/images/k8s-cloud-builder/variants.yaml @@ -4,13 +4,10 @@ variants: 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' + KUBE_CROSS_VERSION: 'v1.29.0-go1.21.9-bullseye.0' v1.28-cross1.20-bullseye: CONFIG: 'cross1.20' - KUBE_CROSS_VERSION: 'v1.28.0-go1.21.8-bullseye.0' + KUBE_CROSS_VERSION: 'v1.28.0-go1.21.9-bullseye.0' v1.27-cross1.20-bullseye: CONFIG: 'cross1.20' - KUBE_CROSS_VERSION: 'v1.27.0-go1.21.8-bullseye.0' - v1.26-cross1.20-bullseye: - CONFIG: 'cross1.20' - KUBE_CROSS_VERSION: 'v1.26.0-go1.21.8-bullseye.0' + KUBE_CROSS_VERSION: 'v1.27.0-go1.21.9-bullseye.0' diff --git a/images/releng/k8s-ci-builder/variants.yaml b/images/releng/k8s-ci-builder/variants.yaml index 415610780fc..7b065461ed0 100644 --- a/images/releng/k8s-ci-builder/variants.yaml +++ b/images/releng/k8s-ci-builder/variants.yaml @@ -13,17 +13,13 @@ variants: OS_CODENAME: 'bullseye' '1.29': CONFIG: '1.29' - GO_VERSION: '1.21.8' + GO_VERSION: '1.21.9' OS_CODENAME: 'bullseye' '1.28': CONFIG: '1.28' - GO_VERSION: '1.21.8' + GO_VERSION: '1.21.9' OS_CODENAME: 'bullseye' '1.27': CONFIG: '1.27' - GO_VERSION: '1.21.8' - OS_CODENAME: 'bullseye' - '1.26': - CONFIG: '1.26' - GO_VERSION: '1.21.8' + GO_VERSION: '1.21.9' OS_CODENAME: 'bullseye'