From 90a57931afe05c17a37212857244d75f171c1aea Mon Sep 17 00:00:00 2001 From: Konstantinos Tsakalozos Date: Tue, 27 Jun 2017 16:57:43 +0300 Subject: [PATCH] Skip errors when unregistering juju kubernetes-workers --- .../layers/kubernetes-worker/reactive/kubernetes_worker.py | 7 +++++-- 1 file changed, 5 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 97d6c8b8f0..b095692957 100644 --- a/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py +++ b/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py @@ -160,8 +160,11 @@ def shutdown(): - delete the current node - stop the worker services ''' - if os.path.isfile(kubeconfig_path): - kubectl('delete', 'node', gethostname()) + try: + if os.path.isfile(kubeconfig_path): + kubectl('delete', 'node', gethostname()) + except CalledProcessError: + hookenv.log('Failed to unregister node.') service_stop('snap.kubelet.daemon') service_stop('snap.kube-proxy.daemon')