refactoring for lsc-controller

Signed-off-by: Aleksandr Zimin <alexandr.zimin@flant.com>
deckhouse · May 1, 2024 · 6f6264d · 6f6264d
1 parent d310021
commit 6f6264d
Show file tree

Hide file tree

Showing 5 changed files with 178 additions and 257 deletions.
diff --git a/crds/localstorageclass.yaml b/crds/localstorageclass.yaml
@@ -29,29 +29,13 @@ spec:
           properties:
             spec:
               type: object
-              x-kubernetes-validations:
-                - rule: "!has(self.fileSystem)"
-                  message: "The 'fileSystem' field is not supported yet and cannot be used."
-                - rule: has(self.lvm) == has(oldSelf.lvm) && has(self.fileSystem) == has(oldSelf.fileSystem)
-                  message: "Modification error: Once defined, 'lvm' or 'fileSystem' configuration cannot be replaced or removed. Ensure the existing storage configuration type is maintained."
               description: |
                 Defines a Kubernetes Storage class configuration.
               required:
                 - reclaimPolicy
                 - volumeBindingMode
-              oneOf:
-                - required:
-                    - lvm
-                - required:
-                    - fileSystem
+                - lvm
               properties:
-                isDefault:
-                  type: boolean
-                  default: false
-                  description: |
-                    Should this Storage class be used as default.
-                    
-                    > Note that the default value is false.
                 reclaimPolicy:
                   type: string
                   x-kubernetes-validations:
@@ -120,16 +104,6 @@ spec:
                                   The name of the thin pool.
                                 minLength: 1
                                 pattern: ^.*$
-                fileSystem:
-                  type: object
-                  x-kubernetes-validations:
-                    - rule: self == oldSelf
-                      message: Value is immutable.
-                  required:
-                    - localPath
-                  properties:
-                    localPath:
-                      type: string
             status:
               type: object
               description: |
@@ -152,9 +126,6 @@ spec:
         - jsonPath: .status.phase
           name: Phase
           type: string
-        - jsonPath: .spec.isDefault
-          name: isDefault
-          type: boolean
         - jsonPath: .status.reason
           name: Reason
           type: string

diff --git a/images/sds-local-volume-controller/api/v1alpha1/local_storage_class.go b/images/sds-local-volume-controller/api/v1alpha1/local_storage_class.go
@@ -33,7 +33,6 @@ type LocalStorageClassList struct {
 }
 
 type LocalStorageClassSpec struct {
-	IsDefault         bool                  `json:"isDefault"`
 	ReclaimPolicy     string                `json:"reclaimPolicy"`
 	VolumeBindingMode string                `json:"volumeBindingMode"`
 	LVM               *LocalStorageClassLVM `json:"lvm,omitempty"`