Merge pull request #58756 from wwwtyro/rye/check-config-created

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Ensure config has been created before attempting to launch ingress. **What this PR does / why we need it**: Ensure config has been created before attempting to launch ingress. **Release note**: ```release-note Ensure config has been created before attempting to launch ingress. ```

Merge pull request #58756 from wwwtyro/rye/check-config-created
2e4947ec · Kubernetes Submit Queue · GitHub · a5c46303 · 154caf6a · 2e4947ec
Unverified Commit 2e4947ec authored Jan 24, 2018 by Kubernetes Submit Queue Committed by GitHub Jan 24, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

kubernetes_worker.py ...ju/layers/kubernetes-worker/reactive/kubernetes_worker.py +1 -0

No files found.
--- a/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py
+++ b/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py
@@ -645,6 +645,7 @@ def create_kubeconfig(kubeconfig, server, ca, key=None, certificate=None,

 @when_any('config.changed.default-backend-image',
          'config.changed.nginx-image')
+@when('kubernetes-worker.config.created')
 def launch_default_ingress_controller():
    ''' Launch the Kubernetes ingress controller & default backend (404) '''
    config = hookenv.config()