From 678c4bc8d4756c1a1c9136afd8cbe6c88bc3f5e6 Mon Sep 17 00:00:00 2001 From: Charles Butler Date: Thu, 8 Jun 2017 09:25:58 -0500 Subject: [PATCH] Fixes 47182 This adds additional state guardsof the idle_status method, which will prevent it from being run until a worker has joined the relationship. Previous invocations may have some message artifacting, but will reach eventual consistency once a worker has joined. This prevents the polling loop from executing too soon, bloating the installation time by bare-minimum an additional 10 minutes. --- .../layers/kubernetes-master/reactive/kubernetes_master.py | 3 ++- 1 file changed, 2 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 226a12d7382..369eaaf4da3 100644 --- a/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py +++ b/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py @@ -284,7 +284,8 @@ def set_app_version(): hookenv.application_version_set(version.split(b' v')[-1].rstrip()) -@when('cdk-addons.configured') +@when('cdk-addons.configured', 'kube-api-endpoint.connected', + 'kube-control.connected') def idle_status(): ''' Signal at the end of the run that we are running. ''' if not all_kube_system_pods_running():