fix

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

Author: yaroslavborbat

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

@@ -159,12 +159,21 @@ func (h MigrationHandler) getAction(ctx context.Context, vd *virtv2.VirtualDisk,
 	}
 
 	vmMigrating, _ := conditions.GetCondition(vmcondition.TypeMigrating, vm.Status.Conditions)
-	vmMigratable, _ := conditions.GetCondition(vmcondition.TypeMigratable, vm.Status.Conditions)
 	migratingPending := vmMigrating.Reason == vmcondition.ReasonMigratingPending.String()
-	disksNotMigratable := vmMigratable.Reason == vmcondition.ReasonDisksNotMigratable.String()
 
-	if migratingPending && disksNotMigratable {
-		return h.getActionIfDisksNotMigratable(ctx, vd, log)
+	if migratingPending {
+
+		vmMigratable, _ := conditions.GetCondition(vmcondition.TypeMigratable, vm.Status.Conditions)
+		disksNotMigratable := vmMigratable.Reason == vmcondition.ReasonDisksNotMigratable.String()
+
+		if disksNotMigratable {
+			return h.getActionIfDisksNotMigratable(ctx, vd, log)
+		}
+
+		if commonvd.StorageClassChanged(vd) {
+			return migrate, nil
+		}
+
 	}
 
 	return none, nil

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

@@ -19,6 +19,7 @@ package handler
 import (
 	"context"
 	"fmt"
+	"strings"
 
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -27,6 +28,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 
+	"github.com/deckhouse/virtualization-controller/pkg/common/annotations"
 	"github.com/deckhouse/virtualization-controller/pkg/common/object"
 	commonvmop "github.com/deckhouse/virtualization-controller/pkg/common/vmop"
 	"github.com/deckhouse/virtualization-controller/pkg/controller/conditions"
@@ -321,8 +323,10 @@ func (h LifecycleHandler) otherMigrationsAreInProgress(ctx context.Context, vmop
 }
 
 func (h LifecycleHandler) canExecute(vmop *v1alpha2.VirtualMachineOperation, vm *v1alpha2.VirtualMachine) bool {
+	isVolumeMigration := isVolumeMigration(vmop)
+
 	migratable, _ := conditions.GetCondition(vmcondition.TypeMigratable, vm.Status.Conditions)
-	if migratable.Status == metav1.ConditionTrue {
+	if migratable.Status == metav1.ConditionTrue && !isVolumeMigration {
 		return true
 	}
 
@@ -436,3 +440,7 @@ var mapMigrationPhaseToReason = map[virtv1.VirtualMachineInstanceMigrationPhase]
 	virtv1.MigrationSucceeded:   vmopcondition.ReasonOperationCompleted,
 	virtv1.MigrationFailed:      vmopcondition.ReasonOperationFailed,
 }
+
+func isVolumeMigration(vmop *v1alpha2.VirtualMachineOperation) bool {
+	return vmop != nil && vmop.GetAnnotations()[annotations.AnnVMOPVolumeMigration] == "true" && strings.HasPrefix(vmop.Name, "volume-migration-")
+}