Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump distroless to use go1.22.2 and go1.21.9 #3554

Merged
merged 1 commit into from
Apr 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -416,29 +416,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.22)"
version: v0.5.2
version: v0.5.3
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.22.1-bookworm.0
version: v2.3.1-go1.22.2-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.6
version: v0.4.7
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.21)"
version: v2.3.1-go1.21.8-bookworm.0
version: v2.3.1-go1.21.9-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.5.2
IMAGE_VERSION ?= v0.5.3
CONFIG ?= distroless-bookworm
BASEIMAGE ?= debian:bookworm-slim
GORUNNER_VERSION ?= v2.3.1-go1.22.1-bookworm.0
GORUNNER_VERSION ?= v2.3.1-go1.22.2-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.22:
CONFIG: 'distroless-bookworm'
IMAGE_VERSION: 'v0.5.2'
IMAGE_VERSION: 'v0.5.3'
BASEIMAGE: 'debian:bookworm-slim'
GORUNNER_VERSION: 'v2.3.1-go1.22.1-bookworm.0'
GORUNNER_VERSION: 'v2.3.1-go1.22.2-bookworm.0'
distroless-bookworm-go1.21:
CONFIG: 'distroless-bookworm'
IMAGE_VERSION: 'v0.4.6'
IMAGE_VERSION: 'v0.4.7'
BASEIMAGE: 'debian:bookworm-slim'
GORUNNER_VERSION: 'v2.3.1-go1.21.8-bookworm.0'
GORUNNER_VERSION: 'v2.3.1-go1.21.9-bookworm.0'