Merge pull request #8181 from thockin/dns-health

Fix DNS health check
2015-05-13 13:08:37 -07:00 · 2015-05-13 13:08:37 -07:00 · d114945b90
parent 9aa9260295 ab30484a4f
commit d114945b90
1 changed files with 3 additions and 6 deletions
--- a/cluster/addons/dns/skydns-rc.yaml.in
+++ b/cluster/addons/dns/skydns-rc.yaml.in
@ -54,12 +54,9 @@ spec:
        livenessProbe:
          exec:
            command:
-            - "/bin/sh"
-            - "-c"
-            # The health check succeeds by virtue of not hanging. It'd be nice
-            # to also check local services are known, but if that's broken then
-            # etcd or kube2sky has to be restarted, not skydns.
-            - "nslookup foobar 127.0.0.1 &> /dev/null; echo ok"
+            - /bin/sh
+            - -c
+            - nslookup kubernetes.default.{{ pillar['dns_domain'] }} localhost >/dev/null"
          initialDelaySeconds: 30
          timeoutSeconds: 5
      dnsPolicy: Default  # Don't use cluster DNS.