From f699701d7177a5aa8b0888c2106ee5d069a172c7 Mon Sep 17 00:00:00 2001 From: cpanato Date: Tue, 5 Mar 2024 21:26:16 -0500 Subject: [PATCH] bump distroless to use go1.22.1 and go1.21.8 Signed-off-by: cpanato --- dependencies.yaml | 21 ++++--------------- images/build/distroless-iptables/Makefile | 4 ++-- .../build/distroless-iptables/variants.yaml | 13 ++++-------- 3 files changed, 10 insertions(+), 28 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index d3a331c06ac..819fec5e785 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -443,7 +443,7 @@ 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.22)" - version: v0.5.1 + version: v0.5.2 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-]+)*))?) @@ -451,7 +451,7 @@ dependencies: 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.3.1-go1.22-bookworm.0 + version: v2.3.1-go1.22.1-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+ @@ -459,29 +459,16 @@ dependencies: 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.21)" - version: v0.4.5 + version: v0.4.6 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.21)" - version: v2.3.1-go1.21.7-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.20)" - version: v0.2.10 - 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.20)" - version: v2.3.1-go1.20.14-bullseye.0 + version: v2.3.1-go1.21.8-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/setcap" version: bookworm-v1.0.1 diff --git a/images/build/distroless-iptables/Makefile b/images/build/distroless-iptables/Makefile index 6059ec74b1f..afa4215e3ba 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.5.1 +IMAGE_VERSION ?= v0.5.2 CONFIG ?= distroless-bookworm BASEIMAGE ?= debian:bookworm-slim -GORUNNER_VERSION ?= v2.3.1-go1.22-bookworm.0 +GORUNNER_VERSION ?= v2.3.1-go1.22.1-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 b0b34a0d3aa..cfdae0c4e7c 100644 --- a/images/build/distroless-iptables/variants.yaml +++ b/images/build/distroless-iptables/variants.yaml @@ -1,16 +1,11 @@ variants: distroless-bookworm-go1.22: CONFIG: 'distroless-bookworm' - IMAGE_VERSION: 'v0.5.1' + IMAGE_VERSION: 'v0.5.2' BASEIMAGE: 'debian:bookworm-slim' - GORUNNER_VERSION: 'v2.3.1-go1.22-bookworm.0' + GORUNNER_VERSION: 'v2.3.1-go1.22.1-bookworm.0' distroless-bookworm-go1.21: CONFIG: 'distroless-bookworm' - IMAGE_VERSION: 'v0.4.5' + IMAGE_VERSION: 'v0.4.6' BASEIMAGE: 'debian:bookworm-slim' - GORUNNER_VERSION: 'v2.3.1-go1.21.7-bookworm.0' - distroless-bullseye-go1.20: - CONFIG: 'distroless-bullseye' - IMAGE_VERSION: 'v0.2.10' - BASEIMAGE: 'debian:bullseye-slim' - GORUNNER_VERSION: 'v2.3.1-go1.20.14-bullseye.0' + GORUNNER_VERSION: 'v2.3.1-go1.21.8-bookworm.0'