fix

Signed-off-by: Yaroslav Borbat <[email protected]>

Author: yaroslavborbat

images/virtualization-artifact/pkg/controller/reconciler/reconciler.go

@@ -39,6 +39,14 @@ type Handler[T client.Object] interface {
 	Name() string
 }
 
+type Named interface {
+	Name() string
+}
+
+type Finalizer interface {
+	Finalize(ctx context.Context) error
+}
+
 type Watcher interface {
 	Watch(mgr manager.Manager, ctr controller.Controller) error
 }
@@ -82,7 +90,13 @@ func (r *BaseReconciler[H]) Reconcile(ctx context.Context) (reconcile.Result, er
 
 handlersLoop:
 	for _, h := range r.handlers {
-		log := logger.FromContext(ctx).With(logger.SlogHandler(reflect.TypeOf(h).Elem().Name()))
+		var name string
+		if named, ok := any(h).(Named); ok {
+			name = named.Name()
+		} else {
+			name = reflect.TypeOf(h).Elem().Name()
+		}
+		log := logger.FromContext(ctx).With(logger.SlogHandler(name))
 
 		res, err := r.execute(ctx, h)
 		switch {
@@ -121,6 +135,15 @@ handlersLoop:
 		return reconcile.Result{}, errs
 	}
 
+	for _, h := range r.handlers {
+		if finalizer, ok := any(h).(Finalizer); ok {
+			if err := finalizer.Finalize(ctx); err != nil {
+				logger.FromContext(ctx).Error("Failed to finalize resource", logger.SlogErr(err))
+				return reconcile.Result{}, err
+			}
+		}
+	}
+
 	//nolint:staticcheck // logging
 	logger.FromContext(ctx).Debug("Reconciliation was successfully completed", "requeue", result.Requeue, "after", result.RequeueAfter)
 

images/virtualization-artifact/pkg/controller/vm/internal/migrating_test.go

@@ -91,7 +91,7 @@ var _ = Describe("MigratingHandler", func() {
 	}
 
 	reconcile := func() {
-		h := NewMigratingHandler()
+		h := NewMigratingHandler(fakeClient)
 		_, err := h.Handle(ctx, vmState)
 		Expect(err).NotTo(HaveOccurred())
 		err = resource.Update(context.Background())

images/virtualization-artifact/pkg/controller/vm/vm_controller.go

@@ -27,6 +27,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/metrics"
 
 	"github.com/deckhouse/deckhouse/pkg/log"
+
 	"github.com/deckhouse/virtualization-controller/pkg/controller/netmanager"
 	"github.com/deckhouse/virtualization-controller/pkg/controller/service"
 	"github.com/deckhouse/virtualization-controller/pkg/controller/vm/internal"
@@ -72,7 +73,7 @@ func SetupController(
 		internal.NewSyncPowerStateHandler(client, recorder),
 		internal.NewSyncMetadataHandler(client),
 		internal.NewLifeCycleHandler(client, recorder),
-		internal.NewMigratingHandler(),
+		internal.NewMigratingHandler(client),
 		internal.NewFirmwareHandler(firmwareImage),
 		internal.NewEvictHandler(),
 		internal.NewStatisticHandler(client),