diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0eae164..8482e92 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -74,10 +74,10 @@ jobs: truncate -s 100G /tmp/disk.img sudo zpool create zfspv-pool `sudo losetup -f /tmp/disk.img --show` - - name: Set up Go 1.14 + - name: Set up Go 1.16 uses: actions/setup-go@v2 with: - go-version: 1.14.7 + go-version: 1.16.5 - name: Setup Minikube-Kubernetes uses: manusa/actions-setup-minikube@v2.3.0 diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 0987387..58d1949 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -74,10 +74,10 @@ jobs: truncate -s 100G /tmp/disk.img sudo zpool create zfspv-pool `sudo losetup -f /tmp/disk.img --show` - - name: Set up Go 1.14 + - name: Set up Go 1.16 uses: actions/setup-go@v2 with: - go-version: 1.14.7 + go-version: 1.16.5 - name: Setup Minikube-Kubernetes uses: manusa/actions-setup-minikube@v2.3.0 diff --git a/deploy/yamls/zfsrestore-crd.yaml b/deploy/yamls/zfsrestore-crd.yaml index e3fc434..54c1662 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|gzip|gzip-[1-9]|zle|lz4)$ + pattern: ^(on|off|lzjb|zstd|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 6bb0760..778ef1f 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|gzip|gzip-[1-9]|zle|lz4)$ + pattern: ^(on|off|lzjb|zstd|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 4173e47..271e5f6 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|gzip|gzip-[1-9]|zle|lz4)$ + pattern: ^(on|off|lzjb|zstd|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 b26ef4e..0a65ba6 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|gzip|gzip-[1-9]|zle|lz4)$ + pattern: ^(on|off|lzjb|zstd|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|gzip|gzip-[1-9]|zle|lz4)$ + pattern: ^(on|off|lzjb|zstd|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|gzip|gzip-[1-9]|zle|lz4)$ + pattern: ^(on|off|lzjb|zstd|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 78782da..d13e0d7 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", "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", "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 eb6060f..7a7d5c6 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|gzip|gzip-[1-9]|zle|lz4)$" + // +kubebuilder:validation:Pattern="^(on|off|lzjb|zstd|gzip|gzip-[1-9]|zle|lz4)$" Compression string `json:"compression,omitempty"` // Deduplication is the process for removing redundant data at the block level,