From f886b5c073207b8b7276ce19c43d56966312dc2d Mon Sep 17 00:00:00 2001 From: andyzhangx Date: Wed, 25 Aug 2021 07:38:49 +0000 Subject: [PATCH] fix detach disk issue on deleting node --- .../legacy-cloud-providers/azure/azure_controller_common.go | 3 +++ .../azure/azure_controller_common_test.go | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/staging/src/k8s.io/legacy-cloud-providers/azure/azure_controller_common.go b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_controller_common.go index b53817d6dca..072c262a66e 100644 --- a/staging/src/k8s.io/legacy-cloud-providers/azure/azure_controller_common.go +++ b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_controller_common.go @@ -454,5 +454,8 @@ func getValidCreationData(subscriptionID, resourceGroup, sourceResourceID, sourc func isInstanceNotFoundError(err error) bool { errMsg := strings.ToLower(err.Error()) + if strings.Contains(errMsg, strings.ToLower(vmssVMNotActiveErrorMessage)) { + return true + } return strings.Contains(errMsg, errStatusCode400) && strings.Contains(errMsg, errInvalidParameter) && strings.Contains(errMsg, errTargetInstanceIds) } diff --git a/staging/src/k8s.io/legacy-cloud-providers/azure/azure_controller_common_test.go b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_controller_common_test.go index 54a408c1ce8..d75460fd329 100644 --- a/staging/src/k8s.io/legacy-cloud-providers/azure/azure_controller_common_test.go +++ b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_controller_common_test.go @@ -809,8 +809,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"`,