Revert "feat(vd): support filesystem mode (#300)" (#323)

This reverts commit 4b147f7. Signed-off-by: Pavel Tishkov <pavel.tishkov@flant.com>
deckhouse · Aug 30, 2024 · f04f53e · f04f53e
1 parent 0353618
commit f04f53e
Show file tree

Hide file tree

Showing 22 changed files with 149 additions and 617 deletions.
diff --git a/api/core/v1alpha2/vdcondition/condition.go b/api/core/v1alpha2/vdcondition/condition.go
@@ -59,8 +59,8 @@ const (
 	Provisioning ReadyReason = "Provisioning"
 	// ProvisioningNotStarted indicates that the provisioning process has not started yet.
 	ProvisioningNotStarted ReadyReason = "ProvisioningNotStarted"
-	// WaitingForFirstConsumer indicates that the provisioning has been suspended: a created and scheduled virtual machine is awaited.
-	WaitingForFirstConsumer ReadyReason = "WaitingForFirstConsumer"
+	// WaitForFirstConsumer indicates that the provisioning has been suspended: a created and scheduled virtual machine is awaited.
+	WaitForFirstConsumer ReadyReason = "WaitForFirstConsumer"
 	// ProvisioningFailed indicates that the provisioning process has failed.
 	ProvisioningFailed ReadyReason = "ProvisioningFailed"
 	// Ready indicates that the import process is complete and the `VirtualDisk` is ready for use.

diff --git a/api/core/v1alpha2/virtual_disk.go b/api/core/v1alpha2/virtual_disk.go
@@ -39,10 +39,18 @@ type VirtualDisk struct {
 }
 
 type VirtualDiskSpec struct {
+	BindingMode           *VirtualDiskBindingMode          `json:"bindingMode,omitempty"`
 	DataSource            *VirtualDiskDataSource           `json:"dataSource,omitempty"`
 	PersistentVolumeClaim VirtualDiskPersistentVolumeClaim `json:"persistentVolumeClaim"`
 }
 
+type VirtualDiskBindingMode string
+
+const (
+	VirtualDiskBindingModeWaitForFirstConsumer VirtualDiskBindingMode = "WaitForFirstConsumer"
+	VirtualDiskBindingModeImmediate            VirtualDiskBindingMode = "Immediate"
+)
+
 type VirtualDiskStatus struct {
 	DownloadSpeed             *StatusSpeed             `json:"downloadSpeed,omitempty"`
 	Capacity                  string                   `json:"capacity,omitempty"`

diff --git a/api/core/v1alpha2/zz_generated.deepcopy.go b/api/core/v1alpha2/zz_generated.deepcopy.go
diff --git a/api/pkg/apiserver/api/generated/openapi/zz_generated.openapi.go b/api/pkg/apiserver/api/generated/openapi/zz_generated.openapi.go
diff --git a/crds/doc-ru-virtualdisk.yaml b/crds/doc-ru-virtualdisk.yaml
@@ -10,6 +10,12 @@ spec:
           properties:
             spec:
               properties:
+                bindingMode:
+                  description: |
+                    Типы режимов привязки диска:
+
+                    * `WaitForFirstConsumer` — отложить создание диска до тех пор, пока использующая этот диск виртуальная машина не будет назначена на узел.
+                    * `Immediate` — начать создание диска, не дожидаясь создания виртуальной машины.
                 dataSource:
                   description: |
                     Тип источника, из которого будет создан диск. Если источник (.spec.dataSource) отсутствует, то будет создан пустой диск.

diff --git a/crds/virtualdisk.yaml b/crds/virtualdisk.yaml
@@ -38,6 +38,16 @@ spec:
               required:
                 - persistentVolumeClaim
               properties:
+                bindingMode:
+                  type: string
+                  enum:
+                    - "WaitForFirstConsumer"
+                    - "Immediate"
+                  description: |
+                    The types of disk binding modes are:
+
+                    * `WaitForFirstConsumer` — delay the provisioning of a disk until a `VirtualMachine` that uses the disk is scheduled.
+                    * `Immediate` — start creating the disk without waiting for the scheduling of the virtual machine.
                 persistentVolumeClaim:
                   type: object
                   description: |

diff --git a/images/cdi-artifact/patches/012-add-caps-for-deckhouse-provisioners.patch b/images/cdi-artifact/patches/012-add-caps-for-deckhouse-provisioners.patch
diff --git a/images/cdi-artifact/patches/013-support-converting-images-to-different-formats.patch b/images/cdi-artifact/patches/013-support-converting-images-to-different-formats.patch
diff --git a/images/cdi-artifact/patches/README.md b/images/cdi-artifact/patches/README.md
@@ -34,11 +34,3 @@ Do not manage DataVolume CRD with cdi-operator. Module will install this CRD usi
 #### `011-change-storage-class-for-scratch-pvc.patch`
 
 Set the storage class name for the scratch pvc from the original pvc that will own the scratch pvc, or set it to an empty value if not available.
-
-#### `012-add-caps-for-deckhouse-provisioners.patch`
-
-Add capabilities for deckhouse provisioners to cdi StorageProfile.
-
-#### `013-support-converting-images-to-different-formats.patch`
-
-Support for converting images to different formats.