From 806759cfc9e3c4888815eccd9de6fc3726619f10 Mon Sep 17 00:00:00 2001 From: Mike Wilson Date: Thu, 4 Jan 2018 17:45:40 -0500 Subject: [PATCH] Changed return of empty string to raise an exception as it should have been from the beginning. --- .../layers/kubernetes-worker/reactive/kubernetes_worker.py | 6 ++---- 1 file changed, 2 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 917e4291406..c5e54144d86 100644 --- a/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py +++ b/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py @@ -969,7 +969,8 @@ def get_node_name(): # if we didn't match, just bail to the next node break - return "" + msg = 'Failed to get node name for node %s' % gethostname() + raise GetNodeNameFailed(msg) class ApplyNodeLabelFailed(Exception): @@ -979,9 +980,6 @@ class ApplyNodeLabelFailed(Exception): def _apply_node_label(label, delete=False, overwrite=False): ''' Invoke kubectl to apply node label changes ''' nodename = get_node_name() - if nodename == "": - msg = 'Unable to get node name for node {}'.format(gethostname()) - raise ApplyNodeLabelFailed(msg) # TODO: Make this part of the kubectl calls instead of a special string cmd_base = 'kubectl --kubeconfig={0} label node {1} {2}'