feat(zfs-localpv): add option for choosing between refquota and quota…

… on storageclass

Signed-off-by: cina_pm <[email protected]>

deploy/yamls/zfsrestore-crd.yaml

@@ -163,6 +163,14 @@ spec:
                   been provisioned.
                 minLength: 1
                 type: string
+              quotaType:
+                description: 'quotaType determines whether the dataset volume quota
+                  type is of type "quota" or "refquota". QuotaType can not be modified
+                  once volume has been provisioned. Default Value: quota.'
+                enum:
+                - quota
+                - refquota
+                type: string
               recordsize:
                 description: 'Specifies a suggested block size for files in the file
                   system. The size specified must be a power of two greater than or

deploy/yamls/zfssnapshot-crd.yaml

@@ -132,6 +132,14 @@ spec:
                   been provisioned.
                 minLength: 1
                 type: string
+              quotaType:
+                description: 'quotaType determines whether the dataset volume quota
+                  type is of type "quota" or "refquota". QuotaType can not be modified
+                  once volume has been provisioned. Default Value: quota.'
+                enum:
+                - quota
+                - refquota
+                type: string
               recordsize:
                 description: 'Specifies a suggested block size for files in the file
                   system. The size specified must be a power of two greater than or

deploy/yamls/zfsvolume-crd.yaml

@@ -158,6 +158,14 @@ spec:
                   been provisioned.
                 minLength: 1
                 type: string
+              quotaType:
+                description: 'quotaType determines whether the dataset volume quota
+                  type is of type "quota" or "refquota". QuotaType can not be modified
+                  once volume has been provisioned. Default Value: quota.'
+                enum:
+                - quota
+                - refquota
+                type: string
               recordsize:
                 description: 'Specifies a suggested block size for files in the file
                   system. The size specified must be a power of two greater than or

deploy/zfs-operator.yaml

@@ -179,6 +179,14 @@ spec:
                   been provisioned.
                 minLength: 1
                 type: string
+              quotaType:
+                description: 'quotaType determines whether the dataset volume quota
+                  type is of type "quota" or "refquota". QuotaType can not be modified
+                  once volume has been provisioned. Default Value: quota.'
+                enum:
+                - quota
+                - refquota
+                type: string
               recordsize:
                 description: 'Specifies a suggested block size for files in the file
                   system. The size specified must be a power of two greater than or
@@ -602,6 +610,14 @@ spec:
                   been provisioned.
                 minLength: 1
                 type: string
+              quotaType:
+                description: 'quotaType determines whether the dataset volume quota
+                  type is of type "quota" or "refquota". QuotaType can not be modified
+                  once volume has been provisioned. Default Value: quota.'
+                enum:
+                - quota
+                - refquota
+                type: string
               recordsize:
                 description: 'Specifies a suggested block size for files in the file
                   system. The size specified must be a power of two greater than or
@@ -1132,6 +1148,14 @@ spec:
                   been provisioned.
                 minLength: 1
                 type: string
+              quotaType:
+                description: 'quotaType determines whether the dataset volume quota
+                  type is of type "quota" or "refquota". QuotaType can not be modified
+                  once volume has been provisioned. Default Value: quota.'
+                enum:
+                - quota
+                - refquota
+                type: string
               recordsize:
                 description: 'Specifies a suggested block size for files in the file
                   system. The size specified must be a power of two greater than or

pkg/apis/openebs.io/zfs/v1/zfsvolume.go

@@ -163,6 +163,12 @@ type VolumeInfo struct {
 	// +kubebuilder:validation:Enum=ZVOL;DATASET
 	VolumeType string `json:"volumeType"`
 
+	// quotaType determines whether the dataset volume quota type is of type "quota" or "refquota".
+	// QuotaType can not be modified once volume has been provisioned.
+	// +kubebuilder:validation:Enum=quota;refquota
+	// Default Value: quota.
+	QuotaType string `json:"quotaType,omitempty"`
+
 	// FsType specifies filesystem type for the zfs volume/dataset.
 	// If FsType is provided as "zfs", then the driver will create a
 	// ZFS dataset, formatting is not required as underlying filesystem is ZFS anyway.

pkg/builder/volbuilder/build.go

@@ -172,6 +172,16 @@ func (b *Builder) WithFsType(fstype string) *Builder {
 	return b
 }
 
+// WithQuotaType sets quota type for dataset volume
+func (b *Builder) WithQuotaType(quotatype string) *Builder {
+	if quotatype != "" {
+		b.volume.Object.Spec.QuotaType = quotatype
+	} else {
+		b.volume.Object.Spec.QuotaType = "quota"
+	}
+	return b
+}
+
 // WithShared sets where filesystem is shared or not
 func (b *Builder) WithShared(shared string) *Builder {
 	b.volume.Object.Spec.Shared = shared

pkg/driver/controller.go

@@ -237,6 +237,7 @@ func CreateZFSVolume(ctx context.Context, req *csi.CreateVolumeRequest) (string,
 	schld := parameters["scheduler"]
 	fstype := parameters["fstype"]
 	shared := parameters["shared"]
+	qoutatype := parameters["qoutatype"]
 
 	vtype := zfs.GetVolumeType(fstype)
 
@@ -295,6 +296,7 @@ func CreateZFSVolume(ctx context.Context, req *csi.CreateVolumeRequest) (string,
 		WithVolumeType(vtype).
 		WithVolumeStatus(zfs.ZFSStatusPending).
 		WithFsType(fstype).
+		WithQuotaType(qoutatype).
 		WithShared(shared).
 		WithCompression(compression).Build()
 

pkg/zfs/zfs_util.go

@@ -143,7 +143,7 @@ func buildCloneCreateArgs(vol *apis.ZFSVolume) []string {
 
 	if vol.Spec.VolumeType == VolTypeDataset {
 		if len(vol.Spec.Capacity) != 0 {
-			quotaProperty := "quota=" + vol.Spec.Capacity
+			quotaProperty := vol.Spec.QuotaType + "=" + vol.Spec.Capacity
 			ZFSVolArg = append(ZFSVolArg, "-o", quotaProperty)
 		}
 		if len(vol.Spec.RecordSize) != 0 {
@@ -216,7 +216,7 @@ func buildDatasetCreateArgs(vol *apis.ZFSVolume) []string {
 	ZFSVolArg = append(ZFSVolArg, ZFSCreateArg)
 
 	if len(vol.Spec.Capacity) != 0 {
-		quotaProperty := "quota=" + vol.Spec.Capacity
+		quotaProperty := vol.Spec.QuotaType + "=" + vol.Spec.Capacity
 		ZFSVolArg = append(ZFSVolArg, "-o", quotaProperty)
 	}
 	if len(vol.Spec.RecordSize) != 0 {
@@ -292,7 +292,7 @@ func buildVolumeResizeArgs(vol *apis.ZFSVolume) []string {
 	ZFSVolArg = append(ZFSVolArg, ZFSSetArg)
 
 	if vol.Spec.VolumeType == VolTypeDataset {
-		quotaProperty := "quota=" + vol.Spec.Capacity
+		quotaProperty := vol.Spec.QuotaType + "=" + vol.Spec.Capacity
 		ZFSVolArg = append(ZFSVolArg, quotaProperty)
 	} else {
 		volsizeProperty := "volsize=" + vol.Spec.Capacity
@@ -350,7 +350,7 @@ func buildVolumeRestoreArgs(rstr *apis.ZFSRestore) ([]string, error) {
 
 	if rstr.VolSpec.VolumeType == VolTypeDataset {
 		if len(rstr.VolSpec.Capacity) != 0 {
-			ZFSRecvParam += " -o quota=" + rstr.VolSpec.Capacity
+			ZFSRecvParam += " -o " + rstr.VolSpec.QuotaType + "=" + rstr.VolSpec.Capacity
 		}
 		if len(rstr.VolSpec.RecordSize) != 0 {
 			ZFSRecvParam += " -o recordsize=" + rstr.VolSpec.RecordSize