fix(vmipl): fix problem with deleting the finalizer (#1006)

Fix problem with deleting the finalizer from VirtualMachineIPLease.

Signed-off-by: Dmitry Lopatin <dmitry.lopatin@flant.com>

Author: LopatinDmitr

images/virtualization-artifact/pkg/controller/vmiplease/internal/lifecycle_handler.go

@@ -41,8 +41,7 @@ func (h *LifecycleHandler) Handle(ctx context.Context, state state.VMIPLeaseStat
 	lease := state.VirtualMachineIPAddressLease()
 	leaseStatus := &lease.Status
 
-	// Do nothing if object is being deleted as any update will lead to en error.
-	if state.ShouldDeletion() {
+	if state.ShouldDeletion() || lease.DeletionTimestamp != nil {
 		return reconcile.Result{}, nil
 	}
 
@@ -57,24 +56,20 @@ func (h *LifecycleHandler) Handle(ctx context.Context, state state.VMIPLeaseStat
 	}
 
 	if vmip != nil && vmip.Status.Address == ip.LeaseNameToIP(lease.Name) {
-		if leaseStatus.Phase != virtv2.VirtualMachineIPAddressLeasePhaseBound {
-			leaseStatus.Phase = virtv2.VirtualMachineIPAddressLeasePhaseBound
-			cb.Status(metav1.ConditionTrue).
-				Reason(vmiplcondition.Bound)
-			conditions.SetCondition(cb, &leaseStatus.Conditions)
-		}
+		leaseStatus.Phase = virtv2.VirtualMachineIPAddressLeasePhaseBound
+		cb.Status(metav1.ConditionTrue).
+			Reason(vmiplcondition.Bound)
+		conditions.SetCondition(cb, &leaseStatus.Conditions)
+
 	} else {
-		if leaseStatus.Phase != virtv2.VirtualMachineIPAddressLeasePhaseReleased {
-			leaseStatus.Phase = virtv2.VirtualMachineIPAddressLeasePhaseReleased
-			cb.Status(metav1.ConditionFalse).
-				Reason(vmiplcondition.Released).
-				Message("VirtualMachineIPAddress lease is not used by any VirtualMachineIPAddress")
-			conditions.SetCondition(cb, &leaseStatus.Conditions)
-		}
+		leaseStatus.Phase = virtv2.VirtualMachineIPAddressLeasePhaseReleased
+		cb.Status(metav1.ConditionFalse).
+			Reason(vmiplcondition.Released).
+			Message("VirtualMachineIPAddressLease is not used by any VirtualMachineIPAddress")
+		conditions.SetCondition(cb, &leaseStatus.Conditions)
 	}
 
 	leaseStatus.ObservedGeneration = lease.GetGeneration()
-
 	return reconcile.Result{}, nil
 }
 

images/virtualization-artifact/pkg/controller/vmiplease/internal/protection_handler.go

@@ -47,7 +47,7 @@ func (h *ProtectionHandler) Handle(ctx context.Context, state state.VMIPLeaseSta
 
 	if vmip != nil && vmip.Status.Address == ip.LeaseNameToIP(lease.Name) {
 		controllerutil.AddFinalizer(lease, virtv2.FinalizerIPAddressLeaseCleanup)
-	} else if lease.GetDeletionTimestamp() == nil {
+	} else {
 		log.Info("Deletion observed: remove cleanup finalizer from VirtualMachineIPAddressLease")
 		controllerutil.RemoveFinalizer(lease, virtv2.FinalizerIPAddressLeaseCleanup)
 	}

images/virtualization-artifact/pkg/controller/vmiplease/internal/retention_handler.go

@@ -47,15 +47,14 @@ func (h *RetentionHandler) Handle(ctx context.Context, state state.VMIPLeaseStat
 	log := logger.FromContext(ctx).With(logger.SlogHandler(RetentionHandlerName))
 
 	lease := state.VirtualMachineIPAddressLease()
-
 	vmip, err := state.VirtualMachineIPAddress(ctx)
 	if err != nil {
 		return reconcile.Result{}, err
 	}
 
 	if vmip == nil || vmip.Status.Address != ip.LeaseNameToIP(lease.Name) {
 		if lease.Spec.VirtualMachineIPAddressRef.Name != "" {
-			log.Info("VirtualMachineIP not found: remove this ref from the spec and retain VMIPLease")
+			log.Debug("VirtualMachineIP not found: remove this ref from the spec and retain VMIPLease")
 			lease.Spec.VirtualMachineIPAddressRef.Name = ""
 			return reconcile.Result{RequeueAfter: h.retentionDuration}, nil
 		}
@@ -67,7 +66,7 @@ func (h *RetentionHandler) Handle(ctx context.Context, state state.VMIPLeaseStat
 
 			duration := currentTime.Sub(boundCondition.LastTransitionTime.Time)
 			if duration >= h.retentionDuration {
-				log.Info(fmt.Sprintf("Retain VMIPLease after %s of being not claimed", h.retentionDuration.String()))
+				log.Info(fmt.Sprintf("Delete VMIPLease after %s of being not claimed", h.retentionDuration.String()))
 				state.SetDeletion(true)
 				return reconcile.Result{}, nil
 			}