Merge pull request #56176 from ixdy/debian-iptables-kmod

Automatic merge from submit-queue (batch tested with PRs 52049, 56176). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Install kmod instead of module-init-tools in iptables image **What this PR does / why we need it**: another bit of #52744 that was inadvertently missed. The debian-iptables image that was pushed already had this fix, but it got lost in rebase, I think. `module-init-tools` was an alias for `kmod` in debian:jessie, but debian:stretch removed the former. **Release note**: ```release-note NONE ```

Merge pull request #56176 from ixdy/debian-iptables-kmod
53776b5b · Kubernetes Submit Queue · GitHub · 04d1fcc9 · 91663920 · 53776b5b
Unverified Commit 53776b5b authored Nov 23, 2017 by Kubernetes Submit Queue Committed by GitHub Nov 23, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

Dockerfile build/debian-iptables/Dockerfile +4 -4

No files found.
--- a/build/debian-iptables/Dockerfile
+++ b/build/debian-iptables/Dockerfile
@@ -19,8 +19,8 @@ FROM BASEIMAGE
 CROSS_BUILD_COPY qemu-ARCH-static /usr/bin/

 RUN clean-install \
-    iptables \
-    ebtables \
    conntrack \
-    module-init-tools \
-    ipset
+    ebtables \
+    ipset \
+    iptables \
+    kmod