From 409a8e1cafd7ec904f744f5950bfbd90a3b79e54 Mon Sep 17 00:00:00 2001 From: cpanato Date: Thu, 8 Feb 2024 14:15:18 +0100 Subject: [PATCH] build distroless-iptables using go1.22 Signed-off-by: cpanato --- dependencies.yaml | 12 ++++++------ images/build/distroless-iptables/Makefile | 4 ++-- images/build/distroless-iptables/variants.yaml | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index e6e7a4fe00f..93e2b7c7d9d 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -471,30 +471,30 @@ 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.0 + version: v0.5.1 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.22)" - version: v2.3.1-go1.22rc2-bookworm.0 + version: v2.3.1-go1.22-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.21)" version: v0.4.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.21)" version: v2.3.1-go1.21.7-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-]+)*))?)\' diff --git a/images/build/distroless-iptables/Makefile b/images/build/distroless-iptables/Makefile index 9284a78a5e4..6059ec74b1f 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.5 +IMAGE_VERSION ?= v0.5.1 CONFIG ?= distroless-bookworm BASEIMAGE ?= debian:bookworm-slim -GORUNNER_VERSION ?= v2.3.1-go1.21.7-bookworm.0 +GORUNNER_VERSION ?= v2.3.1-go1.22-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 215d0906891..b0b34a0d3aa 100644 --- a/images/build/distroless-iptables/variants.yaml +++ b/images/build/distroless-iptables/variants.yaml @@ -1,9 +1,9 @@ variants: distroless-bookworm-go1.22: CONFIG: 'distroless-bookworm' - IMAGE_VERSION: 'v0.5.0' + IMAGE_VERSION: 'v0.5.1' BASEIMAGE: 'debian:bookworm-slim' - GORUNNER_VERSION: 'v2.3.1-go1.22rc2-bookworm.0' + GORUNNER_VERSION: 'v2.3.1-go1.22-bookworm.0' distroless-bookworm-go1.21: CONFIG: 'distroless-bookworm' IMAGE_VERSION: 'v0.4.5'