fix

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

Author: yaroslavborbat

images/virtualization-artifact/cmd/virtualization-controller/main.go

@@ -57,6 +57,7 @@ import (
 	"github.com/deckhouse/virtualization-controller/pkg/controller/vmop"
 	"github.com/deckhouse/virtualization-controller/pkg/controller/vmrestore"
 	"github.com/deckhouse/virtualization-controller/pkg/controller/vmsnapshot"
+	"github.com/deckhouse/virtualization-controller/pkg/controller/volumemigration"
 	workloadupdater "github.com/deckhouse/virtualization-controller/pkg/controller/workload-updater"
 	"github.com/deckhouse/virtualization-controller/pkg/featuregates"
 	"github.com/deckhouse/virtualization-controller/pkg/logger"
@@ -389,12 +390,20 @@ func main() {
 		os.Exit(1)
 	}
 
-	if err = workloadupdater.SetupController(ctx, mgr, log, firmwareImage, controllerNamespace, virtControllerName); err != nil {
+	workloadUpdaterLogger := logger.NewControllerLogger(workloadupdater.ControllerName, logLevel, logOutput, logDebugVerbosity, logDebugControllerList)
+	if err = workloadupdater.SetupController(ctx, mgr, workloadUpdaterLogger, firmwareImage, controllerNamespace, virtControllerName); err != nil {
 		log.Error(err.Error())
 		os.Exit(1)
 	}
 
-	if err = evacuation.SetupController(ctx, mgr, virtClient, log); err != nil {
+	evacuationLogger := logger.NewControllerLogger(evacuation.ControllerName, logLevel, logOutput, logDebugVerbosity, logDebugControllerList)
+	if err = evacuation.SetupController(ctx, mgr, virtClient, evacuationLogger); err != nil {
+		log.Error(err.Error())
+		os.Exit(1)
+	}
+
+	volumeMigrationLogger := logger.NewControllerLogger(volumemigration.ControllerName, logLevel, logOutput, logDebugVerbosity, logDebugControllerList)
+	if err = volumemigration.SetupController(ctx, mgr, volumeMigrationLogger); err != nil {
 		log.Error(err.Error())
 		os.Exit(1)
 	}

images/virtualization-artifact/pkg/common/annotations/annotations.go

@@ -96,6 +96,8 @@ const (
 	AnnVMRestore = AnnAPIGroupV + "/vmrestore"
 	// AnnVMOPEvacuation is an annotation on vmop that represents a vmop created by evacuation controller
 	AnnVMOPEvacuation = AnnAPIGroupV + "/evacuation"
+	// AnnVMOPVolumeMigration is an annotation on vmop that represents a vmop created by volume-migration controller
+	AnnVMOPVolumeMigration = AnnAPIGroupV + "/volume-migration"
 
 	// LabelsPrefix is a prefix for virtualization-controller labels.
 	LabelsPrefix = "virtualization.deckhouse.io"

images/virtualization-artifact/pkg/common/vd/vd.go

@@ -0,0 +1,30 @@
+/*
+Copyright 2025 Flant JSC
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package vd
+
+import virtv2 "github.com/deckhouse/virtualization/api/core/v1alpha2"
+
+func CurrentlyMountedVM(vd *virtv2.VirtualDisk) string {
+	var currentlyMountedVM string
+	for _, attachedVM := range vd.Status.AttachedToVirtualMachines {
+		if attachedVM.Mounted {
+			currentlyMountedVM = attachedVM.Name
+			break
+		}
+	}
+	return currentlyMountedVM
+}

images/virtualization-artifact/pkg/controller/evacuation/internal/handler/evacuation.go

@@ -20,6 +20,7 @@ import (
 	"context"
 	"errors"
 	"log/slog"
+	"time"
 
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -67,9 +68,9 @@ func (h *EvacuationHandler) Handle(ctx context.Context, vm *v1alpha2.VirtualMach
 
 	log := logger.FromContext(ctx).With(logger.SlogHandler(nameEvacuationHandler))
 
-	needRequeue := false
+	var requeueAfter time.Duration
 	if err = h.removeFinalizerFromVMOPs(ctx, finishedVMOPs); err != nil {
-		needRequeue = true
+		requeueAfter = 100 * time.Millisecond
 		if k8serrors.IsConflict(err) {
 			log.Debug("Conflict occurred during handler execution", logger.SlogErr(err))
 		} else {
@@ -81,7 +82,7 @@ func (h *EvacuationHandler) Handle(ctx context.Context, vm *v1alpha2.VirtualMach
 		if err = h.cancelEvacuationForTerminatingVMOPs(ctx, migrationVMOPs, log); err != nil {
 			return reconcile.Result{}, err
 		}
-		return reconcile.Result{Requeue: needRequeue}, nil
+		return reconcile.Result{RequeueAfter: requeueAfter}, nil
 	}
 
 	if !isVMNeedEvict(vm) || isVMMigrating(vm) {
@@ -94,7 +95,7 @@ func (h *EvacuationHandler) Handle(ctx context.Context, vm *v1alpha2.VirtualMach
 		return reconcile.Result{}, err
 	}
 
-	return reconcile.Result{Requeue: needRequeue}, nil
+	return reconcile.Result{RequeueAfter: requeueAfter}, nil
 }
 
 func (h *EvacuationHandler) Name() string {

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

@@ -31,6 +31,8 @@ import (
 	"github.com/deckhouse/virtualization-controller/pkg/logger"
 )
 
+var ErrStopReconciliation = errors.New("stop reconciliation")
+
 type Handler[T client.Object] interface {
 	Handle(ctx context.Context, obj T) (reconcile.Result, error)
 	Name() string
@@ -77,12 +79,17 @@ func (r *BaseReconciler[H]) Reconcile(ctx context.Context) (reconcile.Result, er
 	var result reconcile.Result
 	var errs error
 
+handlerLoop:
 	for _, h := range r.handlers {
 		log := logger.FromContext(ctx).With(logger.SlogHandler(reflect.TypeOf(h).Elem().Name()))
 
 		res, err := r.execute(ctx, h)
 		switch {
 		case err == nil: // OK.
+		case errors.Is(err, ErrStopReconciliation):
+			result = MergeResults(result, res)
+			break handlerLoop
+
 		case k8serrors.IsConflict(err):
 			log.Debug("Conflict occurred during handler execution", logger.SlogErr(err))
 			result.RequeueAfter = 100 * time.Microsecond

images/virtualization-artifact/pkg/controller/vd/internal/init.go

@@ -0,0 +1,49 @@
+/*
+Copyright 2025 Flant JSC
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package internal
+
+import (
+	"context"
+	"fmt"
+	"time"
+
+	"sigs.k8s.io/controller-runtime/pkg/reconcile"
+
+	"github.com/deckhouse/virtualization-controller/pkg/common/pwgen"
+	"github.com/deckhouse/virtualization-controller/pkg/controller/reconciler"
+	vdsupplements "github.com/deckhouse/virtualization-controller/pkg/controller/vd/internal/supplements"
+	virtv2 "github.com/deckhouse/virtualization/api/core/v1alpha2"
+)
+
+type InitHandler struct{}
+
+func NewInitHandler() *InitHandler {
+	return &InitHandler{}
+}
+
+func (h *InitHandler) Handle(ctx context.Context, vd *virtv2.VirtualDisk) (reconcile.Result, error) {
+	// INIT PersistentVolumeClaim Name.
+	// Required for correct work virtual disk supplements.
+	// We should have different names for support migration volumes.
+	// If the PVC name is empty, we should generate it and update the status immediately.
+	if vd.Status.Target.PersistentVolumeClaim == "" {
+		name := fmt.Sprintf("vd-%s-%s", vd.UID, pwgen.LowerAlpha(5))
+		vdsupplements.SetPVCName(vd, name)
+		return reconcile.Result{RequeueAfter: 100 * time.Millisecond}, reconciler.ErrStopReconciliation
+	}
+	return reconcile.Result{}, nil
+}

images/virtualization-artifact/pkg/controller/vd/internal/inuse.go

@@ -31,6 +31,7 @@ import (
 
 	"github.com/deckhouse/virtualization-controller/pkg/common/annotations"
 	"github.com/deckhouse/virtualization-controller/pkg/common/object"
+	commonvd "github.com/deckhouse/virtualization-controller/pkg/common/vd"
 	"github.com/deckhouse/virtualization-controller/pkg/controller/conditions"
 	virtv2 "github.com/deckhouse/virtualization/api/core/v1alpha2"
 	"github.com/deckhouse/virtualization/api/core/v1alpha2/vdcondition"
@@ -223,7 +224,7 @@ func (h InUseHandler) isVMActive(ctx context.Context, vm virtv2.VirtualMachine)
 }
 
 func (h InUseHandler) updateAttachedVirtualMachinesStatus(vd *virtv2.VirtualDisk, usageMap map[string]bool) {
-	currentlyMountedVM := currentlyMountedVM(vd)
+	currentlyMountedVM := commonvd.CurrentlyMountedVM(vd)
 
 	attachedVMs := make([]virtv2.AttachedVirtualMachine, 0, len(usageMap))
 	setAnyToTrue := false
@@ -312,14 +313,3 @@ func (h InUseHandler) checkUsageByCVI(ctx context.Context, vd *virtv2.VirtualDis
 
 	return false, nil
 }
-
-func currentlyMountedVM(vd *virtv2.VirtualDisk) string {
-	var currentlyMountedVM string
-	for _, attachedVM := range vd.Status.AttachedToVirtualMachines {
-		if attachedVM.Mounted {
-			currentlyMountedVM = attachedVM.Name
-			break
-		}
-	}
-	return currentlyMountedVM
-}

images/virtualization-artifact/pkg/controller/vd/internal/migration.go

@@ -31,9 +31,11 @@ import (
 	"github.com/deckhouse/virtualization-controller/pkg/common/object"
 	"github.com/deckhouse/virtualization-controller/pkg/common/patch"
 	pvcspec "github.com/deckhouse/virtualization-controller/pkg/common/pvc"
+	commonvd "github.com/deckhouse/virtualization-controller/pkg/common/vd"
 	"github.com/deckhouse/virtualization-controller/pkg/controller/conditions"
 	"github.com/deckhouse/virtualization-controller/pkg/controller/service"
 	vdsupplements "github.com/deckhouse/virtualization-controller/pkg/controller/vd/internal/supplements"
+	"github.com/deckhouse/virtualization-controller/pkg/featuregates"
 	"github.com/deckhouse/virtualization-controller/pkg/logger"
 	virtv2 "github.com/deckhouse/virtualization/api/core/v1alpha2"
 	"github.com/deckhouse/virtualization/api/core/v1alpha2/vdcondition"
@@ -68,6 +70,10 @@ func (h MigrationHandler) Handle(ctx context.Context, vd *virtv2.VirtualDisk) (r
 		return reconcile.Result{}, nil
 	}
 
+	if !featuregates.Default().Enabled(featuregates.VolumeMigration) {
+		return reconcile.Result{}, nil
+	}
+
 	action, err := h.getAction(ctx, vd)
 	if err != nil {
 		return reconcile.Result{}, err
@@ -96,7 +102,7 @@ const (
 )
 
 func (h MigrationHandler) getAction(ctx context.Context, vd *virtv2.VirtualDisk) (action, error) {
-	currentlyMountedVM := currentlyMountedVM(vd)
+	currentlyMountedVM := commonvd.CurrentlyMountedVM(vd)
 	if currentlyMountedVM == "" {
 		return none, nil
 	}

images/virtualization-artifact/pkg/controller/vd/internal/supplements/pvc.go

@@ -1,3 +1,19 @@
+/*
+Copyright 2025 Flant JSC
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 package supplements
 
 import "github.com/deckhouse/virtualization/api/core/v1alpha2"

images/virtualization-artifact/pkg/controller/vd/vd_controller.go

@@ -28,15 +28,13 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/metrics"
 
 	"github.com/deckhouse/deckhouse/pkg/log"
-
 	"github.com/deckhouse/virtualization-controller/pkg/config"
 	"github.com/deckhouse/virtualization-controller/pkg/controller/service"
 	"github.com/deckhouse/virtualization-controller/pkg/controller/vd/internal"
 	intsvc "github.com/deckhouse/virtualization-controller/pkg/controller/vd/internal/service"
 	"github.com/deckhouse/virtualization-controller/pkg/controller/vd/internal/source"
 	"github.com/deckhouse/virtualization-controller/pkg/dvcr"
 	"github.com/deckhouse/virtualization-controller/pkg/eventrecord"
-	"github.com/deckhouse/virtualization-controller/pkg/featuregates"
 	"github.com/deckhouse/virtualization-controller/pkg/logger"
 	vdcolelctor "github.com/deckhouse/virtualization-controller/pkg/monitoring/metrics/vd"
 	virtv2 "github.com/deckhouse/virtualization/api/core/v1alpha2"
@@ -79,7 +77,9 @@ func NewController(
 	sources.Set(virtv2.DataSourceTypeObjectRef, source.NewObjectRefDataSource(recorder, disk, mgr.GetClient()))
 	sources.Set(virtv2.DataSourceTypeUpload, source.NewUploadDataSource(recorder, stat, uploader, disk, dvcr, mgr.GetClient()))
 
-	handlers := []Handler{
+	reconciler := NewReconciler(
+		mgr.GetClient(),
+		internal.NewInitHandler(),
 		internal.NewStorageClassReadyHandler(scService),
 		internal.NewDatasourceReadyHandler(recorder, blank, sources),
 		internal.NewLifeCycleHandler(recorder, blank, sources, mgr.GetClient()),
@@ -88,15 +88,8 @@ func NewController(
 		internal.NewDeletionHandler(sources, mgr.GetClient()),
 		internal.NewStatsHandler(stat, importer, uploader),
 		internal.NewInUseHandler(mgr.GetClient()),
-	}
-	if featuregates.Default().Enabled(featuregates.VolumeMigration) {
-		handlers = append(handlers, internal.NewMigrationHandler(mgr.GetClient(), scService, disk))
-	}
-	handlers = append(handlers, internal.NewProtectionHandler())
-
-	reconciler := NewReconciler(
-		mgr.GetClient(),
-		handlers...,
+		internal.NewMigrationHandler(mgr.GetClient(), scService, disk),
+		internal.NewProtectionHandler(),
 	)
 
 	vdController, err := controller.New(ControllerName, mgr, controller.Options{