Merge pull request #3452 from nilo19/bug/cherry-pick-3418-1-18

Cherry pick the bug fix in #2418 onto 1.18
kubernetes · Aug 23, 2020 · 45b905c · 45b905c
2 parents 3ecf85c + 8352911
commit 45b905c
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/cluster-autoscaler/cloudprovider/azure/azure_util.go b/cluster-autoscaler/cloudprovider/azure/azure_util.go
@@ -144,11 +144,12 @@ func (util *AzUtil) DeleteVirtualMachine(rg string, name string) error {
 
 	osDiskName := vm.VirtualMachineProperties.StorageProfile.OsDisk.Name
 	var nicName string
+	var err error
 	nicID := (*vm.VirtualMachineProperties.NetworkProfile.NetworkInterfaces)[0].ID
 	if nicID == nil {
 		klog.Warningf("NIC ID is not set for VM (%s/%s)", rg, name)
 	} else {
-		nicName, err := resourceName(*nicID)
+		nicName, err = resourceName(*nicID)
 		if err != nil {
 			return err
 		}