fix(vmip): fix double create VirtualMachineIPLease

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

Author: LopatinDmitr

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

@@ -20,6 +20,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"time"
 
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -183,7 +184,7 @@ 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
+	return reconcile.Result{RequeueAfter: 2 * time.Second}, nil
 }
 
 func (h IPLeaseHandler) Name() string {

images/virtualization-artifact/pkg/controller/vmip/vmip_reconciler.go

@@ -18,7 +18,9 @@ package vmip
 
 import (
 	"context"
+	"errors"
 	"fmt"
+	"time"
 
 	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -33,6 +35,7 @@ import (
 	"github.com/deckhouse/virtualization-controller/pkg/controller/indexer"
 	"github.com/deckhouse/virtualization-controller/pkg/controller/reconciler"
 	"github.com/deckhouse/virtualization-controller/pkg/controller/vmip/internal/state"
+	"github.com/deckhouse/virtualization-controller/pkg/logger"
 	virtv2 "github.com/deckhouse/virtualization/api/core/v1alpha2"
 )
 
@@ -151,19 +154,37 @@ func (r *Reconciler) Reconcile(ctx context.Context, req reconcile.Request) (reco
 		return reconcile.Result{}, nil
 	}
 
+	log := logger.FromContext(ctx)
+	log.Debug("Start reconcile VMIP")
+
 	s := state.New(r.client, vmip.Changed())
+	var handlerErrs []error
+
+	var result reconcile.Result
+	for _, h := range r.handlers {
+		log.Debug("Run handler", logger.SlogHandler(h.Name()))
+
+		var res reconcile.Result
+		res, err = h.Handle(ctx, s)
+		if err != nil {
+			log.Error("Failed to handle VirtualMachineIP", logger.SlogErr(err), logger.SlogHandler(h.Name()))
+			handlerErrs = append(handlerErrs, err)
+		}
+
+		result = reconciler.MergeResults(result, res)
+	}
 
-	rec := reconciler.NewBaseReconciler[Handler](r.handlers)
-	rec.SetHandlerExecutor(func(ctx context.Context, h Handler) (reconcile.Result, error) {
-		return h.Handle(ctx, s)
-	})
-	rec.SetResourceUpdater(func(ctx context.Context) error {
-		vmip.Changed().Status.ObservedGeneration = vmip.Changed().Generation
+	err = vmip.Update(ctx)
+	if err != nil {
+		return reconcile.Result{RequeueAfter: 2 * time.Second}, err
+	}
 
-		return vmip.Update(ctx)
-	})
+	err = errors.Join(handlerErrs...)
+	if err != nil {
+		return reconcile.Result{}, err
+	}
 
-	return rec.Reconcile(ctx)
+	return result, nil
 }
 
 func (r *Reconciler) factory() *virtv2.VirtualMachineIPAddress {

images/virtualization-artifact/pkg/controller/vmiplease/vmiplease_reconciler.go

@@ -109,10 +109,6 @@ func (r *Reconciler) Reconcile(ctx context.Context, req reconcile.Request) (reco
 		return h.Handle(ctx, s)
 	})
 	rec.SetResourceUpdater(func(ctx context.Context) error {
-		if s.ShouldDeletion() {
-			return r.client.Delete(ctx, lease.Changed())
-		}
-
 		if !reflect.DeepEqual(lease.Current().Spec, lease.Changed().Spec) {
 			leaseStatus := lease.Changed().Status.DeepCopy()
 			err = r.client.Update(ctx, lease.Changed())
@@ -122,7 +118,16 @@ func (r *Reconciler) Reconcile(ctx context.Context, req reconcile.Request) (reco
 			lease.Changed().Status = *leaseStatus
 		}
 
-		return lease.Update(ctx)
+		err = lease.Update(ctx)
+		if err != nil {
+			return err
+		}
+
+		if s.ShouldDeletion() {
+			return r.client.Delete(ctx, lease.Changed())
+		}
+
+		return nil
 	})
 
 	return rec.Reconcile(ctx)

tests/e2e/default_config.yaml

@@ -53,6 +53,7 @@ logFilter:
   - "get storage class specified in spec: storage class not found" # Err.
   - "lastTransitionTime: Required value" # Err.
   - "virtualmachineipaddressleases.virtualization.deckhouse.io "
+  - "Operation cannot be fulfilled on virtualmachineipaddresses.virtualization.deckhouse.io" # Err.
 regexpLogFilter:
   - "failed to detach: .* not found" # "err" "failed to detach: virtualmachine.kubevirt.io \"head-497d17b-vm-automatic-with-hotplug\" not found",
   - "error patching .* not found" # "err" "error patching *** virtualimages.virtualization.deckhouse.io \"head-497d17b-vi-pvc-oref-vi-oref-vd\" not found",