diff --git a/Documentation/helm-ceph-cluster.md b/Documentation/helm-ceph-cluster.md index b8167fded..cca1a1d8a 100644 --- a/Documentation/helm-ceph-cluster.md +++ b/Documentation/helm-ceph-cluster.md @@ -100,6 +100,7 @@ The `cephFileSystems` array in the values file will define a list of CephFileSys | `spec` | The CephFileSystem spec, see the [CephFilesystem CRD](ceph-filesystem-crd.md) documentation. | see values.yaml | | `storageClass.enabled` | Whether a storage class is deployed alongside the CephFileSystem | `true` | | `storageClass.name` | The name of the storage class | `ceph-filesystem` | +| `storageClass.pool` | The name of [Data Pool](ceph-filesystem-crd.md#pools), without the filesystem name prefix | `data0` | | `storageClass.parameters` | See [Shared Filesystem](ceph-filesystem.md) documentation or the helm values.yaml for suitable values | see values.yaml | | `storageClass.reclaimPolicy` | The default [Reclaim Policy](https://kubernetes.io/docs/concepts/storage/storage-classes/#reclaim-policy) to apply to PVCs created with this storage class. | `Delete` | | `storageClass.mountOptions` | Specifies the mount options for storageClass | `[]` | diff --git a/deploy/charts/rook-ceph-cluster/templates/cephfilesystem.yaml b/deploy/charts/rook-ceph-cluster/templates/cephfilesystem.yaml index d2dc1cd12..a6b9e94ae 100644 --- a/deploy/charts/rook-ceph-cluster/templates/cephfilesystem.yaml +++ b/deploy/charts/rook-ceph-cluster/templates/cephfilesystem.yaml @@ -18,7 +18,7 @@ metadata: provisioner: {{ $root.Values.operatorNamespace }}.cephfs.csi.ceph.com parameters: fsName: {{ $filesystem.name }} - pool: {{ $filesystem.name }}-data0 + pool: {{ $filesystem.name }}-{{ default "data0" $filesystem.storageClass.pool }} clusterID: {{ $root.Release.Namespace }} {{ toYaml $filesystem.storageClass.parameters | indent 2 }} reclaimPolicy: {{ default "Delete" $filesystem.storageClass.reclaimPolicy }} diff --git a/deploy/charts/rook-ceph-cluster/values.yaml b/deploy/charts/rook-ceph-cluster/values.yaml index d9a8b1747..639c260ce 100644 --- a/deploy/charts/rook-ceph-cluster/values.yaml +++ b/deploy/charts/rook-ceph-cluster/values.yaml @@ -377,6 +377,8 @@ cephFileSystems: - failureDomain: host replicated: size: 3 + # Optional and highly recommended, 'data0' by default, see https://github.com/rook/rook/blob/master/Documentation/ceph-filesystem-crd.md#pools + name: data0 metadataServer: activeCount: 1 activeStandby: true @@ -384,6 +386,8 @@ cephFileSystems: enabled: true isDefault: false name: ceph-filesystem + # (Optional) specify a data pool to use, must be the name of one of the data pools above, 'data0' by default + pool: data0 reclaimPolicy: Delete allowVolumeExpansion: true mountOptions: []