added lvm_storage_class_watcher.go

Signed-off-by: Viktor Kramarenko <viktor.kramarenko@flant.com>
deckhouse · Feb 15, 2024 · e15a86c · e15a86c
1 parent c6ef82a
commit e15a86c
Show file tree

Hide file tree

Showing 3 changed files with 268 additions and 37 deletions.
diff --git a/crds/lvmstorageclass.yaml b/crds/lvmstorageclass.yaml
@@ -1,7 +1,7 @@
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
-  name: drbdstorageclasses.storage.deckhouse.io
+  name: lvmstorageclasses.storage.deckhouse.io
   labels:
     heritage: deckhouse
     module: sds-lvm
@@ -34,14 +34,15 @@ spec:
               required:
                 - type
                 - reclaimPolicy
-                - volumeBindingMode
                 - lvmVolumeGroups
               properties:
                 isDefault:
                   type: boolean
                   default: false
                   description: |
                     Should this Storage class be used as default.
+                    
+                    > Note that the default value is false.
                 type:
                   type: string
                   x-kubernetes-validations:
@@ -73,24 +74,19 @@ spec:
                     The Storage class's binding mode. Might be:
                     - Immediate (creates a PV as a PVC requested)
                     - WaitForFirstConsumer (creates a PV after a Pod consumes PVC)
-                    > Note that default volumeBindingMode is 'WaitForFirstConsumer'.
                   enum:
                     - Immediate
                     - WaitForFirstConsumer
-                  default: 'WaitForFirstConsumer'
                 allowVolumeExpansion:
                   type: boolean
                   x-kubernetes-validations:
                     - rule: self == oldSelf
                       message: Value is immutable.
                   description: | 
                     Configure if Persistent Volume is going to be expandable.
-                  default: true
                 lvmVolumeGroups:
                   type: array
-                  x-kubernetes-validations:
-                    - rule: self >= oldSelf
-                      message: You can only add LVMVolumeGroups.
+                  x-kubernetes-list-type: atomic
                   description: |
                     LVMVolumeGroup resources where Persistent Volume will be create on.
                   items:
@@ -107,11 +103,10 @@ spec:
                         properties:
                           poolName:
                             type: string
-                            x-kubernetes-validations:
-                              - rule: (has(self.type == "LVMThin") && self.lvmVolumeGroups.thin.poolName != "")
-                                message: You should select ThinPool for LVMThin device type.
                             description: |
                               The name of the thin pool.
+                            minLength: 1
+                            pattern: ^.*$
             status:
               type: object
               description: |

diff --git a/images/sds-lvm-controller/api/v1alpha1/lvm_storage_class.go b/images/sds-lvm-controller/api/v1alpha1/lvm_storage_class.go
@@ -47,8 +47,8 @@ type LvmStorageClassStatus struct {
 }
 
 type LvmStorageClassLVG struct {
-	Name string                  `json:"name"`
-	Thin LvmStorageClassThinPool `json:"thin"`
+	Name string                   `json:"name"`
+	Thin *LvmStorageClassThinPool `json:"thin,omitempty"`
 }
 
 type LvmStorageClassThinPool struct {