Merge pull request #349 from jeff-roche/lvm-ext4

OCPVE-300: fix: added validation around fstype
openshift · May 25, 2023 · 0c57987 · 0c57987
2 parents 9376f90 + 58056ca
commit 0c57987
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 0 deletions.
diff --git a/api/v1alpha1/lvmcluster_types.go b/api/v1alpha1/lvmcluster_types.go
@@ -97,6 +97,8 @@ type DeviceClass struct {
 	Default bool `json:"default,omitempty"`
 
 	// FilesystemType sets the filesystem the device should use
+	// +kubebuilder:validation:Enum=xfs;ext4;""
+	// +kubebuilder:default=xfs
 	// +optional
 	FilesystemType DeviceFilesystemType `json:"fstype,omitempty"`
 }

diff --git a/api/v1alpha1/lvmcluster_webhook.go b/api/v1alpha1/lvmcluster_webhook.go
@@ -68,6 +68,11 @@ func (l *LVMCluster) ValidateCreate() error {
 		return err
 	}
 
+	err = l.verifyFstype()
+	if err != nil {
+		return err
+	}
+
 	return nil
 }
 
@@ -95,6 +100,11 @@ func (l *LVMCluster) ValidateUpdate(old runtime.Object) error {
 		return err
 	}
 
+	err = l.verifyFstype()
+	if err != nil {
+		return err
+	}
+
 	oldLVMCluster, ok := old.(*LVMCluster)
 	if !ok {
 		return fmt.Errorf("Failed to parse LVMCluster.")
@@ -294,3 +304,13 @@ func (l *LVMCluster) getThinPoolsConfigOfDeviceClass(deviceClassName string) (*T
 
 	return nil, ErrDeviceClassNotFound
 }
+
+func (l *LVMCluster) verifyFstype() error {
+	for _, deviceClass := range l.Spec.Storage.DeviceClasses {
+		if deviceClass.FilesystemType != FilesystemTypeExt4 && deviceClass.FilesystemType != FilesystemTypeXFS {
+			return fmt.Errorf("fstype '%s' is not a supported filesystem type", deviceClass.FilesystemType)
+		}
+	}
+
+	return nil
+}
diff --git a/bundle/manifests/lvm.topolvm.io_lvmclusters.yaml b/bundle/manifests/lvm.topolvm.io_lvmclusters.yaml
@@ -66,8 +66,13 @@ spec:
                               type: array
                           type: object
                         fstype:
+                          default: xfs
                           description: FilesystemType sets the filesystem the device
                             should use
+                          enum:
+                          - xfs
+                          - ext4
+                          - ""
                           type: string
                         name:
                           description: 'Name of the class, the VG and possibly the

diff --git a/config/crd/bases/lvm.topolvm.io_lvmclusters.yaml b/config/crd/bases/lvm.topolvm.io_lvmclusters.yaml
@@ -64,8 +64,13 @@ spec:
                               type: array
                           type: object
                         fstype:
+                          default: xfs
                           description: FilesystemType sets the filesystem the device
                             should use
+                          enum:
+                          - xfs
+                          - ext4
+                          - ""
                           type: string
                         name:
                           description: 'Name of the class, the VG and possibly the