From 4f947ce8ed0279dc6e6414ef5560277cb513d711 Mon Sep 17 00:00:00 2001
From: Dawn Chen <dawnchen@google.com>
Date: Tue, 7 Jul 2015 16:05:32 -0700
Subject: [PATCH 1/2] Disable liveness for dns due to #10659

---
 cluster/addons/dns/skydns-rc.yaml.in | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/cluster/addons/dns/skydns-rc.yaml.in b/cluster/addons/dns/skydns-rc.yaml.in
index 174ea5a77b..1a6bacac2e 100644
--- a/cluster/addons/dns/skydns-rc.yaml.in
+++ b/cluster/addons/dns/skydns-rc.yaml.in
@@ -61,12 +61,4 @@ spec:
         - containerPort: 53
           name: dns-tcp
           protocol: TCP
-        livenessProbe:
-          exec:
-            command:
-            - /bin/sh
-            - -c
-            - nslookup kubernetes.default.svc.{{ pillar['dns_domain'] }} localhost >/dev/null
-          initialDelaySeconds: 30
-          timeoutSeconds: 5
       dnsPolicy: Default  # Don't use cluster DNS.

From c6a0fd1eaf7c644e9e607dd3e113f0ef98e7cabf Mon Sep 17 00:00:00 2001
From: Dawn Chen <dawnchen@google.com>
Date: Tue, 7 Jul 2015 16:29:27 -0700
Subject: [PATCH 2/2] Upgrade to v6 from v5

---
 cluster/addons/dns/skydns-rc.yaml.in | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/cluster/addons/dns/skydns-rc.yaml.in b/cluster/addons/dns/skydns-rc.yaml.in
index 1a6bacac2e..8f4e3ff111 100644
--- a/cluster/addons/dns/skydns-rc.yaml.in
+++ b/cluster/addons/dns/skydns-rc.yaml.in
@@ -1,22 +1,22 @@
 apiVersion: v1
 kind: ReplicationController
 metadata:
-  name: kube-dns-v5
+  name: kube-dns-v6
   namespace: kube-system
   labels:
     k8s-app: kube-dns
-    version: v5
+    version: v6
     kubernetes.io/cluster-service: "true"
 spec:
   replicas: {{ pillar['dns_replicas'] }}
   selector:
     k8s-app: kube-dns
-    version: v5
+    version: v6
   template:
     metadata:
       labels:
         k8s-app: kube-dns
-        version: v5
+        version: v6
         kubernetes.io/cluster-service: "true"
     spec:
       containers: