github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 21:47:07 +00:00
Code Issues Projects Releases Wiki Activity

juju: Fix broken ingress after upgrade-charm

Browse Source
This commit is contained in:
George Kraft 2018-02-13 14:04:18 -06:00
parent 2cd6cd6e86
commit d1ab6a110a
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py
View File

@ -953,14 +953,13 @@ def catch_change_in_creds(kube_control):
"""Request a service restart in case credential updates were detected.""" """Request a service restart in case credential updates were detected."""
nodeuser = 'system:node:{}'.format(get_node_name().lower()) nodeuser = 'system:node:{}'.format(get_node_name().lower())
creds = kube_control.get_auth_credentials(nodeuser) creds = kube_control.get_auth_credentials(nodeuser)
if creds \ if creds and creds['user'] == nodeuser:
and data_changed('kube-control.creds', creds) \
and creds['user'] == nodeuser:
# We need to cache the credentials here because if the # We need to cache the credentials here because if the
# master changes (master leader dies and replaced by a new one) # master changes (master leader dies and replaced by a new one)
# the new master will have no recollection of our certs. # the new master will have no recollection of our certs.
db.set('credentials', creds) db.set('credentials', creds)
set_state('worker.auth.bootstrapped') set_state('worker.auth.bootstrapped')
if data_changed('kube-control.creds', creds):
set_state('kubernetes-worker.restart-needed') set_state('kubernetes-worker.restart-needed')