fix

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

Author: yaroslavborbat

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

@@ -28,13 +28,15 @@ 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"
@@ -77,8 +79,7 @@ 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()))
 
-	reconciler := NewReconciler(
-		mgr.GetClient(),
+	handlers := []Handler{
 		internal.NewStorageClassReadyHandler(scService),
 		internal.NewDatasourceReadyHandler(recorder, blank, sources),
 		internal.NewLifeCycleHandler(recorder, blank, sources, mgr.GetClient()),
@@ -87,8 +88,15 @@ func NewController(
 		internal.NewDeletionHandler(sources, mgr.GetClient()),
 		internal.NewStatsHandler(stat, importer, uploader),
 		internal.NewInUseHandler(mgr.GetClient()),
-		internal.NewMigrationHandler(mgr.GetClient(), scService, disk),
-		internal.NewProtectionHandler(),
+	}
+	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...,
 	)
 
 	vdController, err := controller.New(ControllerName, mgr, controller.Options{

images/virtualization-artifact/pkg/controller/vmop/migration/internal/handler/lifecycle.go

@@ -33,6 +33,7 @@ import (
 	"github.com/deckhouse/virtualization-controller/pkg/controller/vmop/migration/internal/service"
 	genericservice "github.com/deckhouse/virtualization-controller/pkg/controller/vmop/service"
 	"github.com/deckhouse/virtualization-controller/pkg/eventrecord"
+	"github.com/deckhouse/virtualization-controller/pkg/featuregates"
 	"github.com/deckhouse/virtualization-controller/pkg/livemigration"
 	"github.com/deckhouse/virtualization-controller/pkg/logger"
 	"github.com/deckhouse/virtualization/api/core/v1alpha2"
@@ -309,20 +310,22 @@ func (h LifecycleHandler) canExecute(vmop *v1alpha2.VirtualMachineOperation, vm
 		return true
 	}
 
-	if migratable.Reason == vmcondition.ReasonDisksNotMigratable.String() {
-		migrating, _ := conditions.GetCondition(vmcondition.TypeMigrating, vm.Status.Conditions)
-		if migrating.Reason == vmcondition.ReasonReadyToMigrate.String() {
-			return true
-		}
+	if featuregates.Default().Enabled(featuregates.VolumeMigration) {
+		if migratable.Reason == vmcondition.ReasonDisksNotMigratable.String() {
+			migrating, _ := conditions.GetCondition(vmcondition.TypeMigrating, vm.Status.Conditions)
+			if migrating.Reason == vmcondition.ReasonReadyToMigrate.String() {
+				return true
+			}
 
-		vmop.Status.Phase = v1alpha2.VMOPPhasePending
-		conditions.SetCondition(
-			conditions.NewConditionBuilder(vmopcondition.TypeCompleted).
-				Generation(vmop.GetGeneration()).
-				Reason(vmopcondition.ReasonWaitingForVirtualMachineToBeReadyToMigrate).
-				Status(metav1.ConditionFalse),
-			&vmop.Status.Conditions)
-		return false
+			vmop.Status.Phase = v1alpha2.VMOPPhasePending
+			conditions.SetCondition(
+				conditions.NewConditionBuilder(vmopcondition.TypeCompleted).
+					Generation(vmop.GetGeneration()).
+					Reason(vmopcondition.ReasonWaitingForVirtualMachineToBeReadyToMigrate).
+					Status(metav1.ConditionFalse),
+				&vmop.Status.Conditions)
+			return false
+		}
 	}
 
 	vmop.Status.Phase = v1alpha2.VMOPPhaseFailed