From 10f9789bc3cf72551f53e2c16277a5f3b95ff72f Mon Sep 17 00:00:00 2001
From: Abhishek Shah <abshah@google.com>
Date: Mon, 23 May 2016 15:09:30 -0700
Subject: [PATCH] added dnsmasq container in kubedns pod

---
 build/kube-dns/Makefile                          |  2 +-
 .../saltbase/salt/kube-dns/kubedns-rc.yaml.in    | 16 +++++++++++++++-
 hack/verify-flags/known-flags.txt                |  1 +
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/build/kube-dns/Makefile b/build/kube-dns/Makefile
index 86b3a669e4d..e2fafb25d73 100644
--- a/build/kube-dns/Makefile
+++ b/build/kube-dns/Makefile
@@ -22,7 +22,7 @@
 # Default registry, arch and tag. This can be overwritten by arguments to make
 PLATFORM?=linux
 ARCH?=amd64
-TAG?=1.0
+TAG?=1.1
 REGISTRY?=gcr.io/google_containers
 
 GOLANG_VERSION=1.6
diff --git a/cluster/saltbase/salt/kube-dns/kubedns-rc.yaml.in b/cluster/saltbase/salt/kube-dns/kubedns-rc.yaml.in
index 985d1066e4e..65681d5a7c3 100644
--- a/cluster/saltbase/salt/kube-dns/kubedns-rc.yaml.in
+++ b/cluster/saltbase/salt/kube-dns/kubedns-rc.yaml.in
@@ -21,7 +21,7 @@ spec:
     spec:
       containers:
       - name: kubedns
-        image: gcr.io/google_containers/kubedns-amd64:1.0
+        image: gcr.io/google_containers/kubedns-amd64:1.1
         resources:
           # TODO: Set memory limits when we've profiled the container for large
           # clusters, then set request = limit to keep this container in
@@ -54,6 +54,20 @@ spec:
         args:
         # command = "/kube-dns"
         - --domain={{ pillar['dns_domain'] }}.
+        - --dns-port=10053
+        ports:
+        - containerPort: 10053
+          name: dns-local
+          protocol: UDP
+        - containerPort: 10053
+          name: dns-tcp-local
+          protocol: TCP
+      - name: dnsmasq
+        image: gcr.io/google_containers/dnsmasq:1.1
+        args:
+        - --cache-size=1000
+        - --no-resolv
+        - --server=127.0.0.1#10053
         ports:
         - containerPort: 53
           name: dns
diff --git a/hack/verify-flags/known-flags.txt b/hack/verify-flags/known-flags.txt
index 633f20a86e1..f7144fdb506 100644
--- a/hack/verify-flags/known-flags.txt
+++ b/hack/verify-flags/known-flags.txt
@@ -90,6 +90,7 @@ deployment-label-key
 deserialization-cache-size
 dest-file
 disable-filter
+dns-port
 docker-email
 docker-endpoint
 docker-exec-handler