fix to worked 2

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

Author: LopatinDmitr

images/virtualization-artifact/pkg/controller/vmip/internal/iplease_handler.go

@@ -75,10 +75,6 @@ func (h IPLeaseHandler) Handle(ctx context.Context, state state.VMIPState) (reco
 		log.Info("Lease is not ready: waiting for the lease")
 		return reconcile.Result{}, nil
 
-	case vmip.Status.Address == "":
-		vmip.Status.Address = ip.LeaseNameToIP(lease.Name)
-		return reconcile.Result{}, nil
-
 	case util.IsBoundLease(lease, vmip):
 		log.Info("Lease is bound, VirtualMachineIP ref is valid")
 		return reconcile.Result{}, nil
@@ -111,63 +107,66 @@ func (h IPLeaseHandler) updateLease(ctx context.Context, lease *virtv2.VirtualMa
 	if err != nil {
 		return reconcile.Result{}, err
 	}
-	// fixme dlopatin delete this line
-	vmip.Status.Address = ip.LeaseNameToIP(lease.Name)
+
 	return reconcile.Result{}, nil
 }
 
 func (h IPLeaseHandler) createNewLease(ctx context.Context, state state.VMIPState) (reconcile.Result, error) {
 	log := logger.FromContext(ctx)
 
 	vmip := state.VirtualMachineIP()
-	ipAddress := ""
-	if vmip.Spec.Type == virtv2.VirtualMachineIPAddressTypeAuto {
-		log.Info("allocate the new VirtualMachineIP address")
-		var err error
-		ipAddress, err = h.ipService.AllocateNewIP(state.AllocatedIPs())
-		if err != nil {
-			return reconcile.Result{}, err
+	if vmip.Status.Address == "" {
+		ipAddress := ""
+		if vmip.Spec.Type == virtv2.VirtualMachineIPAddressTypeAuto {
+			log.Info("allocate the new VirtualMachineIP address")
+			var err error
+			ipAddress, err = h.ipService.AllocateNewIP(state.AllocatedIPs())
+			if err != nil {
+				return reconcile.Result{}, err
+			}
+		} else {
+			ipAddress = vmip.Spec.StaticIP
 		}
-	} else {
-		ipAddress = vmip.Spec.StaticIP
-	}
 
-	err := h.ipService.IsAvailableAddress(ipAddress, state.AllocatedIPs())
-	if err != nil {
-		msg := fmt.Sprintf("the VirtualMachineIP cannot be created: %s", err.Error())
-		log.Warn(msg)
-
-		conditionBound := conditions.NewConditionBuilder(vmipcondition.BoundType).
-			Generation(vmip.GetGeneration())
-
-		switch {
-		case errors.Is(err, service.ErrIPAddressOutOfRange):
-			vmip.Status.Phase = virtv2.VirtualMachineIPAddressPhasePending
-			msg = fmt.Sprintf("The requested address %s is out of the valid range.", vmip.Spec.StaticIP)
-			conditionBound.Status(metav1.ConditionFalse).
-				Reason(vmipcondition.VirtualMachineIPAddressIsOutOfTheValidRange).
-				Message(msg)
-			h.recorder.Event(vmip, corev1.EventTypeWarning, virtv2.ReasonFailed, msg)
-		case errors.Is(err, service.ErrIPAddressAlreadyExist):
-			vmip.Status.Phase = virtv2.VirtualMachineIPAddressPhasePending
-			msg = fmt.Sprintf("VirtualMachineIPAddressLease %s is bound to another VirtualMachineIPAddress.",
-				ip.IpToLeaseName(ipAddress))
-			conditionBound.Status(metav1.ConditionFalse).
-				Reason(vmipcondition.VirtualMachineIPAddressLeaseAlreadyExists).
-				Message(msg)
-			h.recorder.Event(vmip, corev1.EventTypeWarning, virtv2.ReasonBound, msg)
+		err := h.ipService.IsAvailableAddress(ipAddress, state.AllocatedIPs())
+		if err != nil {
+			msg := fmt.Sprintf("the VirtualMachineIP cannot be created: %s", err.Error())
+			log.Warn(msg)
+
+			conditionBound := conditions.NewConditionBuilder(vmipcondition.BoundType).
+				Generation(vmip.GetGeneration())
+
+			switch {
+			case errors.Is(err, service.ErrIPAddressOutOfRange):
+				vmip.Status.Phase = virtv2.VirtualMachineIPAddressPhasePending
+				msg = fmt.Sprintf("The requested address %s is out of the valid range.", ipAddress)
+				conditionBound.Status(metav1.ConditionFalse).
+					Reason(vmipcondition.VirtualMachineIPAddressIsOutOfTheValidRange).
+					Message(msg)
+				h.recorder.Event(vmip, corev1.EventTypeWarning, virtv2.ReasonFailed, msg)
+			case errors.Is(err, service.ErrIPAddressAlreadyExist):
+				vmip.Status.Phase = virtv2.VirtualMachineIPAddressPhasePending
+				msg = fmt.Sprintf("VirtualMachineIPAddressLease %s is bound to another VirtualMachineIPAddress.",
+					ip.IpToLeaseName(ipAddress))
+				conditionBound.Status(metav1.ConditionFalse).
+					Reason(vmipcondition.VirtualMachineIPAddressLeaseAlreadyExists).
+					Message(msg)
+				h.recorder.Event(vmip, corev1.EventTypeWarning, virtv2.ReasonBound, msg)
+			}
+			conditions.SetCondition(conditionBound, &vmip.Status.Conditions)
+			return reconcile.Result{}, nil
 		}
-		conditions.SetCondition(conditionBound, &vmip.Status.Conditions)
+		vmip.Status.Address = ipAddress
 		return reconcile.Result{}, nil
 	}
 
-	leaseName := ip.IpToLeaseName(ipAddress)
+	leaseName := ip.IpToLeaseName(vmip.Status.Address)
 
 	log.Info("Create lease", "leaseName", leaseName,
 		"refName", vmip.Name, "refNamespace", vmip.Namespace,
 	)
 
-	err = h.client.Create(ctx, &virtv2.VirtualMachineIPAddressLease{
+	err := h.client.Create(ctx, &virtv2.VirtualMachineIPAddressLease{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: leaseName,
 		},
@@ -188,7 +187,6 @@ func (h IPLeaseHandler) createNewLease(ctx context.Context, state state.VMIPStat
 	}
 
 	h.recorder.Event(vmip, corev1.EventTypeNormal, virtv2.ReasonBound, "VirtualMachineIPAddress is bound to a new VirtualMachineIPAddressLease.")
-
 	return reconcile.Result{}, nil
 }
 

images/virtualization-artifact/pkg/controller/vmip/internal/state/state.go

@@ -65,11 +65,7 @@ func (s *state) VirtualMachineIPLease(ctx context.Context) (*virtv2.VirtualMachi
 	}
 
 	var err error
-	leaseName := ip.IpToLeaseName(s.vmip.Spec.StaticIP)
-
-	if leaseName == "" {
-		leaseName = ip.IpToLeaseName(s.vmip.Status.Address)
-	}
+	leaseName := ip.IpToLeaseName(s.vmip.Status.Address)
 
 	if leaseName != "" {
 		leaseKey := types.NamespacedName{Name: leaseName}