Skip to content

Commit

Permalink
Merge pull request #3868 from cpanato/update-distroless-newgo
Browse files Browse the repository at this point in the history
bump distroless-iptables to use go1.22.10 and go1.23.4
  • Loading branch information
k8s-ci-robot authored Dec 23, 2024
2 parents 40170c4 + 3779b27 commit 804b75f
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
8 changes: 4 additions & 4 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -425,29 +425,29 @@ 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.23)"
version: v0.6.5
version: v0.6.6
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.3-bookworm.0
version: v2.4.0-go1.23.4-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.10
version: v0.5.11
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.9-bookworm.0
version: v2.4.0-go1.22.10-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-]+)*))?)\'
Expand Down
4 changes: 2 additions & 2 deletions images/build/distroless-iptables/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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.5
IMAGE_VERSION ?= v0.6.6
CONFIG ?= distroless-bookworm
BASEIMAGE ?= debian:bookworm-slim
GORUNNER_VERSION ?= v2.4.0-go1.23.3-bookworm.0
GORUNNER_VERSION ?= v2.4.0-go1.23.4-bookworm.0

ARCH?=amd64
ALL_ARCH = amd64 arm arm64 ppc64le s390x
Expand Down
8 changes: 4 additions & 4 deletions images/build/distroless-iptables/variants.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
variants:
distroless-bookworm-go1.23:
CONFIG: 'distroless-bookworm'
IMAGE_VERSION: 'v0.6.5'
IMAGE_VERSION: 'v0.6.6'
BASEIMAGE: 'debian:bookworm-slim'
GORUNNER_VERSION: 'v2.4.0-go1.23.3-bookworm.0'
GORUNNER_VERSION: 'v2.4.0-go1.23.4-bookworm.0'
distroless-bookworm-go1.22:
CONFIG: 'distroless-bookworm'
IMAGE_VERSION: 'v0.5.10'
IMAGE_VERSION: 'v0.5.11'
BASEIMAGE: 'debian:bookworm-slim'
GORUNNER_VERSION: 'v2.4.0-go1.22.9-bookworm.0'
GORUNNER_VERSION: 'v2.4.0-go1.22.10-bookworm.0'

0 comments on commit 804b75f

Please sign in to comment.