init3

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

Author: yaroslavborbat

api/core/v1alpha2/virtual_disk.go

@@ -82,8 +82,6 @@ type VirtualDiskStatus struct {
 
 	// Migration information.
 	MigrationInfo VirtualDiskMigrationInfo `json:"migrationInfo,omitempty"`
-	// Migration requests.
-	MigrationRequests []VirtualDiskMigrationRequest `json:"migrationRequest,omitempty"`
 }
 
 // VirtualDisk statistics.
@@ -232,17 +230,3 @@ type VirtualDiskMigrationInfo struct {
 	StartTimestamp metav1.Time `json:"startTimestamp,omitempty"`
 	EndTimestamp   metav1.Time `json:"endTimestamp,omitempty"`
 }
-
-type VirtualDiskMigrationRequest struct {
-	Action           VirtualDiskMigrationRequestAction `json:"action"`
-	Requester        string                            `json:"requester"`
-	StorageClassName string                            `json:"storageClassName"`
-}
-
-type VirtualDiskMigrationRequestAction string
-
-const (
-	VirtualDiskMigrationRequestActionMigrate  VirtualDiskMigrationRequestAction = "migrate"
-	VirtualDiskMigrationRequestActionRevert   VirtualDiskMigrationRequestAction = "revert"
-	VirtualDiskMigrationRequestActionComplete VirtualDiskMigrationRequestAction = "complete"
-)

api/core/v1alpha2/vmcondition/condition.go

@@ -82,16 +82,22 @@ const (
 	ReasonRestartAwaitingVMClassChangesExist Reason = "RestartAwaitingVMClassChangesExist"
 	ReasonRestartNoNeed                      Reason = "NoNeedRestart"
 
-	ReasonMigratable    Reason = "VirtualMachineMigratable"
-	ReasonNotMigratable Reason = "VirtualMachineNotMigratable"
-
-	ReasonVmIsMigrating                  Reason = "VirtualMachineMigrating"
+	ReasonMigratable         Reason = "VirtualMachineMigratable"
+	ReasonNonMigratable      Reason = "VirtualMachineNonMigratable"
+	ReasonDisksNotMigratable Reason = "VirtualMachineDisksNotMigratable"
+
+	ReasonMigratingPending        Reason = "Pending"
+	ReasonMigratingReadyToMigrate Reason = "ReadyToMigrate"
+	ReasonMigratingInProgress     Reason = "InProgress"
+	ReasonVmIsMigrating           Reason = "VirtualMachineMigrating"
+	// TODO: remove it
 	ReasonVmIsNotMigrating               Reason = "VirtualMachineNotMigrating"
 	ReasonLastMigrationFinishedWithError Reason = "LastMigrationFinishedWithError"
-	ReasonVmIsNotRunning                 Reason = "VirtualMachineNotRunning"
-	ReasonVmIsRunning                    Reason = "VirtualMachineRunning"
-	ReasonInternalVirtualMachineError    Reason = "InternalVirtualMachineError"
-	ReasonPodNotStarted                  Reason = "PodNotStarted"
+
+	ReasonVmIsNotRunning              Reason = "VirtualMachineNotRunning"
+	ReasonVmIsRunning                 Reason = "VirtualMachineRunning"
+	ReasonInternalVirtualMachineError Reason = "InternalVirtualMachineError"
+	ReasonPodNotStarted               Reason = "PodNotStarted"
 
 	// 	ReasonFilesystemFrozen indicates that virtual machine's filesystem has been successfully frozen.
 	ReasonFilesystemFrozen Reason = "Frozen"

api/core/v1alpha2/vmopcondition/condition.go

@@ -80,6 +80,9 @@ const (
 	// ReasonOtherMigrationInProgress is a ReasonCompleted indicating that there are other migrations in progress.
 	ReasonOtherMigrationInProgress ReasonCompleted = "OtherMigrationInProgress"
 
+	// ReasonWaitingForVirtualMachineToBeReadyToMigrate is a ReasonCompleted indicating that the virtual machine is not ready to be migrated.
+	ReasonWaitingForVirtualMachineToBeReadyToMigrate ReasonCompleted = "WaitingForVirtualMachineToBeReadyToMigrate"
+
 	// ReasonOperationFailed is a ReasonCompleted indicating that operation has failed.
 	ReasonOperationFailed ReasonCompleted = "OperationFailed"
 

api/core/v1alpha2/zz_generated.deepcopy.go

@@ -391,22 +391,6 @@ spec:
                     - completed
                     - failed
                   type: object
-                migrationRequest:
-                  description: Migration requests.
-                  items:
-                    properties:
-                      action:
-                        type: string
-                      requester:
-                        type: string
-                      storageClassName:
-                        type: string
-                    required:
-                      - action
-                      - requester
-                      - storageClassName
-                    type: object
-                  type: array
                 observedGeneration:
                   description: Resource generation last processed by the controller.
                   format: int64

crds/virtualdisks.yaml

@@ -197,14 +197,20 @@ func ApplyVirtualMachineSpec(
 			// VirtualDisk is attached as a regular disk.
 
 			vd := vdByName[bd.Name]
+
+			pvcName := vd.Status.Target.PersistentVolumeClaim
+			if vd.Status.MigrationInfo.SourcePVC != "" {
+				pvcName = vd.Status.MigrationInfo.SourcePVC
+			}
+
 			// VirtualDisk doesn't have pvc yet: wait for pvc and reconcile again.
-			if vd.Status.Target.PersistentVolumeClaim == "" {
+			if pvcName == "" {
 				continue
 			}
 
 			name := GenerateVMDDiskName(bd.Name)
 			if err := kvvm.SetDisk(name, SetDiskOptions{
-				PersistentVolumeClaim: pointer.GetPointer(vd.Status.Target.PersistentVolumeClaim),
+				PersistentVolumeClaim: pointer.GetPointer(pvcName),
 				Serial:                GenerateSerialFromObject(vd),
 				BootOrder:             bootOrder,
 			}); err != nil {

images/virtualization-artifact/pkg/apiserver/api/generated/openapi/zz_generated.openapi.go

@@ -223,13 +223,7 @@ func (h InUseHandler) isVMActive(ctx context.Context, vm virtv2.VirtualMachine)
 }
 
 func (h InUseHandler) updateAttachedVirtualMachinesStatus(vd *virtv2.VirtualDisk, usageMap map[string]bool) {
-	var currentlyMountedVM string
-	for _, attachedVM := range vd.Status.AttachedToVirtualMachines {
-		if attachedVM.Mounted {
-			currentlyMountedVM = attachedVM.Name
-			break
-		}
-	}
+	currentlyMountedVM := currentlyMountedVM(vd)
 
 	attachedVMs := make([]virtv2.AttachedVirtualMachine, 0, len(usageMap))
 	setAnyToTrue := false
@@ -318,3 +312,14 @@ 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
+}