Skip to content

Commit

Permalink
Add nftables binary to the distroless-iptables image
Browse files Browse the repository at this point in the history
  • Loading branch information
danwinship committed Oct 11, 2023
1 parent 7b12f3e commit 7127390
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -468,7 +468,7 @@ 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.3.3
version: v0.4.0
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-]+)*))?)
Expand Down
2 changes: 1 addition & 1 deletion images/build/distroless-iptables/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ REGISTRY?="gcr.io/k8s-staging-build-image"
IMAGE=$(REGISTRY)/distroless-iptables

TAG ?= $(shell git describe --tags --always --dirty)
IMAGE_VERSION ?= v0.3.3
IMAGE_VERSION ?= v0.4.0
CONFIG ?= distroless
BASEIMAGE ?= debian:bookworm-slim
GORUNNER_VERSION ?= v2.3.1-go1.21.2-bookworm.0
Expand Down
1 change: 1 addition & 0 deletions images/build/distroless-iptables/distroless/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ RUN apt -y update && \
ebtables \
ipset \
iptables \
nftables \
kmod && \
`# below binaries and dash are used by iptables-wrapper-installer.sh` \
/stage-binary-and-deps.sh "${STAGE_DIR}" /bin/dash \
Expand Down
2 changes: 1 addition & 1 deletion images/build/distroless-iptables/variants.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
variants:
distroless:
CONFIG: 'distroless'
IMAGE_VERSION: 'v0.3.3'
IMAGE_VERSION: 'v0.4.0'
GORUNNER_VERSION: 'v2.3.1-go1.21.2-bookworm.0'

0 comments on commit 7127390

Please sign in to comment.