impl

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

Author: yaroslavborbat

api/core/v1alpha2/vdcondition/condition.go

@@ -155,6 +155,8 @@ the `InUse` condition's reason to `AttachedToVirtualMachine`.
 const (
 	// UsedForImageCreation indicates that the VirtualDisk is used for create image.
 	UsedForImageCreation InUseReason = "UsedForImageCreation"
+	// UsedForDataExport indicates that the VirtualDisk is used for data export.
+	UsedForDataExport InUseReason = "UsedForDataExport"
 	// AttachedToVirtualMachine indicates that the VirtualDisk is attached to VirtualMachine.
 	AttachedToVirtualMachine InUseReason = "AttachedToVirtualMachine"
 	// NotInUse indicates that VirtualDisk free for use.

api/core/v1alpha2/vdscondition/condition.go

@@ -65,6 +65,8 @@ const (
 	FileSystemFreezing VirtualDiskSnapshotReadyReason = "FileSystemFreezing"
 	// Snapshotting signifies that the `VirtualDiskSnapshot` resource is in the process of taking a snapshot of the virtual disk.
 	Snapshotting VirtualDiskSnapshotReadyReason = "Snapshotting"
+	// Exporting signifies that the `VirtualDiskSnapshot` resource is in the process of exporting the snapshot to a persistent volume claim.
+	Exporting VirtualDiskSnapshotReadyReason = "Exporting"
 	// VirtualDiskSnapshotReady signifies that the snapshot process is complete and the `VirtualDiskSnapshot` is ready for use.
 	VirtualDiskSnapshotReady VirtualDiskSnapshotReadyReason = "VirtualDiskSnapshotReady"
 	// VirtualDiskSnapshotFailed signifies that the snapshot process has failed.

api/core/v1alpha2/virtual_disk.go

@@ -196,8 +196,9 @@ type VirtualDiskList struct {
 // * `Resizing`: The process of resource resizing is in progress.
 // * `Failed`: There was an error when creating the resource.
 // * `PVCLost`: The child PVC of the resource is missing. The resource cannot be used.
+// * `Exporting`: The child PV of the resource is in the process of exporting.
 // * `Terminating`: The resource is being deleted.
-// +kubebuilder:validation:Enum:={Pending,Provisioning,WaitForUserUpload,WaitForFirstConsumer,Ready,Resizing,Failed,PVCLost,Terminating}
+// +kubebuilder:validation:Enum:={Pending,Provisioning,WaitForUserUpload,WaitForFirstConsumer,Ready,Resizing,Failed,PVCLost,Exporting,Terminating}
 type DiskPhase string
 
 const (
@@ -209,5 +210,6 @@ const (
 	DiskResizing             DiskPhase = "Resizing"
 	DiskFailed               DiskPhase = "Failed"
 	DiskLost                 DiskPhase = "PVCLost"
+	DiskExporting            DiskPhase = "Exporting"
 	DiskTerminating          DiskPhase = "Terminating"
 )

crds/doc-ru-virtualdisks.yaml

@@ -199,6 +199,7 @@ spec:
                     * `Resizing` — идёт процесс увеличения размера диска;
                     * `Failed` — при создании ресурса произошла ошибка;
                     * `PVCLost` — дочерний PVC ресурса отсутствует. Ресурс не может быть использован;
+                    * `Exporting` - дочерний PV ресурс находится в процессе экспорта;
                     * `Terminating` - ресурс находится в процессе удаления.
                 progress:
                   description: |

crds/virtualdisks.yaml

@@ -381,6 +381,7 @@ spec:
                     * `Resizing`: The process of resource resizing is in progress.
                     * `Failed`: There was an error when creating the resource.
                     * `PVCLost`: The child PVC of the resource is missing. The resource cannot be used.
+                    * `Exporting`: The child PV of the resource is in the process of exporting.
                     * `Terminating`: The resource is being deleted.
                   enum:
                     - Pending
@@ -391,6 +392,7 @@ spec:
                     - Resizing
                     - Failed
                     - PVCLost
+                    - Exporting
                     - Terminating
                   type: string
                 progress:

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

@@ -125,8 +125,19 @@ const (
 	// AnnNodeCpuFeature is the Kubevirt annotation for CPU feature.
 	AnnNodeCPUFeature = "cpu-feature.node.virtualization.deckhouse.io/"
 
-	// AnnExportInProgress is the annotation for indicating that export is in progress.
-	AnnExportInProgress = "storage.deckhouse.io/export-in-progress"
+	// AnnDataExportRequest is the annotation for indicating that export requested.
+	AnnDataExportRequest = "storage.deckhouse.io/data-export-request"
+
+	// TODO: remove deprecated annotations in the v1 version.
+	// AnnStorageClassName is the annotation for indicating that storage class name. (USED IN STORAGE)
+	AnnStorageClassName           = AnnAPIGroupV + "/storage-class-name"
+	AnnStorageClassNameDeprecated = "storageClass"
+	// AnnVolumeMode is the annotation for indicating that volume mode.  (USED IN STORAGE)
+	AnnVolumeMode           = AnnAPIGroupV + "/volume-mode"
+	AnnVolumeModeDeprecated = "volumeMode"
+	// AnnAccessMode is the annotation for indicating that access mode.  (USED IN STORAGE)
+	AnnAccessModes           = AnnAPIGroupV + "/access-mode"
+	AnnAccessModesDeprecated = "accessModes"
 
 	// AppLabel is the app name label.
 	AppLabel = "app"

images/virtualization-artifact/pkg/controller/cvi/internal/source/object_ref_vdsnapshot.go

@@ -132,9 +132,20 @@ func (ds ObjectRefVirtualDiskSnapshot) Sync(ctx context.Context, cvi *virtv2.Clu
 
 		pvcKey := supplements.NewGenerator(annotations.CVIShortName, cvi.Name, cvi.Spec.DataSource.ObjectRef.Namespace, cvi.UID).PersistentVolumeClaim()
 
-		storageClassName := vs.Annotations["storageClass"]
-		volumeMode := vs.Annotations["volumeMode"]
-		accessModesStr := strings.Split(vs.Annotations["accessModes"], ",")
+		storageClassName := vs.Annotations[annotations.AnnStorageClassName]
+		if storageClassName == "" {
+			storageClassName = vs.Annotations[annotations.AnnStorageClassNameDeprecated]
+		}
+		volumeMode := vs.Annotations[annotations.AnnVolumeMode]
+		if volumeMode == "" {
+			volumeMode = vs.Annotations[annotations.AnnVolumeModeDeprecated]
+		}
+		accessModesRaw := vs.Annotations[annotations.AnnAccessModes]
+		if accessModesRaw == "" {
+			accessModesRaw = vs.Annotations[annotations.AnnAccessModesDeprecated]
+		}
+
+		accessModesStr := strings.Split(accessModesRaw, ",")
 		accessModes := make([]corev1.PersistentVolumeAccessMode, 0, len(accessModesStr))
 		for _, accessModeStr := range accessModesStr {
 			accessModes = append(accessModes, corev1.PersistentVolumeAccessMode(accessModeStr))

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

@@ -20,7 +20,6 @@ import (
 	"context"
 	"fmt"
 	"slices"
-	"time"
 
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -30,6 +29,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"
 	"github.com/deckhouse/virtualization-controller/pkg/controller/conditions"
 	virtv2 "github.com/deckhouse/virtualization/api/core/v1alpha2"
@@ -49,59 +49,50 @@ func NewInUseHandler(client client.Client) *InUseHandler {
 }
 
 func (h InUseHandler) Handle(ctx context.Context, vd *virtv2.VirtualDisk) (reconcile.Result, error) {
-	inUseCondition, ok := conditions.GetCondition(vdcondition.InUseType, vd.Status.Conditions)
-	if !ok {
-		cb := conditions.NewConditionBuilder(vdcondition.InUseType).
-			Status(metav1.ConditionUnknown).
-			Reason(conditions.ReasonUnknown).
-			Generation(vd.Generation)
-		conditions.SetCondition(cb, &vd.Status.Conditions)
-		inUseCondition = cb.Condition()
-	}
-
 	err := h.updateAttachedVirtualMachines(ctx, vd)
 	if err != nil {
 		return reconcile.Result{}, err
 	}
 
-	usedByVM, usedByImage := false, false
+	var (
+		usedByVM         bool
+		usedByImage      bool
+		usedByDataExport bool
+	)
 
-	if inUseCondition.Reason != vdcondition.UsedForImageCreation.String() {
-		usedByVM = h.checkUsageByVM(vd)
-
-		if !usedByVM {
-			usedByImage, err = h.checkImageUsage(ctx, vd)
-			if err != nil {
-				return reconcile.Result{}, err
-			}
-		}
-	} else {
+	usedByVM = h.checkUsageByVM(vd)
+	if !usedByVM {
 		usedByImage, err = h.checkImageUsage(ctx, vd)
 		if err != nil {
 			return reconcile.Result{}, err
 		}
-
-		if !usedByImage {
-			usedByVM = h.checkUsageByVM(vd)
+	}
+	if !usedByVM && !usedByImage {
+		usedByDataExport, err = h.checkDataExportUsage(ctx, vd)
+		if err != nil {
+			return reconcile.Result{}, err
 		}
 	}
 
-	cb := conditions.NewConditionBuilder(vdcondition.InUseType)
+	cb := conditions.NewConditionBuilder(vdcondition.InUseType).Generation(vd.Generation)
 	switch {
 	case usedByVM:
-		cb.Generation(vd.Generation).
+		cb.
 			Status(metav1.ConditionTrue).
 			Reason(vdcondition.AttachedToVirtualMachine).
-			Message("").
-			LastTransitionTime(time.Now())
+			Message("")
 	case usedByImage:
-		cb.Generation(vd.Generation).
+		cb.
 			Status(metav1.ConditionTrue).
 			Reason(vdcondition.UsedForImageCreation).
-			Message("").
-			LastTransitionTime(time.Now())
+			Message("")
+	case usedByDataExport:
+		cb.
+			Status(metav1.ConditionTrue).
+			Reason(vdcondition.UsedForDataExport).
+			Message("")
 	default:
-		cb.Generation(vd.Generation).
+		cb.
 			Status(metav1.ConditionFalse).
 			Reason(vdcondition.NotInUse).
 			Message("")
@@ -121,6 +112,23 @@ func (h InUseHandler) isVDAttachedToVM(vdName string, vm virtv2.VirtualMachine)
 	return false
 }
 
+func (h InUseHandler) checkDataExportUsage(ctx context.Context, vd *virtv2.VirtualDisk) (bool, error) {
+	pvcName := vd.Status.Target.PersistentVolumeClaim
+	if pvcName == "" {
+		return false, nil
+	}
+
+	pvc, err := object.FetchObject(ctx, types.NamespacedName{Name: pvcName, Namespace: vd.Namespace}, h.client, &corev1.PersistentVolumeClaim{})
+	if err != nil {
+		return false, fmt.Errorf("fetch pvc: %w", err)
+	}
+	if pvc == nil {
+		return false, nil
+	}
+
+	return pvc.GetAnnotations()[annotations.AnnDataExportRequest] == "true", nil
+}
+
 func (h InUseHandler) checkImageUsage(ctx context.Context, vd *virtv2.VirtualDisk) (bool, error) {
 	// If disk is not ready, it cannot be used for create image
 	if vd.Status.Phase != virtv2.DiskReady {

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

@@ -18,17 +18,18 @@ package internal
 
 import (
 	"context"
-	"time"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
 	virtv1 "kubevirt.io/api/core/v1"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 
+	"github.com/deckhouse/virtualization-controller/pkg/common/annotations"
 	"github.com/deckhouse/virtualization-controller/pkg/controller/conditions"
 	virtv2 "github.com/deckhouse/virtualization/api/core/v1alpha2"
 	"github.com/deckhouse/virtualization/api/core/v1alpha2/vdcondition"
@@ -602,7 +603,6 @@ var _ = Describe("InUseHandler", func() {
 
 	Context("when VirtualDisk is used by VirtualMachine after create image", func() {
 		It("must set status True and reason AllowedForVirtualMachineUsage", func() {
-			startTime := metav1.Time{Time: time.Now()}
 			vd := &virtv2.VirtualDisk{
 				ObjectMeta: metav1.ObjectMeta{
 					Name:      "test-vd",
@@ -611,10 +611,9 @@ var _ = Describe("InUseHandler", func() {
 				Status: virtv2.VirtualDiskStatus{
 					Conditions: []metav1.Condition{
 						{
-							Type:               vdcondition.InUseType.String(),
-							Reason:             vdcondition.UsedForImageCreation.String(),
-							Status:             metav1.ConditionTrue,
-							LastTransitionTime: startTime,
+							Type:   vdcondition.InUseType.String(),
+							Reason: vdcondition.UsedForImageCreation.String(),
+							Status: metav1.ConditionTrue,
 						},
 					},
 				},
@@ -647,7 +646,6 @@ var _ = Describe("InUseHandler", func() {
 			Expect(cond).ToNot(BeNil())
 			Expect(cond.Status).To(Equal(metav1.ConditionTrue))
 			Expect(cond.Reason).To(Equal(vdcondition.AttachedToVirtualMachine.String()))
-			Expect(cond.LastTransitionTime).ToNot(Equal(startTime))
 		})
 	})
 
@@ -767,4 +765,44 @@ var _ = Describe("InUseHandler", func() {
 			Expect(cond.Reason).To(Equal(vdcondition.NotInUse.String()))
 		})
 	})
+	Context("when VirtualDisk is used by DataExport", func() {
+		It("must set status True and reason UsedForDataExport", func() {
+			vd := &virtv2.VirtualDisk{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      "test-vd",
+					Namespace: "default",
+				},
+				Status: virtv2.VirtualDiskStatus{
+					Conditions: []metav1.Condition{},
+					Target: virtv2.DiskTarget{
+						PersistentVolumeClaim: "test-pvc",
+					},
+				},
+			}
+			pvc := &corev1.PersistentVolumeClaim{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      "test-pvc",
+					Namespace: "default",
+					Annotations: map[string]string{
+						annotations.AnnDataExportRequest: "true",
+					},
+				},
+				Status: corev1.PersistentVolumeClaimStatus{
+					Phase: corev1.ClaimBound,
+				},
+			}
+
+			k8sClient := fake.NewClientBuilder().WithScheme(scheme).WithObjects(vd, pvc).Build()
+			handler = NewInUseHandler(k8sClient)
+
+			result, err := handler.Handle(ctx, vd)
+			Expect(err).ToNot(HaveOccurred())
+			Expect(result).To(Equal(ctrl.Result{}))
+
+			cond, _ := conditions.GetCondition(vdcondition.InUseType, vd.Status.Conditions)
+			Expect(cond).ToNot(BeNil())
+			Expect(cond.Status).To(Equal(metav1.ConditionTrue))
+			Expect(cond.Reason).To(Equal(vdcondition.UsedForDataExport.String()))
+		})
+	})
 })

images/virtualization-artifact/pkg/controller/vd/internal/source/sources.go

@@ -113,11 +113,12 @@ func setPhaseConditionForFinishedDisk(
 			Reason(vdcondition.Lost).
 			Message(fmt.Sprintf("PVC %s not found.", supgen.PersistentVolumeClaim().String()))
 	case pvc.Status.Phase == corev1.ClaimLost:
-		newPhase = virtv2.DiskLost
 		cb.Status(metav1.ConditionFalse)
-		if pvc.GetAnnotations()[annotations.AnnExportInProgress] == "true" {
+		if pvc.GetAnnotations()[annotations.AnnDataExportRequest] == "true" {
+			newPhase = virtv2.DiskExporting
 			cb.Reason(vdcondition.Exporting).Message("PV is being exported")
 		} else {
+			newPhase = virtv2.DiskLost
 			cb.Reason(vdcondition.Lost).Message(fmt.Sprintf("PV %s not found.", pvc.Spec.VolumeName))
 		}
 	default: