feat(vd): override virtualdisk's pvc parameters via StorageClass anno…

…tations (#351) Signed-off-by: yaroslavborbat <[email protected]> Signed-off-by: Valeriy Khorunzhin <[email protected]>
deckhouse · Sep 18, 2024 · e1c7c49 · e1c7c49
1 parent f92ea76
commit e1c7c49
Show file tree

Hide file tree

Showing 3 changed files with 71 additions and 3 deletions.
diff --git a/images/virtualization-artifact/pkg/controller/common/util.go b/images/virtualization-artifact/pkg/controller/common/util.go
@@ -177,6 +177,12 @@ const (
 	// AnnImmediateBinding provides a const to indicate whether immediate binding should be performed on the PV (overrides global config)
 	AnnImmediateBinding = AnnAPIGroup + "/storage.bind.immediate.requested"
 
+	AnnAPIGroupV              = "virtualization.deckhouse.io"
+	AnnVirtualDisk            = "virtualdisk." + AnnAPIGroupV
+	AnnVirtualDiskVolumeMode  = AnnVirtualDisk + "/volume-mode"
+	AnnVirtualDiskAccessMode  = AnnVirtualDisk + "/access-mode"
+	AnnVirtualDiskBindingMode = AnnVirtualDisk + "/binding-mode"
+
 	// AnnSelectedNode annotation is added to a PVC that has been triggered by scheduler to
 	// be dynamically provisioned. Its value is the name of the selected node.
 	AnnSelectedNode = "volume.kubernetes.io/selected-node"

diff --git a/images/virtualization-artifact/pkg/controller/kvbuilder/dv.go b/images/virtualization-artifact/pkg/controller/kvbuilder/dv.go
@@ -68,6 +68,10 @@ func (b *DV) SetPVC(storageClassName *string,
 	)
 }
 
+func (b *DV) SetImmediate() {
+	b.AddAnnotation("cdi.kubevirt.io/storage.bind.immediate.requested", "true")
+}
+
 func (b *DV) SetDataSource(source *cdiv1.DataVolumeSource) {
 	b.Resource.Spec.Source = source
 }

diff --git a/images/virtualization-artifact/pkg/controller/service/disk_service.go b/images/virtualization-artifact/pkg/controller/service/disk_service.go
@@ -76,13 +76,36 @@ func (s DiskService) Start(
 	dvBuilder.SetDataSource(source)
 	dvBuilder.SetOwnerRef(obj, obj.GroupVersionKind())
 
+	sc, err := s.GetStorageClass(ctx, storageClass)
+	if err != nil {
+		return err
+	}
+
+	var (
+		accessMode corev1.PersistentVolumeAccessMode
+		volumeMode corev1.PersistentVolumeMode
+	)
+
 	sprofile, err := s.GetStorageProfile(ctx, storageClass)
 	if err != nil {
 		return err
 	}
-	storageCaps := s.parseVolumeMode(sprofile.Status)
+	storageCaps := s.parseStorageCapabilities(sprofile.Status)
+	accessMode = storageCaps.AccessMode
+	volumeMode = storageCaps.VolumeMode
+
+	if m, override := s.parseVolumeMode(sc); override {
+		volumeMode = m
+	}
+	if m, override := s.parseAccessMode(sc); override {
+		accessMode = m
+	}
+
+	dvBuilder.SetPVC(ptr.To(sprofile.GetName()), pvcSize, accessMode, volumeMode)
 
-	dvBuilder.SetPVC(ptr.To(sprofile.GetName()), pvcSize, storageCaps.AccessMode, storageCaps.VolumeMode)
+	if s.parseImmediateBindingMode(sc) {
+		dvBuilder.SetImmediate()
+	}
 
 	err = s.client.Create(ctx, dvBuilder.GetResource())
 	if err != nil && !k8serrors.IsAlreadyExists(err) {
@@ -296,7 +319,42 @@ func getAccessModeMax(modes []corev1.PersistentVolumeAccessMode) corev1.Persiste
 	return m
 }
 
-func (s DiskService) parseVolumeMode(status cdiv1.StorageProfileStatus) StorageCapabilities {
+func (s DiskService) parseVolumeMode(sc *storev1.StorageClass) (corev1.PersistentVolumeMode, bool) {
+	if sc == nil {
+		return "", false
+	}
+	switch sc.GetAnnotations()[common.AnnVirtualDiskVolumeMode] {
+	case string(corev1.PersistentVolumeBlock):
+		return corev1.PersistentVolumeBlock, true
+	case string(corev1.PersistentVolumeFilesystem):
+		return corev1.PersistentVolumeFilesystem, true
+	default:
+		return "", false
+	}
+}
+
+func (s DiskService) parseAccessMode(sc *storev1.StorageClass) (corev1.PersistentVolumeAccessMode, bool) {
+	if sc == nil {
+		return "", false
+	}
+	switch sc.GetAnnotations()[common.AnnVirtualDiskAccessMode] {
+	case string(corev1.ReadWriteOnce):
+		return corev1.ReadWriteOnce, true
+	case string(corev1.ReadWriteMany):
+		return corev1.ReadWriteMany, true
+	default:
+		return "", false
+	}
+}
+
+func (s DiskService) parseImmediateBindingMode(sc *storev1.StorageClass) bool {
+	if sc == nil {
+		return false
+	}
+	return sc.GetAnnotations()[common.AnnVirtualDiskBindingMode] == string(storev1.VolumeBindingImmediate)
+}
+
+func (s DiskService) parseStorageCapabilities(status cdiv1.StorageProfileStatus) StorageCapabilities {
 	var storageCapabilities []StorageCapabilities
 	for _, cp := range status.ClaimPropertySets {
 		var mode corev1.PersistentVolumeMode