github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 12:43:23 +00:00
Code Issues Projects Releases Wiki Activity

Return nil as error when instance is not found so that node_controller could delete the node

Browse Source
This commit is contained in:
lubronzhan 2020-06-29 23:33:39 +08:00
parent 3a9b6bd50a
commit 1ebea3ad9d
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
staging/src/k8s.io/legacy-cloud-providers/vsphere/vsphere.go
View File

@ -756,11 +756,14 @@ func (vs *VSphere) InstanceExistsByProviderID(ctx context.Context, providerID st
return false, err return false, err
} }
_, err = vs.InstanceID(ctx, convertToK8sType(nodeName)) _, err = vs.InstanceID(ctx, convertToK8sType(nodeName))
if err == nil { if err != nil {
return true, nil if err == cloudprovider.InstanceNotFound {
return false, nil
}
return false, err
} }
return false, err return true, nil
} }
// InstanceShutdownByProviderID returns true if the instance is in safe state to detach volumes // InstanceShutdownByProviderID returns true if the instance is in safe state to detach volumes