From 305f70d1866b6f2f4e43fa71597cde7fc58f843a Mon Sep 17 00:00:00 2001 From: Carlos Panato Date: Wed, 21 May 2025 08:50:36 -0400 Subject: [PATCH] Bump distroless-iptables to use Go 1.23.9 and 1.24.3 Signed-off-by: Carlos Panato --- dependencies.yaml | 26 +++++-------------- images/build/distroless-iptables/Makefile | 4 +-- .../build/distroless-iptables/variants.yaml | 13 +++------- 3 files changed, 12 insertions(+), 31 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 1c1df1d00b1..fb053670c4b 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -434,41 +434,27 @@ dependencies: match: "DEBIAN_BASE_VERSION: 'bookworm-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/distroless-iptables (distroless-bookworm-go1.24)" - version: v0.7.4 + version: v0.7.5 refPaths: + - path: images/build/distroless-iptables/Makefile + 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-]+)*))?) - path: images/build/distroless-iptables/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/go-runner: dependents (distroless-bookworm-go1.24)" - version: v2.4.0-go1.24.2-bookworm.0 + version: v2.4.0-go1.24.3-bookworm.0 refPaths: - path: images/build/distroless-iptables/variants.yaml match: GORUNNER_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/distroless-iptables (distroless-bookworm-go1.23)" - version: v0.6.9 + version: v0.6.10 refPaths: - - path: images/build/distroless-iptables/Makefile - 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-]+)*))?) - path: images/build/distroless-iptables/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/go-runner: dependents (distroless-bookworm-go1.23)" - version: v2.4.0-go1.23.8-bookworm.0 - refPaths: - - path: images/build/distroless-iptables/Makefile - match: GORUNNER_VERSION \?= v\d+\.\d+\.\d+-go\d+.\d+(alpha|beta|rc)?\.?(\d+)?-bookworm\.\d+ - - path: images/build/distroless-iptables/variants.yaml - match: GORUNNER_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/distroless-iptables (distroless-bookworm-go1.22)" - version: v0.5.13 - refPaths: - - path: images/build/distroless-iptables/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/go-runner: dependents (distroless-bookworm-go1.22)" - version: v2.4.0-go1.22.12-bookworm.0 + version: v2.4.0-go1.23.9-bookworm.0 refPaths: - path: images/build/distroless-iptables/variants.yaml match: GORUNNER_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/distroless-iptables/Makefile b/images/build/distroless-iptables/Makefile index bae06cf8ea2..dec083530e1 100644 --- a/images/build/distroless-iptables/Makefile +++ b/images/build/distroless-iptables/Makefile @@ -18,10 +18,10 @@ REGISTRY?="gcr.io/k8s-staging-build-image" IMAGE=$(REGISTRY)/distroless-iptables TAG ?= $(shell git describe --tags --always --dirty) -IMAGE_VERSION ?= v0.6.9 +IMAGE_VERSION ?= v0.7.5 CONFIG ?= distroless-bookworm BASEIMAGE ?= debian:bookworm-slim -GORUNNER_VERSION ?= v2.4.0-go1.23.8-bookworm.0 +GORUNNER_VERSION ?= v2.4.0-go1.24.3-bookworm.0 ARCH?=amd64 ALL_ARCH = amd64 arm arm64 ppc64le s390x diff --git a/images/build/distroless-iptables/variants.yaml b/images/build/distroless-iptables/variants.yaml index 7760abac014..c22314a512f 100644 --- a/images/build/distroless-iptables/variants.yaml +++ b/images/build/distroless-iptables/variants.yaml @@ -1,16 +1,11 @@ variants: distroless-bookworm-go1.24: CONFIG: 'distroless-bookworm' - IMAGE_VERSION: 'v0.7.4' + IMAGE_VERSION: 'v0.7.5' BASEIMAGE: 'debian:bookworm-slim' - GORUNNER_VERSION: 'v2.4.0-go1.24.2-bookworm.0' + GORUNNER_VERSION: 'v2.4.0-go1.24.3-bookworm.0' distroless-bookworm-go1.23: CONFIG: 'distroless-bookworm' - IMAGE_VERSION: 'v0.6.9' + IMAGE_VERSION: 'v0.6.10' BASEIMAGE: 'debian:bookworm-slim' - GORUNNER_VERSION: 'v2.4.0-go1.23.8-bookworm.0' - distroless-bookworm-go1.22: - CONFIG: 'distroless-bookworm' - IMAGE_VERSION: 'v0.5.13' - BASEIMAGE: 'debian:bookworm-slim' - GORUNNER_VERSION: 'v2.4.0-go1.22.12-bookworm.0' + GORUNNER_VERSION: 'v2.4.0-go1.23.9-bookworm.0'