From 787a55bb67ccd2da14aa6e7f91289c859beecb5f Mon Sep 17 00:00:00 2001
From: m1093782566 <dujun5@huawei.com>
Date: Tue, 21 Nov 2017 09:32:50 +0800
Subject: [PATCH] install ipset in debian-iptables docker image and bump tag to
 v10

---
 build/common.sh                  | 2 +-
 build/debian-iptables/Dockerfile | 3 ++-
 build/debian-iptables/Makefile   | 2 +-
 build/root/WORKSPACE             | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/build/common.sh b/build/common.sh
index ecb74f4f277..8f8254ca228 100755
--- 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
diff --git a/build/debian-iptables/Dockerfile b/build/debian-iptables/Dockerfile
index 8b1f7b5f76c..4ed6473c377 100644
--- 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
diff --git a/build/debian-iptables/Makefile b/build/debian-iptables/Makefile
index e1e98d0ae41..1cc75edf17a 100644
--- 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
diff --git a/build/root/WORKSPACE b/build/root/WORKSPACE
index 82115493caa..d0dddf7e21e 100644
--- 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(