Skip to content

K
k3s
Unverified Commit 0a91dbb3 authored by Michal Rostecki's avatar Michal Rostecki Committed by GitHub
Browse files
Options

Merge pull request #4218 from manuelbuil/race_condition_issue

Fix race condition in cloud provider
parents 5a923ab8 dbc14b89
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 2 deletions
pkg/cloudprovider/instances.go
View file @ 0a91dbb3
...@@ -36,9 +36,12 @@ func (k *k3s) InstanceID(ctx context.Context, nodeName types.NodeName) (string, ...@@ -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
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment