github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
```
pull/6/head
Kubernetes Submit Queue 2017-11-23 13:07:22 -08:00 committed by GitHub
parent 04d1fcc9f3 9166392029
commit 53776b5b93
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build/debian-iptables/Dockerfile
View File

@ -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