From d1ab6a110adb4de39b3192ba2a44039d87e71b49 Mon Sep 17 00:00:00 2001 From: George Kraft Date: Tue, 13 Feb 2018 14:04:18 -0600 Subject: [PATCH] juju: Fix broken ingress after upgrade-charm --- .../layers/kubernetes-worker/reactive/kubernetes_worker.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py b/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py index 6c6ee98dae8..86305b70a4b 100644 --- a/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py +++ b/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py @@ -953,15 +953,14 @@ def catch_change_in_creds(kube_control): """Request a service restart in case credential updates were detected.""" nodeuser = 'system:node:{}'.format(get_node_name().lower()) creds = kube_control.get_auth_credentials(nodeuser) - if creds \ - and data_changed('kube-control.creds', creds) \ - and creds['user'] == nodeuser: + if creds and creds['user'] == nodeuser: # We need to cache the credentials here because if the # master changes (master leader dies and replaced by a new one) # the new master will have no recollection of our certs. db.set('credentials', creds) set_state('worker.auth.bootstrapped') - set_state('kubernetes-worker.restart-needed') + if data_changed('kube-control.creds', creds): + set_state('kubernetes-worker.restart-needed') @when_not('kube-control.connected')