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

Merge pull request #56115 from m1093782566/ipset-image 

Automatic merge from submit-queue. 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 ipset in debian-iptables docker image

**What this PR does / why we need it**:

IPVS kube-proxy use ipset doing SNAT and packets filtering. Because IPVS kube-proxy is based on debian-iptables docker image, this PR installs ipset util in the image.

I believe I lost this change in #54219 somehow during code rebase.

**Which issue(s) this PR fixes**:
Fixes #56116

**Special notes for your reviewer**:

**Release note**:

```release-note
install ipset in debian-iptables docker image
```

/sig network

/kind bug

/area kube-proxy
pull/6/head
Kubernetes Submit Queue 2017-11-22 02:35:19 -08:00 committed by GitHub
parent bd8d8f4387 787a55bb67
commit 9f09c55e62
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/common.sh
View File

@ -85,7 +85,7 @@ readonly KUBE_CONTAINER_RSYNC_PORT=8730
# #
# $1 - server architecture # $1 - server architecture
kube::build::get_docker_wrapped_binaries() { kube::build::get_docker_wrapped_binaries() {
debian_iptables_version=v9 debian_iptables_version=v10
### If you change any of these lists, please also update DOCKERIZED_BINARIES ### If you change any of these lists, please also update DOCKERIZED_BINARIES
### in build/BUILD. ### in build/BUILD.
case $1 in case $1 in

3
build/debian-iptables/Dockerfile
View File

@ -22,4 +22,5 @@ RUN clean-install \
iptables \ iptables \
ebtables \ ebtables \
conntrack \ conntrack \
module-init-tools module-init-tools \
ipset

2
build/debian-iptables/Makefile
View File

@ -16,7 +16,7 @@
REGISTRY?="gcr.io/google-containers" REGISTRY?="gcr.io/google-containers"
IMAGE=debian-iptables IMAGE=debian-iptables
TAG=v9 TAG=v10
ARCH?=amd64 ARCH?=amd64
TEMP_DIR:=$(shell mktemp -d) TEMP_DIR:=$(shell mktemp -d)
QEMUVERSION=v2.9.1 QEMUVERSION=v2.9.1

4
build/root/WORKSPACE
View File

@ -80,10 +80,10 @@ http_file(
docker_pull( docker_pull(
name = "debian-iptables-amd64", name = "debian-iptables-amd64",
digest = "sha256:efc1d8a37f141869b7e45fa4e153ebea11502ee3d0ac29b25cd94cb02a40a91c", digest = "sha256:a3b936c0fb98a934eecd2cfb91f73658d402b29116084e778ce9ddb68e55383e",
registry = "gcr.io", registry = "gcr.io",
repository = "google-containers/debian-iptables-amd64", repository = "google-containers/debian-iptables-amd64",
tag = "v9", # ignored, but kept here for documentation tag = "v10", # ignored, but kept here for documentation
) )
docker_pull( docker_pull(