From 23c81bb3d45f6a7c324a72a6054ec5255d299c38 Mon Sep 17 00:00:00 2001 From: Rye Terrell Date: Mon, 18 Dec 2017 09:28:03 -0600 Subject: [PATCH] wait for kubedns to be ready --- .../kubernetes-master/reactive/kubernetes_master.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py b/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py index 5736e938110..d7ca9beed86 100644 --- a/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py +++ b/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py @@ -440,7 +440,13 @@ def send_cluster_dns_detail(kube_control): ''' Send cluster DNS info ''' enableKubeDNS = hookenv.config('enable-kube-dns') dnsDomain = hookenv.config('dns_domain') - dns_ip = None if not enableKubeDNS else get_dns_ip() + dns_ip = None + if enableKubeDNS: + try: + dns_ip = get_dns_ip() + except CalledProcessError: + hookenv.log("kubedns not ready yet") + return kube_control.set_dns(53, dnsDomain, dns_ip, enableKubeDNS)