From ecfdb2da99e0d5205a179eec979eb0530ecd1719 Mon Sep 17 00:00:00 2001 From: cpanato Date: Sun, 2 Feb 2025 17:42:55 +0100 Subject: [PATCH] build kube-cross, go-runner, releng-ci with golang 1.22.11, 1.23.5 Signed-off-by: cpanato --- dependencies.yaml | 20 ++++++++++---------- images/build/cross/Makefile | 2 +- images/build/cross/variants.yaml | 24 ++++++++++++------------ images/build/go-runner/Makefile | 2 +- images/build/go-runner/variants.yaml | 8 ++++---- images/releng/ci/variants.yaml | 9 ++------- 6 files changed, 30 insertions(+), 35 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index c5dba246b36..eba72e788c3 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.4 + version: 1.23.5 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.10 + version: 1.22.11 refPaths: - path: images/build/cross/variants.yaml match: "GO_VERSION: '\\d+.\\d+(alpha|beta|rc)?\\.?(\\d+)?'" @@ -160,7 +160,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.4-bookworm.0 + version: v2.4.0-go1.23.5-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-]+)*))?) @@ -176,7 +176,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.10-bookworm.0 + version: v2.4.0-go1.22.11-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-]+)*))?) @@ -219,7 +219,7 @@ dependencies: # kube-cross (Kubernetes v1.33) # To be updated before kubernetes/kubernetes update - name: "registry.k8s.io/build-image/kube-cross (v1.33-go1.23)" - version: v1.33.0-go1.23.4-bullseye.0 + version: v1.33.0-go1.23.5-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-]+)*))?)'" @@ -241,7 +241,7 @@ dependencies: # kube-cross (Kubernetes v1.32) # To be updated before kubernetes/kubernetes update - name: "registry.k8s.io/build-image/kube-cross (v1.32-go1.23)" - version: v1.32.0-go1.23.4-bullseye.0 + version: v1.32.0-go1.23.5-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-]+)*))?)'" @@ -263,7 +263,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.4-bullseye.0 + version: v1.31.0-go1.23.5-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-]+)*))?)'" @@ -285,7 +285,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.10-bullseye.0 + version: v1.31.0-go1.22.11-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-]+)*))?)'" @@ -307,7 +307,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.10-bullseye.0 + version: v1.30.0-go1.22.11-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-]+)*))?)'" @@ -329,7 +329,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.10-bullseye.0 + version: v1.29.0-go1.22.11-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-]+)*))?)'" diff --git a/images/build/cross/Makefile b/images/build/cross/Makefile index bf61dd14bf3..991bca325cd 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.32.0 -GO_VERSION ?= 1.23.4 +GO_VERSION ?= 1.23.5 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 2160a5eee87..7e993737ef9 100644 --- a/images/build/cross/variants.yaml +++ b/images/build/cross/variants.yaml @@ -11,54 +11,54 @@ variants: v1.33-go1.23-bullseye: CONFIG: 'go1.23-bullseye' TYPE: 'default' - IMAGE_VERSION: 'v1.33.0-go1.23.4-bullseye.0' + IMAGE_VERSION: 'v1.33.0-go1.23.5-bullseye.0' KUBERNETES_VERSION: 'v1.33.0' - GO_VERSION: '1.23.4' + GO_VERSION: '1.23.5' GO_MAJOR_VERSION: '1.23' OS_CODENAME: 'bullseye' REVISION: '0' v1.32-go1.23-bullseye: CONFIG: 'go1.23-bullseye' TYPE: 'default' - IMAGE_VERSION: 'v1.32.0-go1.23.4-bullseye.0' + IMAGE_VERSION: 'v1.32.0-go1.23.5-bullseye.0' KUBERNETES_VERSION: 'v1.32.0' - GO_VERSION: '1.23.4' + GO_VERSION: '1.23.5' 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.4-bullseye.0' + IMAGE_VERSION: 'v1.31.0-go1.23.5-bullseye.0' KUBERNETES_VERSION: 'v1.31.0' - GO_VERSION: '1.23.4' + GO_VERSION: '1.23.5' 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.10-bullseye.0' + IMAGE_VERSION: 'v1.31.0-go1.22.11-bullseye.0' KUBERNETES_VERSION: 'v1.31.0' - GO_VERSION: '1.22.10' + GO_VERSION: '1.22.11' 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.10-bullseye.0' + IMAGE_VERSION: 'v1.30.0-go1.22.11-bullseye.0' KUBERNETES_VERSION: 'v1.30.0' - GO_VERSION: '1.22.10' + GO_VERSION: '1.22.11' 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.10-bullseye.0' + IMAGE_VERSION: 'v1.29.0-go1.22.11-bullseye.0' KUBERNETES_VERSION: 'v1.29.0' - GO_VERSION: '1.22.10' + GO_VERSION: '1.22.11' 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 2013b233ce0..a3984cfa01f 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.4 +GO_VERSION ?= 1.23.5 OS_CODENAME ?= bookworm # Build args diff --git a/images/build/go-runner/variants.yaml b/images/build/go-runner/variants.yaml index c3e8ecde5c8..90bc12226a8 100644 --- a/images/build/go-runner/variants.yaml +++ b/images/build/go-runner/variants.yaml @@ -9,17 +9,17 @@ variants: DISTROLESS_IMAGE: 'static-debian12' go1.23-bookworm: CONFIG: 'go1.23-bookworm' - IMAGE_VERSION: 'v2.4.0-go1.23.4-bookworm.0' + IMAGE_VERSION: 'v2.4.0-go1.23.5-bookworm.0' GO_MAJOR_VERSION: '1.23' OS_CODENAME: 'bookworm' REVISION: '0' - GO_VERSION: '1.23.4' + GO_VERSION: '1.23.5' DISTROLESS_IMAGE: 'static-debian12' go1.22-bookworm: CONFIG: 'go1.22-bookworm' - IMAGE_VERSION: 'v2.4.0-go1.22.10-bookworm.0' + IMAGE_VERSION: 'v2.4.0-go1.22.11-bookworm.0' GO_MAJOR_VERSION: '1.22' OS_CODENAME: 'bookworm' REVISION: '0' - GO_VERSION: '1.22.10' + GO_VERSION: '1.22.11' DISTROLESS_IMAGE: 'static-debian12' diff --git a/images/releng/ci/variants.yaml b/images/releng/ci/variants.yaml index 026827c2522..cd210c1ea9b 100644 --- a/images/releng/ci/variants.yaml +++ b/images/releng/ci/variants.yaml @@ -6,16 +6,11 @@ variants: REVISION: '0' go1.23-bookworm: CONFIG: 'go1.23-bookworm' - GO_VERSION: '1.23.4' + GO_VERSION: '1.23.5' OS_CODENAME: 'bookworm' REVISION: '0' go1.22-bookworm: CONFIG: 'go1.22-bookworm' - GO_VERSION: '1.22.10' - OS_CODENAME: 'bookworm' - REVISION: '0' - go1.21-bookworm: - CONFIG: 'go1.21-bookworm' - GO_VERSION: '1.21.13' + GO_VERSION: '1.22.11' OS_CODENAME: 'bookworm' REVISION: '0'