From 694e7ed2917ce1d20c6b754d0233e7591b8fabfb Mon Sep 17 00:00:00 2001 From: cpanato Date: Thu, 7 Nov 2024 17:08:36 +0100 Subject: [PATCH] build kube-cross, go-runner, releng-ci with golang 1.22.9, 1.23.3 Signed-off-by: cpanato --- dependencies.yaml | 38 ++++++---------------------- images/build/cross/Makefile | 2 +- images/build/cross/variants.yaml | 29 ++++++++------------- images/build/go-runner/Makefile | 2 +- images/build/go-runner/variants.yaml | 8 +++--- images/releng/ci/variants.yaml | 4 +-- 6 files changed, 26 insertions(+), 57 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 32b4b87af1f..9ce11b50351 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -25,7 +25,7 @@ dependencies: # Golang (for images, latest) # To be updated before kubernetes/kubernetes update - name: "golang (latest)" - version: 1.23.2 + version: 1.23.3 refPaths: - path: images/build/cross/Makefile match: GO_VERSION\ \?=\ \d+.\d+(alpha|beta|rc)?\.?(\d+)? @@ -41,7 +41,7 @@ dependencies: # Golang (for images, previous stable) # To be updated before kubernetes/kubernetes update - name: "golang (previous)" - version: 1.22.8 + version: 1.22.9 refPaths: - path: images/build/cross/variants.yaml match: "GO_VERSION: '\\d+.\\d+(alpha|beta|rc)?\\.?(\\d+)?'" @@ -143,7 +143,7 @@ dependencies: # go-runner (latest Golang) # To be updated before kubernetes/kubernetes update - name: "registry.k8s.io/build-image/go-runner (go1.23-bookworm)" - version: v2.4.0-go1.23.2-bookworm.0 + version: v2.4.0-go1.23.3-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-]+)*))?) @@ -159,7 +159,7 @@ dependencies: # go-runner (previous stable Golang) # To be updated before kubernetes/kubernetes update - name: "registry.k8s.io/build-image/go-runner (go1.22-bookworm)" - version: v2.4.0-go1.22.8-bookworm.0 + version: v2.4.0-go1.22.9-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-]+)*))?) @@ -182,7 +182,7 @@ dependencies: # kube-cross (Kubernetes v1.31) # To be updated before kubernetes/kubernetes update - name: "registry.k8s.io/build-image/kube-cross (v1.31-go1.23)" - version: v1.31.0-go1.23.2-bullseye.0 + version: v1.31.0-go1.23.3-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-]+)*))?)'" @@ -204,7 +204,7 @@ dependencies: # kube-cross (Kubernetes v1.31, Go 1.22) # To be updated before kubernetes/kubernetes update - name: "registry.k8s.io/build-image/kube-cross (v1.31-go1.22)" - version: v1.31.0-go1.22.8-bullseye.0 + version: v1.31.0-go1.22.9-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-]+)*))?)'" @@ -226,7 +226,7 @@ dependencies: # kube-cross (Kubernetes v1.30) # To be updated before kubernetes/kubernetes update - name: "registry.k8s.io/build-image/kube-cross (v1.30-go1.22)" - version: v1.30.0-go1.22.8-bullseye.0 + version: v1.30.0-go1.22.9-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-]+)*))?)'" @@ -248,7 +248,7 @@ dependencies: # kube-cross (Kubernetes v1.29) # To be updated before kubernetes/kubernetes update - name: "registry.k8s.io/build-image/kube-cross (v1.29-go1.22)" - version: v1.29.0-go1.22.8-bullseye.0 + version: v1.29.0-go1.22.9-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-]+)*))?)'" @@ -267,28 +267,6 @@ dependencies: - path: images/build/cross/variants.yaml match: REVISION:\ '\d+' - # kube-cross (Kubernetes v1.28) - # To be updated before kubernetes/kubernetes update - - name: "registry.k8s.io/build-image/kube-cross (v1.28-go1.22)" - version: v1.28.0-go1.22.8-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.28-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.28-go1.22)" - version: 0 - refPaths: - - path: images/build/cross/Makefile - match: REVISION \?= \d+ - - path: images/build/cross/variants.yaml - match: REVISION:\ '\d+' - # kube-cross dependents (i.e. k8s-cloud-builder) # To be updated after kubernetes/kubernetes update) - name: "registry.k8s.io/build-image/kube-cross: dependents k8s-cloud-builder (v1.32-cross1.23)" diff --git a/images/build/cross/Makefile b/images/build/cross/Makefile index 554693abcae..19d1dc4c2a0 100644 --- a/images/build/cross/Makefile +++ b/images/build/cross/Makefile @@ -28,7 +28,7 @@ IMGNAME = kube-cross # - v1.100.0-go1.17-bullseye.0 satisfies SemVer regex, while: # - v1.100-go1.17-bullseye.0 does not KUBERNETES_VERSION ?= v1.31.0 -GO_VERSION ?= 1.23.2 +GO_VERSION ?= 1.23.3 GO_MAJOR_VERSION ?= 1.23 OS_CODENAME ?= bullseye REVISION ?= 0 diff --git a/images/build/cross/variants.yaml b/images/build/cross/variants.yaml index ff0be6a689a..f76515b1628 100644 --- a/images/build/cross/variants.yaml +++ b/images/build/cross/variants.yaml @@ -2,54 +2,45 @@ variants: v1.32-go1.23-bullseye: CONFIG: 'go1.23-bullseye' TYPE: 'default' - IMAGE_VERSION: 'v1.32.0-go1.23.2-bullseye.0' + IMAGE_VERSION: 'v1.32.0-go1.23.3-bullseye.0' KUBERNETES_VERSION: 'v1.32.0' - GO_VERSION: '1.23.2' + GO_VERSION: '1.23.3' 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.23.2-bullseye.0' + IMAGE_VERSION: 'v1.31.0-go1.23.3-bullseye.0' KUBERNETES_VERSION: 'v1.31.0' - GO_VERSION: '1.23.2' + GO_VERSION: '1.23.3' GO_MAJOR_VERSION: '1.23' OS_CODENAME: 'bullseye' REVISION: '0' v1.31-go1.22-bullseye: CONFIG: 'go1.22-bullseye' TYPE: 'default' - IMAGE_VERSION: 'v1.31.0-go1.22.8-bullseye.0' + IMAGE_VERSION: 'v1.31.0-go1.22.9-bullseye.0' KUBERNETES_VERSION: 'v1.31.0' - GO_VERSION: '1.22.8' + GO_VERSION: '1.22.9' GO_MAJOR_VERSION: '1.22' OS_CODENAME: 'bullseye' REVISION: '0' v1.30-go1.22-bullseye: CONFIG: 'go1.22-bullseye' TYPE: 'default' - IMAGE_VERSION: 'v1.30.0-go1.22.8-bullseye.0' + IMAGE_VERSION: 'v1.30.0-go1.22.9-bullseye.0' KUBERNETES_VERSION: 'v1.30.0' - GO_VERSION: '1.22.8' + GO_VERSION: '1.22.9' GO_MAJOR_VERSION: '1.22' OS_CODENAME: 'bullseye' REVISION: '0' v1.29-go1.22-bullseye: CONFIG: 'go1.22-bullseye' TYPE: 'default' - IMAGE_VERSION: 'v1.29.0-go1.22.8-bullseye.0' + IMAGE_VERSION: 'v1.29.0-go1.22.9-bullseye.0' KUBERNETES_VERSION: 'v1.29.0' - GO_VERSION: '1.22.8' - GO_MAJOR_VERSION: '1.22' - OS_CODENAME: 'bullseye' - REVISION: '0' - v1.28-go1.22-bullseye: - CONFIG: 'go1.22-bullseye' - TYPE: 'default' - IMAGE_VERSION: 'v1.28.0-go1.22.8-bullseye.0' - KUBERNETES_VERSION: 'v1.28.0' - GO_VERSION: '1.22.8' + GO_VERSION: '1.22.9' GO_MAJOR_VERSION: '1.22' OS_CODENAME: 'bullseye' REVISION: '0' diff --git a/images/build/go-runner/Makefile b/images/build/go-runner/Makefile index f5699818744..3c91c3ca2ee 100644 --- a/images/build/go-runner/Makefile +++ b/images/build/go-runner/Makefile @@ -19,7 +19,7 @@ IMGNAME = go-runner APP_VERSION = $(shell cat VERSION) GO_MAJOR_VERSION ?= 1.23 REVISION ?= 0 -GO_VERSION ?= 1.23.2 +GO_VERSION ?= 1.23.3 OS_CODENAME ?= bookworm # Build args diff --git a/images/build/go-runner/variants.yaml b/images/build/go-runner/variants.yaml index 390b789bf16..8a588c936a3 100644 --- a/images/build/go-runner/variants.yaml +++ b/images/build/go-runner/variants.yaml @@ -1,17 +1,17 @@ variants: go1.23-bookworm: CONFIG: 'go1.23-bookworm' - IMAGE_VERSION: 'v2.4.0-go1.23.2-bookworm.0' + IMAGE_VERSION: 'v2.4.0-go1.23.3-bookworm.0' GO_MAJOR_VERSION: '1.23' OS_CODENAME: 'bookworm' REVISION: '0' - GO_VERSION: '1.23.2' + GO_VERSION: '1.23.3' DISTROLESS_IMAGE: 'static-debian12' go1.22-bookworm: CONFIG: 'go1.22-bookworm' - IMAGE_VERSION: 'v2.4.0-go1.22.8-bookworm.0' + IMAGE_VERSION: 'v2.4.0-go1.22.9-bookworm.0' GO_MAJOR_VERSION: '1.22' OS_CODENAME: 'bookworm' REVISION: '0' - GO_VERSION: '1.22.8' + GO_VERSION: '1.22.9' DISTROLESS_IMAGE: 'static-debian12' diff --git a/images/releng/ci/variants.yaml b/images/releng/ci/variants.yaml index 448647f7c80..3ca41bff651 100644 --- a/images/releng/ci/variants.yaml +++ b/images/releng/ci/variants.yaml @@ -1,12 +1,12 @@ variants: go1.23-bookworm: CONFIG: 'go1.23-bookworm' - GO_VERSION: '1.23.2' + GO_VERSION: '1.23.3' OS_CODENAME: 'bookworm' REVISION: '0' go1.22-bookworm: CONFIG: 'go1.22-bookworm' - GO_VERSION: '1.22.8' + GO_VERSION: '1.22.9' OS_CODENAME: 'bookworm' REVISION: '0' go1.21-bookworm: