From 04a3e29d7c658644e9e0dd78bf5228d09f0f0675 Mon Sep 17 00:00:00 2001 From: andyzhangx Date: Tue, 4 Jun 2019 15:50:06 +0000 Subject: [PATCH] fix: update vm if detach a non-existing disk fix gofmt issue --- .../providers/azure/azure_controller_standard.go | 4 ++-- pkg/cloudprovider/providers/azure/azure_controller_vmss.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/cloudprovider/providers/azure/azure_controller_standard.go b/pkg/cloudprovider/providers/azure/azure_controller_standard.go index 8e10fc7508..71f26265b0 100644 --- a/pkg/cloudprovider/providers/azure/azure_controller_standard.go +++ b/pkg/cloudprovider/providers/azure/azure_controller_standard.go @@ -17,7 +17,6 @@ limitations under the License. package azure import ( - "fmt" "net/http" "strings" @@ -132,7 +131,8 @@ func (as *availabilitySet) DetachDisk(diskName, diskURI string, nodeName types.N } if !bFoundDisk { - return nil, fmt.Errorf("detach azure disk failure, disk %s not found, diskURI: %s", diskName, diskURI) + // only log here, next action is to update VM status with original meta data + klog.Errorf("detach azure disk: disk %s not found, diskURI: %s", diskName, diskURI) } newVM := compute.VirtualMachine{ diff --git a/pkg/cloudprovider/providers/azure/azure_controller_vmss.go b/pkg/cloudprovider/providers/azure/azure_controller_vmss.go index db914c2c9a..8c6b8f3463 100644 --- a/pkg/cloudprovider/providers/azure/azure_controller_vmss.go +++ b/pkg/cloudprovider/providers/azure/azure_controller_vmss.go @@ -17,7 +17,6 @@ limitations under the License. package azure import ( - "fmt" "net/http" "strings" @@ -136,7 +135,8 @@ func (ss *scaleSet) DetachDisk(diskName, diskURI string, nodeName types.NodeName } if !bFoundDisk { - return nil, fmt.Errorf("detach azure disk failure, disk %s not found, diskURI: %s", diskName, diskURI) + // only log here, next action is to update VM status with original meta data + klog.Errorf("detach azure disk: disk %s not found, diskURI: %s", diskName, diskURI) } newVM := compute.VirtualMachineScaleSetVM{