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

Merge pull request #56115 from m1093782566/ipset-image
9f09c55e · Kubernetes Submit Queue · GitHub · bd8d8f43 · 787a55bb · 9f09c55e
Unverified Commit 9f09c55e authored Nov 22, 2017 by Kubernetes Submit Queue Committed by GitHub Nov 22, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 5 deletions

common.sh build/common.sh +1 -1

Dockerfile build/debian-iptables/Dockerfile +2 -1

Makefile build/debian-iptables/Makefile +1 -1

WORKSPACE build/root/WORKSPACE +2 -2

No files found.
--- a/build/common.sh
+++ b/build/common.sh
@@ -85,7 +85,7 @@ readonly KUBE_CONTAINER_RSYNC_PORT=8730
 #
 # $1 - server architecture
 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
  ### in build/BUILD.
  case $1 in

--- a/build/debian-iptables/Dockerfile
+++ b/build/debian-iptables/Dockerfile
@@ -22,4 +22,5 @@ RUN clean-install \
    iptables \
    ebtables \
    conntrack \
-    module-init-tools
+    module-init-tools \
+    ipset
--- a/build/debian-iptables/Makefile
+++ b/build/debian-iptables/Makefile
@@ -16,7 +16,7 @@
 REGISTRY?="gcr.io/google-containers"
 IMAGE=debian-iptables
-TAG=v9
+TAG=v10
 ARCH?=amd64
 TEMP_DIR:=$(shell mktemp -d)
 QEMUVERSION=v2.9.1

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