Merge pull request #60692 from adnavare/bug/60466
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Cleanup the use of ExternalID as it is deprecated The patch removes ExternalID usage from node_controller and node_lifecycle_oontroller. The code instead uses InstanceID which returns the cloud provider ID as well. fixes #60466
This commit is contained in:
@@ -302,8 +302,8 @@ func (kl *Kubelet) initialNode() (*v1.Node, error) {
|
||||
|
||||
// TODO(roberthbailey): Can we do this without having credentials to talk
|
||||
// to the cloud provider?
|
||||
// TODO: ExternalID is deprecated, we'll have to drop this code
|
||||
externalID, err := instances.ExternalID(context.TODO(), kl.nodeName)
|
||||
// ExternalID is deprecated, so ProviderID is retrieved using InstanceID
|
||||
externalID, err := instances.InstanceID(context.TODO(), kl.nodeName)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("failed to get external ID from cloud provider: %v", err)
|
||||
}
|
||||
|
Reference in New Issue
Block a user