From 1ade05f00e79f449bfd3922634a2be7ae3bf5474 Mon Sep 17 00:00:00 2001 From: cpanato Date: Wed, 10 Jan 2024 16:30:20 +0100 Subject: [PATCH 1/2] update distroless iptables to use go1.21.6 and go1.20.13 Signed-off-by: cpanato --- images/build/distroless-iptables/Makefile | 4 ++-- images/build/distroless-iptables/variants.yaml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/images/build/distroless-iptables/Makefile b/images/build/distroless-iptables/Makefile index 8cf5784df12..6c3b44c378a 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.4.3 +IMAGE_VERSION ?= v0.4.4 CONFIG ?= distroless-bookworm BASEIMAGE ?= debian:bookworm-slim -GORUNNER_VERSION ?= v2.3.1-go1.21.5-bookworm.0 +GORUNNER_VERSION ?= v2.3.1-go1.21.6-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 ed637553ff1..a4c7163302c 100644 --- a/images/build/distroless-iptables/variants.yaml +++ b/images/build/distroless-iptables/variants.yaml @@ -1,11 +1,11 @@ variants: distroless-bookworm-go1.21: CONFIG: 'distroless-bookworm' - IMAGE_VERSION: 'v0.4.3' + IMAGE_VERSION: 'v0.4.4' BASEIMAGE: 'debian:bookworm-slim' - GORUNNER_VERSION: 'v2.3.1-go1.21.5-bookworm.0' + GORUNNER_VERSION: 'v2.3.1-go1.21.6-bookworm.0' distroless-bullseye-go1.20: CONFIG: 'distroless-bullseye' - IMAGE_VERSION: 'v0.2.8' + IMAGE_VERSION: 'v0.2.9' BASEIMAGE: 'debian:bullseye-slim' - GORUNNER_VERSION: 'v2.3.1-go1.20.11-bullseye.0' + GORUNNER_VERSION: 'v2.3.1-go1.20.13-bullseye.0' From 9f5c4a32744c9a4dc7fcec4fc4e8dbf656608a2b Mon Sep 17 00:00:00 2001 From: cpanato Date: Wed, 10 Jan 2024 16:52:26 +0100 Subject: [PATCH 2/2] fix deps Signed-off-by: cpanato --- dependencies.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index c47676f64de..0ab7b451eb5 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -442,7 +442,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" - version: v0.4.3 + version: v0.4.4 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-]+)*))?) @@ -450,7 +450,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" - version: v2.3.1-go1.21.5-bookworm.0 + version: v2.3.1-go1.21.6-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+