github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix race condition in cloud provider 

Signed-off-by: Manuel Buil <mbuil@suse.com>
pull/4218/head
Manuel Buil 2021-10-15 07:27:35 +02:00
parent 5a923ab8dc
commit dbc14b8990
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/cloudprovider/instances.go
View File

@ -36,9 +36,12 @@ func (k *k3s) InstanceID(ctx context.Context, nodeName types.NodeName) (string,
return "", errors.New("Node informer has not synced yet") return "", errors.New("Node informer has not synced yet")
} }
_, err := k.nodeInformer.Lister().Get(string(nodeName)) node, err := k.nodeInformer.Lister().Get(string(nodeName))
if err != nil { if err != nil {
return "", fmt.Errorf("Failed to find node %s: %v", nodeName, err) return "", fmt.Errorf("failed to get node %s: %w", nodeName, err)
}
if (node.Annotations[InternalIPKey] == "") && (node.Labels[InternalIPKey] == "") {
return string(nodeName), errors.New("address annotations not yet set")
} }
return string(nodeName), nil return string(nodeName), nil
} }