Merge pull request kubernetes#92257 from andyzhangx/deallocating

k8s-ci-robot · web-flow · commit e201c6b8df1f · 2020-06-19T11:38:03.000-07:00
fix: Azure deallocating node should be regarded as shut down
diff --git a/staging/src/k8s.io/legacy-cloud-providers/azure/azure_instances.go b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_instances.go
@@ -32,9 +32,10 @@ import (
 )
 
 const (
-	vmPowerStatePrefix      = "PowerState/"
-	vmPowerStateStopped     = "stopped"
-	vmPowerStateDeallocated = "deallocated"
+	vmPowerStatePrefix       = "PowerState/"
+	vmPowerStateStopped      = "stopped"
+	vmPowerStateDeallocated  = "deallocated"
+	vmPowerStateDeallocating = "deallocating"
 )
 
 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)
 
-	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.
diff --git a/staging/src/k8s.io/legacy-cloud-providers/azure/azure_instances_test.go b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_instances_test.go
@@ -284,7 +284,7 @@ func TestInstanceShutdownByProviderID(t *testing.T) {
 			vmList:     map[string]string{"vm3": "PowerState/Deallocating"},
 			nodeName:   "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",

Original file line number	Diff line number	Diff line change
`@@ -32,9 +32,10 @@ import (`
`32`	`32`	`)`
`33`	`33`
`34`	`34`	`const (`
`35`		`- vmPowerStatePrefix = "PowerState/"`
`36`		`- vmPowerStateStopped = "stopped"`
`37`		`- vmPowerStateDeallocated = "deallocated"`
	`35`	`+ vmPowerStatePrefix = "PowerState/"`
	`36`	`+ vmPowerStateStopped = "stopped"`
	`37`	`+ vmPowerStateDeallocated = "deallocated"`
	`38`	`+ vmPowerStateDeallocating = "deallocating"`
`38`	`39`	`)`
`39`	`40`
`40`	`41`	`var (`
`@@ -230,7 +231,8 @@ func (az *Cloud) InstanceShutdownByProviderID(ctx context.Context, providerID st`
`230`	`231`	`}`
`231`	`232`	`klog.V(5).Infof("InstanceShutdownByProviderID gets power status %q for node %q", powerStatus, nodeName)`
`232`	`233`
`233`		`- return strings.ToLower(powerStatus) == vmPowerStateStopped \|\| strings.ToLower(powerStatus) == vmPowerStateDeallocated, nil`
	`234`	`+ status := strings.ToLower(powerStatus)`
	`235`	`+ return status == vmPowerStateStopped \|\| status == vmPowerStateDeallocated \|\| status == vmPowerStateDeallocating, nil`
`234`	`236`	`}`
`235`	`237`
`236`	`238`	`// InstanceMetadataByProviderID returns metadata of the specified instance.`
Original file line number	Diff line number	Diff line change
`@@ -284,7 +284,7 @@ func TestInstanceShutdownByProviderID(t *testing.T) {`
`284`	`284`	`vmList: map[string]string{"vm3": "PowerState/Deallocating"},`
`285`	`285`	`nodeName: "vm3",`
`286`	`286`	`providerID: "azure:///subscriptions/subscription/resourceGroups/rg/providers/Microsoft.Compute/virtualMachines/vm3",`
`287`		`- expected: false,`
	`287`	`+ expected: true,`
`288`	`288`	`},`
`289`	`289`	`{`
`290`	`290`	`name: "InstanceShutdownByProviderID should return false if the vm is in PowerState/Starting status",`