Skip to content

Commit

Permalink
Merge pull request #3414 from cpanato/update-distroless
Browse files Browse the repository at this point in the history
update distroless iptables to use go1.21.6 and go1.20.13
  • Loading branch information
k8s-ci-robot authored Jan 10, 2024
2 parents 37a4736 + 9f5c4a3 commit 05f7fc8
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -442,15 +442,15 @@ 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-]+)*))?)
- 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"
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+
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.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
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.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'

0 comments on commit 05f7fc8

Please sign in to comment.