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

Merge pull request #92257 from andyzhangx/deallocating

Browse Source 
fix: Azure deallocating node should be regarded as shut down
This commit is contained in:
Kubernetes Prow Robot 2020-06-19 11:38:03 -07:00 committed by GitHub
commit e201c6b8df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
staging/src/k8s.io/legacy-cloud-providers/azure/azure_instances.go
View File

@ -32,9 +32,10 @@ import (
) )
const ( const (
vmPowerStatePrefix = "PowerState/" vmPowerStatePrefix = "PowerState/"
vmPowerStateStopped = "stopped" vmPowerStateStopped = "stopped"
vmPowerStateDeallocated = "deallocated" vmPowerStateDeallocated = "deallocated"
vmPowerStateDeallocating = "deallocating"
) )
var ( var (
@ -230,7 +231,8 @@ func (az *Cloud) InstanceShutdownByProviderID(ctx context.Context, providerID st
} }
klog.V(5).Infof("InstanceShutdownByProviderID gets power status %q for node %q", powerStatus, nodeName) klog.V(5).Infof("InstanceShutdownByProviderID gets power status %q for node %q", powerStatus, nodeName)
return strings.ToLower(powerStatus) == vmPowerStateStopped || strings.ToLower(powerStatus) == vmPowerStateDeallocated, nil status := strings.ToLower(powerStatus)
return status == vmPowerStateStopped || status == vmPowerStateDeallocated || status == vmPowerStateDeallocating, nil
} }
// InstanceMetadataByProviderID returns metadata of the specified instance. // InstanceMetadataByProviderID returns metadata of the specified instance.

2
staging/src/k8s.io/legacy-cloud-providers/azure/azure_instances_test.go
View File

@ -284,7 +284,7 @@ func TestInstanceShutdownByProviderID(t *testing.T) {
vmList: map[string]string{"vm3": "PowerState/Deallocating"}, vmList: map[string]string{"vm3": "PowerState/Deallocating"},
nodeName: "vm3", nodeName: "vm3",
providerID: "azure:///subscriptions/subscription/resourceGroups/rg/providers/Microsoft.Compute/virtualMachines/vm3", providerID: "azure:///subscriptions/subscription/resourceGroups/rg/providers/Microsoft.Compute/virtualMachines/vm3",
expected: false, expected: true,
}, },
{ {
name: "InstanceShutdownByProviderID should return false if the vm is in PowerState/Starting status", name: "InstanceShutdownByProviderID should return false if the vm is in PowerState/Starting status",