From 412467fe2780bba1dd4a0dd753ab76297b97c8c4 Mon Sep 17 00:00:00 2001
From: Prashanth Balasubramanian <beeps@google.com>
Date: Wed, 8 Jul 2015 14:54:04 -0700
Subject: [PATCH] Use the exec-sidecar as a healthz probe for the syndns
 container

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

diff --git a/cluster/addons/dns/skydns-rc.yaml.in b/cluster/addons/dns/skydns-rc.yaml.in
index 8f4e3ff1117..4cdc5c45e5a 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-v6
+  name: kube-dns-v7
   namespace: kube-system
   labels:
     k8s-app: kube-dns
-    version: v6
+    version: v7
     kubernetes.io/cluster-service: "true"
 spec:
   replicas: {{ pillar['dns_replicas'] }}
   selector:
     k8s-app: kube-dns
-    version: v6
+    version: v7
   template:
     metadata:
       labels:
         k8s-app: kube-dns
-        version: v6
+        version: v7
         kubernetes.io/cluster-service: "true"
     spec:
       containers:
@@ -61,4 +61,23 @@ spec:
         - containerPort: 53
           name: dns-tcp
           protocol: TCP
+        livenessProbe:
+          httpGet:
+            path: /healthz
+            port: 8080
+            scheme: HTTP
+          initialDelaySeconds: 30
+          timeoutSeconds: 5
+      - name: healthz
+        image: gcr.io/google_containers/exechealthz:1.0
+        resources:
+          limits:
+            cpu: 10m
+            memory: 20Mi
+        args:
+        - -cmd=nslookup kubernetes.default.svc.{{ pillar['dns_domain'] }} localhost >/dev/null
+        - -port=8080
+        ports:
+        - containerPort: 8080
+          protocol: TCP
       dnsPolicy: Default  # Don't use cluster DNS.