mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 03:41:45 +00:00
Forcing get_node_name to continue searching for a node name if the returned list of nodes doesn't include this one.
There was a race condition where the kubelet was restarting and we were querying the api server for this node.
This commit is contained in:
parent
03b3d599fe
commit
e87b537654
@ -979,31 +979,30 @@ def get_node_name():
|
||||
while time.time() < deadline:
|
||||
try:
|
||||
raw = check_output(cmd)
|
||||
break
|
||||
except CalledProcessError:
|
||||
hookenv.log('Failed to get node name for node %s.'
|
||||
' Will retry.' % (gethostname()))
|
||||
time.sleep(1)
|
||||
else:
|
||||
msg = 'Failed to get node name for node %s' % gethostname()
|
||||
raise GetNodeNameFailed(msg)
|
||||
continue
|
||||
|
||||
result = json.loads(raw.decode('utf-8'))
|
||||
if 'items' in result:
|
||||
for node in result['items']:
|
||||
if 'status' not in node:
|
||||
continue
|
||||
if 'addresses' not in node['status']:
|
||||
continue
|
||||
result = json.loads(raw.decode('utf-8'))
|
||||
if 'items' in result:
|
||||
for node in result['items']:
|
||||
if 'status' not in node:
|
||||
continue
|
||||
if 'addresses' not in node['status']:
|
||||
continue
|
||||
|
||||
# find the hostname
|
||||
for address in node['status']['addresses']:
|
||||
if address['type'] == 'Hostname':
|
||||
if address['address'] == gethostname():
|
||||
return node['metadata']['name']
|
||||
# find the hostname
|
||||
for address in node['status']['addresses']:
|
||||
if address['type'] == 'Hostname':
|
||||
if address['address'] == gethostname():
|
||||
return node['metadata']['name']
|
||||
|
||||
# if we didn't match, just bail to the next node
|
||||
break
|
||||
time.sleep(1)
|
||||
|
||||
# if we didn't match, just bail to the next node
|
||||
break
|
||||
msg = 'Failed to get node name for node %s' % gethostname()
|
||||
raise GetNodeNameFailed(msg)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user