From deb68518a2417677e9561aa39ac06901a064e05d Mon Sep 17 00:00:00 2001 From: Konstantinos Tsakalozos Date: Sat, 5 Aug 2017 01:03:23 +0300 Subject: [PATCH] Use new kube-control interface --- .../layers/kubernetes-worker/reactive/kubernetes_worker.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py b/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py index 60129618b7a..1aaa04b1399 100644 --- a/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py +++ b/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py @@ -838,9 +838,11 @@ def request_kubelet_and_proxy_credentials(kube_control): @when('kube-control.auth.available') def catch_change_in_creds(kube_control): """Request a service restart in case credential updates were detected.""" - creds = kube_control.get_auth_credentials() nodeuser = 'system:node:{}'.format(gethostname()) - if data_changed('kube-control.creds', creds) and creds['user'] == nodeuser: + creds = kube_control.get_auth_credentials(nodeuser) + if creds \ + and data_changed('kube-control.creds', creds) \ + and creds['user'] == nodeuser: db.set('credentials', creds) set_state('worker.auth.bootstrapped') set_state('kubernetes-worker.restart-needed')