Skip to content

Commit

Permalink
debian-iptables: add go-runner to bullseye image
Browse files Browse the repository at this point in the history
kubernetes#2301 did the same for the buster
image, but Kubernetes master (= 1.23) uses the debian-iptables:bullseye-v1.0.0
image, so the same change is also needed there.
  • Loading branch information
pohly committed Nov 10, 2021
1 parent b7bf468 commit 4fc1d4c
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
6 changes: 6 additions & 0 deletions images/build/debian-iptables/bullseye/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
# limitations under the License.

ARG BASEIMAGE
ARG GORUNNERIMAGE

FROM ${BASEIMAGE} as build

Expand All @@ -38,5 +39,10 @@ RUN update-alternatives \
--slave /usr/sbin/ip6tables-restore ip6tables-restore /usr/sbin/iptables-wrapper \
--slave /usr/sbin/ip6tables-save ip6tables-save /usr/sbin/iptables-wrapper

# we're going to borrow the /go-runner binary in the final image
# dedupe this binary by just copying it from the go-runner image
FROM ${GORUNNERIMAGE} as gorunner

FROM scratch
COPY --from=build / /
COPY --from=gorunner /go-runner /go-runner
2 changes: 1 addition & 1 deletion images/build/debian-iptables/variants.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ variants:
# Debian 11 - Kubernetes 1.23 and newer
bullseye:
CONFIG: 'bullseye'
IMAGE_VERSION: 'bullseye-v1.0.0'
IMAGE_VERSION: 'bullseye-v1.1.0'
DEBIAN_BASE_VERSION: 'bullseye-v1.0.0'
# Debian 10 - Kubernetes 1.22 and older
buster:
Expand Down

0 comments on commit 4fc1d4c

Please sign in to comment.