From 1cdc3951890cf579c84a654c61823db20f264982 Mon Sep 17 00:00:00 2001 From: Carlos Panato Date: Thu, 4 Jun 2026 11:45:52 +0200 Subject: [PATCH] build kube-cross, go-runner, releng-ci with golang 1.26.4/1.25.11 Signed-off-by: Carlos Panato --- dependencies.yaml | 33 +++++++++++++++++++--------- images/build/cross/Makefile | 4 ++-- images/build/cross/variants.yaml | 25 ++++++++++++++------- images/build/go-runner/Makefile | 2 +- images/build/go-runner/variants.yaml | 8 +++---- images/releng/ci/variants.yaml | 4 ++-- 6 files changed, 49 insertions(+), 27 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index e22aa48101b..f5dd8d38479 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.26.3 + version: 1.26.4 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.25.10 + version: 1.25.11 refPaths: - path: images/build/cross/variants.yaml match: "GO_VERSION: '\\d+.\\d+(alpha|beta|rc)?\\.?(\\d+)?'" @@ -96,7 +96,7 @@ dependencies: # # Update after the stable marker has been updated to stable.0 - name: "Kubernetes version (stable.0)" - version: v1.36.0 + version: v1.37.0 refPaths: - path: images/build/cross/Makefile match: KUBERNETES_VERSION\ \?=\ v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?) @@ -105,7 +105,7 @@ dependencies: # Update after the stable marker has been updated to stable.0 - name: "Kubernetes version (next candidate.0)" - version: v1.36.0 + version: v1.37.0 refPaths: - path: images/build/cross/variants.yaml match: "KUBERNETES_VERSION: 'v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'" @@ -138,7 +138,7 @@ dependencies: - path: images/build/go-runner/VERSION - name: "registry.k8s.io/build-image/go-runner (go1.26-bookworm)" - version: v2.4.0-go1.26.3-bookworm.0 + version: v2.4.0-go1.26.4-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-]+)*))?) @@ -152,7 +152,7 @@ dependencies: match: REVISION:\ '\d+' - name: "registry.k8s.io/build-image/go-runner (go1.25-bookworm)" - version: v2.4.0-go1.25.10-bookworm.0 + version: v2.4.0-go1.25.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-]+)*))?) @@ -165,6 +165,19 @@ dependencies: - path: images/build/go-runner/variants.yaml match: REVISION:\ '\d+' + # kube-cross (Kubernetes v1.37) + - name: "registry.k8s.io/build-image/kube-cross: config variant (v1.37-go1.26)" + version: go1.26-bullseye + refPaths: + - path: images/build/cross/variants.yaml + match: "CONFIG: 'go\\d+.\\d+-bullseye'" + + - name: "registry.k8s.io/build-image/kube-cross (v1.37-go1.26)" + version: v1.37.0-go1.26.4-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-]+)*))?)'" + # kube-cross (Kubernetes v1.36) - name: "registry.k8s.io/build-image/kube-cross: config variant (v1.36-go1.26)" version: go1.26-bullseye @@ -173,7 +186,7 @@ dependencies: match: "CONFIG: 'go\\d+.\\d+-bullseye'" - name: "registry.k8s.io/build-image/kube-cross (v1.36-go1.26)" - version: v1.36.0-go1.26.3-bullseye.0 + version: v1.36.0-go1.26.4-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-]+)*))?)'" @@ -186,7 +199,7 @@ dependencies: match: "CONFIG: 'go\\d+.\\d+-bullseye'" - name: "registry.k8s.io/build-image/kube-cross (v1.35-go1.25)" - version: v1.35.0-go1.25.10-bullseye.0 + version: v1.35.0-go1.25.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-]+)*))?)'" @@ -207,7 +220,7 @@ dependencies: match: "CONFIG: 'go\\d+.\\d+-bullseye'" - name: "registry.k8s.io/build-image/kube-cross (v1.34-go1.25)" - version: v1.34.0-go1.25.10-bullseye.0 + version: v1.34.0-go1.25.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-]+)*))?)'" @@ -223,7 +236,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.25)" - version: v1.33.0-go1.25.10-bullseye.0 + version: v1.33.0-go1.25.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 54ba4673ccf..887dbafe1df 100644 --- a/images/build/cross/Makefile +++ b/images/build/cross/Makefile @@ -27,8 +27,8 @@ IMGNAME = kube-cross # Example: # - v1.100.0-go1.17-bullseye.0 satisfies SemVer regex, while: # - v1.100-go1.17-bullseye.0 does not -KUBERNETES_VERSION ?= v1.36.0 -GO_VERSION ?= 1.26.3 +KUBERNETES_VERSION ?= v1.37.0 +GO_VERSION ?= 1.26.4 GO_MAJOR_VERSION ?= 1.26 OS_CODENAME ?= bullseye REVISION ?= 0 diff --git a/images/build/cross/variants.yaml b/images/build/cross/variants.yaml index 9339152eada..a8129c09563 100644 --- a/images/build/cross/variants.yaml +++ b/images/build/cross/variants.yaml @@ -1,37 +1,46 @@ variants: + v1.37-go1.26-bullseye: + CONFIG: 'go1.26-bullseye' + TYPE: 'default' + IMAGE_VERSION: 'v1.37.0-go1.26.4-bullseye.0' + KUBERNETES_VERSION: 'v1.37.0' + GO_VERSION: '1.26.4' + GO_MAJOR_VERSION: '1.26' + OS_CODENAME: 'bullseye' + REVISION: '0' v1.36-go1.26-bullseye: CONFIG: 'go1.26-bullseye' TYPE: 'default' - IMAGE_VERSION: 'v1.36.0-go1.26.3-bullseye.0' + IMAGE_VERSION: 'v1.36.0-go1.26.4-bullseye.0' KUBERNETES_VERSION: 'v1.36.0' - GO_VERSION: '1.26.3' + GO_VERSION: '1.26.4' GO_MAJOR_VERSION: '1.26' OS_CODENAME: 'bullseye' REVISION: '0' v1.35-go1.25-bullseye: CONFIG: 'go1.25-bullseye' TYPE: 'default' - IMAGE_VERSION: 'v1.35.0-go1.25.10-bullseye.0' + IMAGE_VERSION: 'v1.35.0-go1.25.11-bullseye.0' KUBERNETES_VERSION: 'v1.35.0' - GO_VERSION: '1.25.10' + GO_VERSION: '1.25.11' GO_MAJOR_VERSION: '1.25' OS_CODENAME: 'bullseye' REVISION: '0' v1.34-go1.25-bullseye: CONFIG: 'go1.25-bullseye' TYPE: 'default' - IMAGE_VERSION: 'v1.34.0-go1.25.10-bullseye.0' + IMAGE_VERSION: 'v1.34.0-go1.25.11-bullseye.0' KUBERNETES_VERSION: 'v1.34.0' - GO_VERSION: '1.25.10' + GO_VERSION: '1.25.11' GO_MAJOR_VERSION: '1.25' OS_CODENAME: 'bullseye' REVISION: '0' v1.33-go1.25-bullseye: CONFIG: 'go1.25-bullseye' TYPE: 'default' - IMAGE_VERSION: 'v1.33.0-go1.25.10-bullseye.0' + IMAGE_VERSION: 'v1.33.0-go1.25.11-bullseye.0' KUBERNETES_VERSION: 'v1.33.0' - GO_VERSION: '1.25.10' + GO_VERSION: '1.25.11' GO_MAJOR_VERSION: '1.25' OS_CODENAME: 'bullseye' REVISION: '0' diff --git a/images/build/go-runner/Makefile b/images/build/go-runner/Makefile index 8a24d0f59b6..193e9af5026 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.26 REVISION ?= 0 -GO_VERSION ?= 1.26.3 +GO_VERSION ?= 1.26.4 OS_CODENAME ?= bookworm-slim # Build args diff --git a/images/build/go-runner/variants.yaml b/images/build/go-runner/variants.yaml index 6de29eee507..006a4e0b74a 100644 --- a/images/build/go-runner/variants.yaml +++ b/images/build/go-runner/variants.yaml @@ -1,17 +1,17 @@ variants: go1.26-bookworm: CONFIG: 'go1.26-bookworm' - IMAGE_VERSION: 'v2.4.0-go1.26.3-bookworm.0' + IMAGE_VERSION: 'v2.4.0-go1.26.4-bookworm.0' GO_MAJOR_VERSION: '1.26' OS_CODENAME: 'bookworm' REVISION: '0' - GO_VERSION: '1.26.3' + GO_VERSION: '1.26.4' DISTROLESS_IMAGE: 'static-debian12' go1.25-bookworm: CONFIG: 'go1.25-bookworm' - IMAGE_VERSION: 'v2.4.0-go1.25.10-bookworm.0' + IMAGE_VERSION: 'v2.4.0-go1.25.11-bookworm.0' GO_MAJOR_VERSION: '1.25' OS_CODENAME: 'bookworm' REVISION: '0' - GO_VERSION: '1.25.10' + GO_VERSION: '1.25.11' DISTROLESS_IMAGE: 'static-debian12' diff --git a/images/releng/ci/variants.yaml b/images/releng/ci/variants.yaml index eaeb1883a76..90c23af802b 100644 --- a/images/releng/ci/variants.yaml +++ b/images/releng/ci/variants.yaml @@ -1,11 +1,11 @@ variants: go1.26-trixie: CONFIG: 'go1.26-trixie' - GO_VERSION: '1.26.3' + GO_VERSION: '1.26.4' OS_CODENAME: 'trixie' REVISION: '0' go1.25-trixie: CONFIG: 'go1.25-trixie' - GO_VERSION: '1.25.10' + GO_VERSION: '1.25.11' OS_CODENAME: 'trixie' REVISION: '0'