github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-06 02:34:03 +00:00
Code Issues Projects Releases Wiki Activity

Changed return of empty string to raise an exception as it should have been from the beginning.

Browse Source
This commit is contained in:
Mike Wilson 2018-01-04 17:45:40 -05:00
parent 1b814c43ad
commit 806759cfc9
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -969,7 +969,8 @@ def get_node_name():
# if we didn't match, just bail to the next node # if we didn't match, just bail to the next node
break break
return "" msg = 'Failed to get node name for node %s' % gethostname()
raise GetNodeNameFailed(msg)
class ApplyNodeLabelFailed(Exception): class ApplyNodeLabelFailed(Exception):
@ -979,9 +980,6 @@ class ApplyNodeLabelFailed(Exception):
def _apply_node_label(label, delete=False, overwrite=False): def _apply_node_label(label, delete=False, overwrite=False):
''' Invoke kubectl to apply node label changes ''' ''' Invoke kubectl to apply node label changes '''
nodename = get_node_name() 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 # TODO: Make this part of the kubectl calls instead of a special string
cmd_base = 'kubectl --kubeconfig={0} label node {1} {2}' cmd_base = 'kubectl --kubeconfig={0} label node {1} {2}'