From 44ca220f328f6569c13eb19f060f5b556bdb49f5 Mon Sep 17 00:00:00 2001
From: Prashanth Balasubramanian <beeps@google.com>
Date: Fri, 3 Jun 2016 16:01:28 -0700
Subject: [PATCH] Bump kube-dns image

---
 build/kube-dns/Changelog                           |  3 +++
 build/kube-dns/Makefile                            |  2 +-
 cluster/saltbase/salt/kube-dns/skydns-rc.yaml.base | 10 +++++-----
 cluster/saltbase/salt/kube-dns/skydns-rc.yaml.in   | 10 +++++-----
 cluster/saltbase/salt/kube-dns/skydns-rc.yaml.sed  | 10 +++++-----
 5 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/build/kube-dns/Changelog b/build/kube-dns/Changelog
index 48f268af6c..020953e1dd 100644
--- a/build/kube-dns/Changelog
+++ b/build/kube-dns/Changelog
@@ -1,2 +1,5 @@
 ## Version 1.2 (Fri May 27 2016 Tim Hockin <thockin@google.com>)
  - First Changelog entry
+
+ ## Version 1.3 (Fri June 3 2016 Prashanth.B <beeps@google.com>)
+ - Fixed SRV record lookup (issue #26116)
diff --git a/build/kube-dns/Makefile b/build/kube-dns/Makefile
index 806d88c33a..204d03e83f 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.2
+TAG?=1.3
 REGISTRY?=gcr.io/google_containers
 
 GOLANG_VERSION=1.6
diff --git a/cluster/saltbase/salt/kube-dns/skydns-rc.yaml.base b/cluster/saltbase/salt/kube-dns/skydns-rc.yaml.base
index e355feb88e..1fd13d483b 100644
--- a/cluster/saltbase/salt/kube-dns/skydns-rc.yaml.base
+++ b/cluster/saltbase/salt/kube-dns/skydns-rc.yaml.base
@@ -21,27 +21,27 @@
 apiVersion: v1
 kind: ReplicationController
 metadata:
-  name: kube-dns-v13
+  name: kube-dns-v14
   namespace: kube-system
   labels:
     k8s-app: kube-dns
-    version: v13
+    version: v14
     kubernetes.io/cluster-service: "true"
 spec:
   replicas: __PILLAR__DNS__REPLICAS__
   selector:
     k8s-app: kube-dns
-    version: v13
+    version: v14
   template:
     metadata:
       labels:
         k8s-app: kube-dns
-        version: v13
+        version: v14
         kubernetes.io/cluster-service: "true"
     spec:
       containers:
       - name: kubedns
-        image: gcr.io/google_containers/kubedns-amd64:1.2
+        image: gcr.io/google_containers/kubedns-amd64:1.3
         resources:
           # TODO: Set memory limits when we've profiled the container for large
           # clusters, then set request = limit to keep this container in
diff --git a/cluster/saltbase/salt/kube-dns/skydns-rc.yaml.in b/cluster/saltbase/salt/kube-dns/skydns-rc.yaml.in
index 0c8d45bdfc..8d831925cf 100644
--- a/cluster/saltbase/salt/kube-dns/skydns-rc.yaml.in
+++ b/cluster/saltbase/salt/kube-dns/skydns-rc.yaml.in
@@ -21,27 +21,27 @@
 apiVersion: v1
 kind: ReplicationController
 metadata:
-  name: kube-dns-v13
+  name: kube-dns-v14
   namespace: kube-system
   labels:
     k8s-app: kube-dns
-    version: v13
+    version: v14
     kubernetes.io/cluster-service: "true"
 spec:
   replicas: {{ pillar['dns_replicas'] }}
   selector:
     k8s-app: kube-dns
-    version: v13
+    version: v14
   template:
     metadata:
       labels:
         k8s-app: kube-dns
-        version: v13
+        version: v14
         kubernetes.io/cluster-service: "true"
     spec:
       containers:
       - name: kubedns
-        image: gcr.io/google_containers/kubedns-amd64:1.2
+        image: gcr.io/google_containers/kubedns-amd64:1.3
         resources:
           # TODO: Set memory limits when we've profiled the container for large
           # clusters, then set request = limit to keep this container in
diff --git a/cluster/saltbase/salt/kube-dns/skydns-rc.yaml.sed b/cluster/saltbase/salt/kube-dns/skydns-rc.yaml.sed
index fc58a58d99..066f453d62 100644
--- a/cluster/saltbase/salt/kube-dns/skydns-rc.yaml.sed
+++ b/cluster/saltbase/salt/kube-dns/skydns-rc.yaml.sed
@@ -21,27 +21,27 @@
 apiVersion: v1
 kind: ReplicationController
 metadata:
-  name: kube-dns-v13
+  name: kube-dns-v14
   namespace: kube-system
   labels:
     k8s-app: kube-dns
-    version: v13
+    version: v14
     kubernetes.io/cluster-service: "true"
 spec:
   replicas: $DNS_REPLICAS
   selector:
     k8s-app: kube-dns
-    version: v13
+    version: v14
   template:
     metadata:
       labels:
         k8s-app: kube-dns
-        version: v13
+        version: v14
         kubernetes.io/cluster-service: "true"
     spec:
       containers:
       - name: kubedns
-        image: gcr.io/google_containers/kubedns-amd64:1.2
+        image: gcr.io/google_containers/kubedns-amd64:1.3
         resources:
           # TODO: Set memory limits when we've profiled the container for large
           # clusters, then set request = limit to keep this container in