diff --git a/deploy/helm/charts/crds/zfsrestore.yaml b/deploy/helm/charts/crds/zfsrestore.yaml index 54c166259..ffffb711b 100644 --- a/deploy/helm/charts/crds/zfsrestore.yaml +++ b/deploy/helm/charts/crds/zfsrestore.yaml @@ -100,7 +100,7 @@ spec: data. For instance, if the Volume was created with "off" and the next day the compression was modified to "on", the data written prior to setting "on" will not be compressed. Default Value: off.' - pattern: ^(on|off|lzjb|zstd|gzip|gzip-[1-9]|zle|lz4)$ + pattern: ^(on|off|lzjb|zstd|zstd-[1-9]|zstd-1[0-9]|gzip|gzip-[1-9]|zle|lz4)$ type: string dedup: description: 'Deduplication is the process for removing redundant diff --git a/deploy/helm/charts/crds/zfssnapshot.yaml b/deploy/helm/charts/crds/zfssnapshot.yaml index 778ef1f4a..fb6a9af9e 100644 --- a/deploy/helm/charts/crds/zfssnapshot.yaml +++ b/deploy/helm/charts/crds/zfssnapshot.yaml @@ -69,7 +69,7 @@ spec: data. For instance, if the Volume was created with "off" and the next day the compression was modified to "on", the data written prior to setting "on" will not be compressed. Default Value: off.' - pattern: ^(on|off|lzjb|zstd|gzip|gzip-[1-9]|zle|lz4)$ + pattern: ^(on|off|lzjb|zstd|zstd-[1-9]|zstd-1[0-9]|gzip|gzip-[1-9]|zle|lz4)$ type: string dedup: description: 'Deduplication is the process for removing redundant diff --git a/deploy/helm/charts/crds/zfsvolume.yaml b/deploy/helm/charts/crds/zfsvolume.yaml index 271e5f609..aeb00f5ac 100644 --- a/deploy/helm/charts/crds/zfsvolume.yaml +++ b/deploy/helm/charts/crds/zfsvolume.yaml @@ -95,7 +95,7 @@ spec: data. For instance, if the Volume was created with "off" and the next day the compression was modified to "on", the data written prior to setting "on" will not be compressed. Default Value: off.' - pattern: ^(on|off|lzjb|zstd|gzip|gzip-[1-9]|zle|lz4)$ + pattern: ^(on|off|lzjb|zstd|zstd-[1-9]|zstd-1[0-9]|gzip|gzip-[1-9]|zle|lz4)$ type: string dedup: description: 'Deduplication is the process for removing redundant diff --git a/deploy/yamls/zfsrestore-crd.yaml b/deploy/yamls/zfsrestore-crd.yaml index 54c166259..ffffb711b 100644 --- a/deploy/yamls/zfsrestore-crd.yaml +++ b/deploy/yamls/zfsrestore-crd.yaml @@ -100,7 +100,7 @@ spec: data. For instance, if the Volume was created with "off" and the next day the compression was modified to "on", the data written prior to setting "on" will not be compressed. Default Value: off.' - pattern: ^(on|off|lzjb|zstd|gzip|gzip-[1-9]|zle|lz4)$ + pattern: ^(on|off|lzjb|zstd|zstd-[1-9]|zstd-1[0-9]|gzip|gzip-[1-9]|zle|lz4)$ type: string dedup: description: 'Deduplication is the process for removing redundant diff --git a/deploy/yamls/zfssnapshot-crd.yaml b/deploy/yamls/zfssnapshot-crd.yaml index 778ef1f4a..fb6a9af9e 100644 --- a/deploy/yamls/zfssnapshot-crd.yaml +++ b/deploy/yamls/zfssnapshot-crd.yaml @@ -69,7 +69,7 @@ spec: data. For instance, if the Volume was created with "off" and the next day the compression was modified to "on", the data written prior to setting "on" will not be compressed. Default Value: off.' - pattern: ^(on|off|lzjb|zstd|gzip|gzip-[1-9]|zle|lz4)$ + pattern: ^(on|off|lzjb|zstd|zstd-[1-9]|zstd-1[0-9]|gzip|gzip-[1-9]|zle|lz4)$ type: string dedup: description: 'Deduplication is the process for removing redundant diff --git a/deploy/yamls/zfsvolume-crd.yaml b/deploy/yamls/zfsvolume-crd.yaml index 271e5f609..aeb00f5ac 100644 --- a/deploy/yamls/zfsvolume-crd.yaml +++ b/deploy/yamls/zfsvolume-crd.yaml @@ -95,7 +95,7 @@ spec: data. For instance, if the Volume was created with "off" and the next day the compression was modified to "on", the data written prior to setting "on" will not be compressed. Default Value: off.' - pattern: ^(on|off|lzjb|zstd|gzip|gzip-[1-9]|zle|lz4)$ + pattern: ^(on|off|lzjb|zstd|zstd-[1-9]|zstd-1[0-9]|gzip|gzip-[1-9]|zle|lz4)$ type: string dedup: description: 'Deduplication is the process for removing redundant diff --git a/deploy/zfs-operator.yaml b/deploy/zfs-operator.yaml index ce505fb8d..ff14b492a 100644 --- a/deploy/zfs-operator.yaml +++ b/deploy/zfs-operator.yaml @@ -116,7 +116,7 @@ spec: data. For instance, if the Volume was created with "off" and the next day the compression was modified to "on", the data written prior to setting "on" will not be compressed. Default Value: off.' - pattern: ^(on|off|lzjb|zstd|gzip|gzip-[1-9]|zle|lz4)$ + pattern: ^(on|off|lzjb|zstd|zstd-[1-9]|zstd-1[0-9]|gzip|gzip-[1-9]|zle|lz4)$ type: string dedup: description: 'Deduplication is the process for removing redundant @@ -539,7 +539,7 @@ spec: data. For instance, if the Volume was created with "off" and the next day the compression was modified to "on", the data written prior to setting "on" will not be compressed. Default Value: off.' - pattern: ^(on|off|lzjb|zstd|gzip|gzip-[1-9]|zle|lz4)$ + pattern: ^(on|off|lzjb|zstd|zstd-[1-9]|zstd-1[0-9]|gzip|gzip-[1-9]|zle|lz4)$ type: string dedup: description: 'Deduplication is the process for removing redundant @@ -1069,7 +1069,7 @@ spec: data. For instance, if the Volume was created with "off" and the next day the compression was modified to "on", the data written prior to setting "on" will not be compressed. Default Value: off.' - pattern: ^(on|off|lzjb|zstd|gzip|gzip-[1-9]|zle|lz4)$ + pattern: ^(on|off|lzjb|zstd|zstd-[1-9]|zstd-1[0-9]|gzip|gzip-[1-9]|zle|lz4)$ type: string dedup: description: 'Deduplication is the process for removing redundant diff --git a/docs/storageclasses.md b/docs/storageclasses.md index d13e0d703..d201181a1 100644 --- a/docs/storageclasses.md +++ b/docs/storageclasses.md @@ -33,7 +33,7 @@ allowed values: Any power of 2 from 512 bytes to 128 Kbytes Compression specifies the block-level compression algorithm to be applied to the ZFS Volume and datasets. The value "on" indicates ZFS to use the default compression algorithm. -allowed values: "on", "off", "lzjb", "zstd", "gzip", "gzip-1", "gzip-2", "gzip-3", "gzip-4", "gzip-5", "gzip-6", "gzip-7", "gzip-8", "gzip-9", "zle", "lz4" +allowed values: "on", "off", "lzjb", "zstd", "zstd-1", "zstd-2", "zstd-3", "zstd-4", "zstd-5", "zstd-6", "zstd-7", "zstd-8", "zstd-9", "zstd-10", "zstd-11", "zstd-12", "zstd-13", "zstd-14", "zstd-15", "zstd-16", "zstd-17", "zstd-18", "zstd-19", "gzip", "gzip-1", "gzip-2", "gzip-3", "gzip-4", "gzip-5", "gzip-6", "gzip-7", "gzip-8", "gzip-9", "zle", "lz4" ### dedup (*optional* parameter) diff --git a/pkg/apis/openebs.io/zfs/v1/zfsvolume.go b/pkg/apis/openebs.io/zfs/v1/zfsvolume.go index 7a7d5c6a2..5ee93f7bb 100644 --- a/pkg/apis/openebs.io/zfs/v1/zfsvolume.go +++ b/pkg/apis/openebs.io/zfs/v1/zfsvolume.go @@ -106,7 +106,7 @@ type VolumeInfo struct { // the next day the compression was modified to "on", the data written prior to setting "on" will // not be compressed. // Default Value: off. - // +kubebuilder:validation:Pattern="^(on|off|lzjb|zstd|gzip|gzip-[1-9]|zle|lz4)$" + // +kubebuilder:validation:Pattern="^(on|off|lzjb|zstd|zstd-[1-9]|zstd-1[0-9]|gzip|gzip-[1-9]|zle|lz4)$" Compression string `json:"compression,omitempty"` // Deduplication is the process for removing redundant data at the block level,