From ab30484a4fb010e2923ba84d81ff99525dc9a33b Mon Sep 17 00:00:00 2001 From: Tim Hockin Date: Wed, 13 May 2015 08:51:06 -0700 Subject: [PATCH] Fix DNS health check --- cluster/addons/dns/skydns-rc.yaml.in | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/cluster/addons/dns/skydns-rc.yaml.in b/cluster/addons/dns/skydns-rc.yaml.in index 072162d1dea..9c7ee660e51 100644 --- 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.