github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 05:27:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #68764 from ixdy/debian-iptables-netbase

Browse Source 
Install netbase in debian-iptables and debian-hyperkube-base as it is needed by ipvs
This commit is contained in:
k8s-ci-robot 2018-09-17 20:38:52 -07:00 committed by GitHub
commit 247240ace4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build/debian-hyperkube-base/Dockerfile
View File

@ -38,6 +38,7 @@ RUN echo CACHEBUST>/dev/null && clean-install \
jq \ jq \
kmod \ kmod \
openssh-client \ openssh-client \
netbase \
nfs-common \ nfs-common \
socat \ socat \
udev \ udev \

2
build/debian-hyperkube-base/Makefile
View File

@ -19,7 +19,7 @@
REGISTRY?=staging-k8s.gcr.io REGISTRY?=staging-k8s.gcr.io
IMAGE?=debian-hyperkube-base IMAGE?=debian-hyperkube-base
TAG=0.10.1 TAG=0.10.2
ARCH?=amd64 ARCH?=amd64
CACHEBUST?=1 CACHEBUST?=1

3
build/debian-iptables/Dockerfile
View File

@ -19,4 +19,5 @@ RUN clean-install \
ebtables \ ebtables \
ipset \ ipset \
iptables \ iptables \
kmod kmod \
netbase

2
build/debian-iptables/Makefile
View File

@ -16,7 +16,7 @@
REGISTRY?="staging-k8s.gcr.io" REGISTRY?="staging-k8s.gcr.io"
IMAGE=debian-iptables IMAGE=debian-iptables
TAG?=v10.1 TAG?=v10.2
ARCH?=amd64 ARCH?=amd64
TEMP_DIR:=$(shell mktemp -d) TEMP_DIR:=$(shell mktemp -d)