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

Merge pull request #71597 from marc-sensenich/gh-71595/fix-cloud-controller-manager-azure-delete-nodes

Browse Source 
Add check for cloudProvider.InstanceNotFound in Azure VMSS Instance gets
This commit is contained in:
Kubernetes Prow Robot 2018-12-04 05:25:59 -08:00 committed by GitHub
commit a605988d5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/cloudprovider/providers/azure/azure_instances.go
View File

@ -23,9 +23,8 @@ import (
"strings" "strings"
"k8s.io/api/core/v1" "k8s.io/api/core/v1"
cloudprovider "k8s.io/cloud-provider"
"k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/types"
cloudprovider "k8s.io/cloud-provider"
"k8s.io/klog" "k8s.io/klog"
) )
@ -155,6 +154,9 @@ func (az *Cloud) InstanceExistsByProviderID(ctx context.Context, providerID stri
name, err := az.vmSet.GetNodeNameByProviderID(providerID) name, err := az.vmSet.GetNodeNameByProviderID(providerID)
if err != nil { if err != nil {
if err == cloudprovider.InstanceNotFound {
return false, nil
}
return false, err return false, err
} }