From 9fbf74a73b11de03ed281b99f69ce46f52dccd5e Mon Sep 17 00:00:00 2001 From: cpanato Date: Wed, 28 Aug 2024 18:34:14 +0200 Subject: [PATCH 1/2] golang: Build 1.23.0 images Signed-off-by: cpanato --- dependencies.yaml | 31 ++++++---------------------- images/build/cross/variants.yaml | 13 ++++++++++-- images/build/go-runner/variants.yaml | 4 ++-- images/releng/ci/variants.yaml | 2 +- 4 files changed, 20 insertions(+), 30 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 7767d94aaab..8fe61693c6a 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -117,7 +117,7 @@ dependencies: # go-runner - name: "registry.k8s.io/build-image/go-runner (go1.23-bookworm)" - version: v2.3.1-go1.23rc2-bookworm.0 + version: v2.3.1-go1.23.0-bookworm.0 refPaths: - path: images/build/go-runner/variants.yaml match: v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?) @@ -146,7 +146,7 @@ dependencies: # kube-cross - name: "registry.k8s.io/build-image/kube-cross (v1.31-go1.23)" - version: v1.31.0-go1.23rc2-bullseye.0 + version: v1.31.0-go1.23.0-bullseye.0 refPaths: - path: images/build/cross/variants.yaml match: "IMAGE_VERSION: 'v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'" @@ -246,26 +246,6 @@ dependencies: - path: images/build/cross/variants.yaml match: REVISION:\ '\d+' - - name: "registry.k8s.io/build-image/kube-cross (v1.27-go1.22)" - version: v1.27.0-go1.22.6-bullseye.0 - refPaths: - - path: images/build/cross/variants.yaml - match: "IMAGE_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: config variant (v1.27-go1.22)" - version: go1.22-bullseye - refPaths: - - path: images/build/cross/variants.yaml - match: "CONFIG: 'go\\d+.\\d+-bullseye'" - - - name: "registry.k8s.io/build-image/kube-cross: image revision (v1.27-go1.22)" - version: 0 - refPaths: - - path: images/build/cross/Makefile - match: REVISION \?= \d+ - - path: images/build/cross/variants.yaml - match: REVISION:\ '\d+' - - name: "registry.k8s.io/build-image/kube-cross: dependents k8s-cloud-builder (v1.31-cross1.23)" version: v1.31.0-go1.23rc2-bullseye.0 refPaths: @@ -311,7 +291,7 @@ dependencies: # Golang (next candidate) - name: "golang (next candidate)" - version: 1.23rc2 + version: 1.23.0 refPaths: - path: images/build/cross/variants.yaml match: "GO_VERSION: '\\d+.\\d+(alpha|beta|rc)?\\.?(\\d+)?'" @@ -319,8 +299,9 @@ dependencies: match: "GO_VERSION: '\\d+.\\d+(alpha|beta|rc)?\\.?(\\d+)?'" - path: images/releng/ci/variants.yaml match: "GO_VERSION: '\\d+.\\d+(alpha|beta|rc)?\\.?(\\d+)?'" - - path: images/releng/k8s-ci-builder/variants.yaml - match: "GO_VERSION: '\\d+.\\d+(alpha|beta|rc)?\\.?(\\d+)?'" + # TODO: uncomment when we build the k8s-ci-builder with 1.23.0 + # - path: images/releng/k8s-ci-builder/variants.yaml + # match: "GO_VERSION: '\\d+.\\d+(alpha|beta|rc)?\\.?(\\d+)?'" # Golang images (next candidate) - name: "gcr.io/k8s-staging-releng/releng-ci: image revision (next candidate)" diff --git a/images/build/cross/variants.yaml b/images/build/cross/variants.yaml index 5aa416981e0..e786d95ec17 100644 --- a/images/build/cross/variants.yaml +++ b/images/build/cross/variants.yaml @@ -1,10 +1,19 @@ variants: + v1.32-go1.23-bullseye: + CONFIG: 'go1.23-bullseye' + TYPE: 'default' + IMAGE_VERSION: 'v1.32.0-go1.23.0-bullseye.0' + KUBERNETES_VERSION: 'v1.32.0' + GO_VERSION: '1.23.0' + GO_MAJOR_VERSION: '1.23' + OS_CODENAME: 'bullseye' + REVISION: '0' v1.31-go1.23-bullseye: CONFIG: 'go1.23-bullseye' TYPE: 'default' - IMAGE_VERSION: 'v1.31.0-go1.23rc2-bullseye.0' + IMAGE_VERSION: 'v1.31.0-go1.23.0-bullseye.0' KUBERNETES_VERSION: 'v1.31.0' - GO_VERSION: '1.23rc2' + GO_VERSION: '1.23.0' GO_MAJOR_VERSION: '1.23' OS_CODENAME: 'bullseye' REVISION: '0' diff --git a/images/build/go-runner/variants.yaml b/images/build/go-runner/variants.yaml index 0b02016df85..f665766c9ac 100644 --- a/images/build/go-runner/variants.yaml +++ b/images/build/go-runner/variants.yaml @@ -1,11 +1,11 @@ variants: go1.23-bookworm: CONFIG: 'go1.23-bookworm' - IMAGE_VERSION: 'v2.3.1-go1.23rc2-bookworm.0' + IMAGE_VERSION: 'v2.3.1-go1.23.0-bookworm.0' GO_MAJOR_VERSION: '1.23' OS_CODENAME: 'bookworm' REVISION: '0' - GO_VERSION: '1.23rc2' + GO_VERSION: '1.23.0' DISTROLESS_IMAGE: 'static-debian12' go1.22-bookworm: CONFIG: 'go1.22-bookworm' diff --git a/images/releng/ci/variants.yaml b/images/releng/ci/variants.yaml index f1e49a28151..16ddc735b42 100644 --- a/images/releng/ci/variants.yaml +++ b/images/releng/ci/variants.yaml @@ -1,7 +1,7 @@ variants: go1.23-bookworm: CONFIG: 'go1.23-bookworm' - GO_VERSION: '1.23rc2' + GO_VERSION: '1.23.0' OS_CODENAME: 'bookworm' REVISION: '0' go1.22-bookworm: From 7a96fa76bed2162c16a5a9eeb156939b405d0eb6 Mon Sep 17 00:00:00 2001 From: cpanato Date: Wed, 28 Aug 2024 18:34:35 +0200 Subject: [PATCH 2/2] drop 1.27 cross config image Signed-off-by: cpanato --- images/build/cross/variants.yaml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/images/build/cross/variants.yaml b/images/build/cross/variants.yaml index e786d95ec17..d41b6921508 100644 --- a/images/build/cross/variants.yaml +++ b/images/build/cross/variants.yaml @@ -53,12 +53,3 @@ variants: GO_MAJOR_VERSION: '1.22' OS_CODENAME: 'bullseye' REVISION: '0' - v1.27-go1.22-bullseye: - CONFIG: 'go1.22-bullseye' - TYPE: 'default' - IMAGE_VERSION: 'v1.27.0-go1.22.6-bullseye.0' - KUBERNETES_VERSION: 'v1.27.0' - GO_VERSION: '1.22.6' - GO_MAJOR_VERSION: '1.22' - OS_CODENAME: 'bullseye' - REVISION: '0'