Skip to content

Commit 560c6e4

Browse files
authored
Merge pull request #4208 from cpanato/update-distroless
Bump distroless-iptables to use Go 1.25.5/1.24.11
2 parents 18b73b7 + 132d514 commit 560c6e4

File tree

3 files changed

+10
-27
lines changed

3 files changed

+10
-27
lines changed

dependencies.yaml

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -405,39 +405,27 @@ dependencies:
405405
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-]+)*))?)'"
406406

407407
- name: "registry.k8s.io/build-image/distroless-iptables (distroless-bookworm-go1.25)"
408-
version: v0.8.5
408+
version: v0.8.6
409409
refPaths:
410410
- path: images/build/distroless-iptables/Makefile
411411
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-]+)*))?)
412412
- path: images/build/distroless-iptables/variants.yaml
413413
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-]+)*))?)\'
414414

415415
- name: "registry.k8s.io/build-image/go-runner: dependents (distroless-bookworm-go1.25)"
416-
version: v2.4.0-go1.25.4-bookworm.0
416+
version: v2.4.0-go1.25.5-bookworm.0
417417
refPaths:
418418
- path: images/build/distroless-iptables/variants.yaml
419419
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-]+)*))?)\'
420420

421421
- name: "registry.k8s.io/build-image/distroless-iptables (distroless-bookworm-go1.24)"
422-
version: v0.7.12
422+
version: v0.7.13
423423
refPaths:
424424
- path: images/build/distroless-iptables/variants.yaml
425425
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-]+)*))?)\'
426426

427427
- name: "registry.k8s.io/build-image/go-runner: dependents (distroless-bookworm-go1.24)"
428-
version: v2.4.0-go1.24.10-bookworm.0
429-
refPaths:
430-
- path: images/build/distroless-iptables/variants.yaml
431-
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-]+)*))?)\'
432-
433-
- name: "registry.k8s.io/build-image/distroless-iptables (distroless-bookworm-go1.23)"
434-
version: v0.6.13
435-
refPaths:
436-
- path: images/build/distroless-iptables/variants.yaml
437-
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-]+)*))?)\'
438-
439-
- name: "registry.k8s.io/build-image/go-runner: dependents (distroless-bookworm-go1.23)"
440-
version: v2.4.0-go1.23.12-bookworm.0
428+
version: v2.4.0-go1.24.11-bookworm.0
441429
refPaths:
442430
- path: images/build/distroless-iptables/variants.yaml
443431
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-]+)*))?)\'

images/build/distroless-iptables/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ REGISTRY?="gcr.io/k8s-staging-build-image"
1818
IMAGE=$(REGISTRY)/distroless-iptables
1919

2020
TAG ?= $(shell git describe --tags --always --dirty)
21-
IMAGE_VERSION ?= v0.8.5
21+
IMAGE_VERSION ?= v0.8.6
2222
CONFIG ?= distroless-bookworm
2323
BASEIMAGE ?= debian:bookworm-slim
24-
GORUNNER_VERSION ?= v2.4.0-go1.25.4-bookworm.0
24+
GORUNNER_VERSION ?= v2.4.0-go1.25.5-bookworm.0
2525

2626
ARCH?=amd64
2727
ALL_ARCH = amd64 arm arm64 ppc64le s390x
Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,11 @@
11
variants:
22
distroless-bookworm-go1.25:
33
CONFIG: 'distroless-bookworm'
4-
IMAGE_VERSION: 'v0.8.5'
4+
IMAGE_VERSION: 'v0.8.6'
55
BASEIMAGE: 'debian:bookworm-slim'
6-
GORUNNER_VERSION: 'v2.4.0-go1.25.4-bookworm.0'
6+
GORUNNER_VERSION: 'v2.4.0-go1.25.5-bookworm.0'
77
distroless-bookworm-go1.24:
88
CONFIG: 'distroless-bookworm'
9-
IMAGE_VERSION: 'v0.7.12'
9+
IMAGE_VERSION: 'v0.7.13'
1010
BASEIMAGE: 'debian:bookworm-slim'
11-
GORUNNER_VERSION: 'v2.4.0-go1.24.10-bookworm.0'
12-
distroless-bookworm-go1.23:
13-
CONFIG: 'distroless-bookworm'
14-
IMAGE_VERSION: 'v0.6.13'
15-
BASEIMAGE: 'debian:bookworm-slim'
16-
GORUNNER_VERSION: 'v2.4.0-go1.23.12-bookworm.0'
11+
GORUNNER_VERSION: 'v2.4.0-go1.24.11-bookworm.0'

0 commit comments

Comments
 (0)