fix

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

Author: yaroslavborbat

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

@@ -166,6 +166,9 @@ func (h MigrationHandler) handleMigrate(ctx context.Context, vd *virtv2.VirtualD
 		return nil
 	}
 
+	// Reset migration info
+	vd.Status.MigrationInfo = virtv2.VirtualDiskMigrationInfo{}
+
 	var targetStorageClass *storev1.StorageClass
 	var err error
 

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

@@ -154,9 +154,9 @@ func (h *MigratingHandler) syncMigrating(ctx context.Context, s state.VirtualMac
 			var notReadyToMigrateDisks []string
 			targetPVCNames := make(map[string]struct{})
 			for _, vd := range nonMigratableVirtualDisks {
-				// if target pvc is set, it means that the disk is ready to be migrated
-				// after the migration is finished, target pvc will be removed and set to .status.target.persistentVolumeClaim
-				if vd.Status.MigrationInfo.TargetPVC == "" {
+				// if target pvc is set, it means that the disk is ready to be migrated,
+				// but if end timestamp is set, it means that TargetPVC is old, and we should wait new one.
+				if vd.Status.MigrationInfo.TargetPVC == "" || !vd.Status.MigrationInfo.EndTimestamp.IsZero() {
 					notReadyToMigrateDisks = append(notReadyToMigrateDisks, vd.Name)
 				}
 				targetPVCNames[vd.Status.MigrationInfo.TargetPVC] = struct{}{}