Merge pull request #47183 from chuckbutler/fix-time-wait-window-for-system-pods

Automatic merge from submit-queue Fixes 47182 **What this PR does / why we need it**: Adds some state guards to the idle_status message to speed up the deployment **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #47182 **Special notes for your reviewer**: This adds additional state guards of the idle_status method, which will prevent it from being run until a worker has joined the relationship. Previous invocations may have some messaging inconsistencies 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. **Release note**: ```release-note Added state guards to the idle_status messaging in the kubernetes-master charm to make deployment faster on initial deployment. ```

Merge pull request #47183 from chuckbutler/fix-time-wait-window-for-system-pods
88e1ecb4 · Kubernetes Submit Queue · GitHub · 9c1b2aa9 · 678c4bc8 · 88e1ecb4
Commit 88e1ecb4 authored Jun 08, 2017 by Kubernetes Submit Queue Committed by GitHub Jun 08, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

kubernetes_master.py ...ju/layers/kubernetes-master/reactive/kubernetes_master.py +2 -1

No files found.
--- 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():