fix detach disk issue on deleting vmss node

kubernetes-sigs · Aug 26, 2021 · c0c5b3b · c0c5b3b
1 parent 9869e9d
commit c0c5b3b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/pkg/provider/azure_controller_common.go b/pkg/provider/azure_controller_common.go
@@ -678,5 +678,8 @@ func getValidCreationData(subscriptionID, resourceGroup, sourceResourceID, sourc
 
 func isInstanceNotFoundError(err error) bool {
 	errMsg := strings.ToLower(err.Error())
+	if strings.Contains(errMsg, strings.ToLower(consts.VmssVMNotActiveErrorMessage)) {
+		return true
+	}
 	return strings.Contains(errMsg, errStatusCode400) && strings.Contains(errMsg, errInvalidParameter) && strings.Contains(errMsg, errTargetInstanceIds)
 }
diff --git a/pkg/provider/azure_controller_common_test.go b/pkg/provider/azure_controller_common_test.go
@@ -903,8 +903,8 @@ func TestIsInstanceNotFoundError(t *testing.T) {
 			expectedResult: false,
 		},
 		{
-			errMsg:         "not an active Virtual Machine scale set vm",
-			expectedResult: false,
+			errMsg:         "The provided instanceId 857 is not an active Virtual Machine Scale Set VM instanceId.",
+			expectedResult: true,
 		},
 		{
 			errMsg:         `compute.VirtualMachineScaleSetVMsClient#Update: Failure sending request: StatusCode=400 -- Original Error: Code="InvalidParameter" Message="The provided instanceId 1181 is not an active Virtual Machine Scale Set VM instanceId." Target="instanceIds"`,