Merge pull request #643 from yastij/requeue-delete

check vm existence even if machineRef is not set

Author: k8s-ci-robot

pkg/cloud/vsphere/services/govmomi/service.go

@@ -135,19 +135,17 @@ func (vms *VMService) DestroyVM(ctx *context.MachineContext) (infrav1.VirtualMac
 		return vm, err
 	}
 
-	// check if VM actually exists
-	if ctx.VSphereMachine.Spec.MachineRef != "" {
-		moRefID, err := findVMByInstanceUUID(ctx)
-		if err != nil {
-			return vm, err
-		}
-		if moRefID == "" {
-			// No vm exists
-			// remove the MachineRef and set the vm state to notfound
-			ctx.VSphereMachine.Spec.MachineRef = ""
-			vm.State = infrav1.VirtualMachineStateNotFound
-			return vm, nil
-		}
+	// check if the vm existts
+	moRefID, err := findVMByInstanceUUID(ctx)
+	if err != nil {
+		return vm, err
+	}
+	if moRefID == "" {
+		// No vm exists
+		// remove the MachineRef and set the vm state to notfound
+		ctx.VSphereMachine.Spec.MachineRef = ""
+		vm.State = infrav1.VirtualMachineStateNotFound
+		return vm, nil
 	}
 
 	// VM actually exists