diff --git a/deploy/charts/rook-ceph-cluster/templates/cephfilesystem.yaml b/deploy/charts/rook-ceph-cluster/templates/cephfilesystem.yaml index 19393e4cd082..2ea90fc28577 100644 --- a/deploy/charts/rook-ceph-cluster/templates/cephfilesystem.yaml +++ b/deploy/charts/rook-ceph-cluster/templates/cephfilesystem.yaml @@ -2,6 +2,17 @@ {{- range $filesystem := .Values.cephFileSystems -}} --- apiVersion: ceph.rook.io/v1 +kind: CephFilesystemSubVolumeGroup +metadata: + name: {{ $filesystem.name }}-csi # lets keep the svg crd name same as `filesystem name + csi` for the default csi svg + namespace: {{ $root.Release.Namespace }} # namespace:cluster +spec: + # The name of the subvolume group. If not set, the default is the name of the subvolumeGroup CR. + name: csi + # filesystemName is the metadata name of the CephFilesystem CR where the subvolume group will be created + filesystemName: {{ $filesystem.name }} +--- +apiVersion: ceph.rook.io/v1 kind: CephFilesystem metadata: name: {{ $filesystem.name }} diff --git a/deploy/examples/filesystem-ec.yaml b/deploy/examples/filesystem-ec.yaml index b83b3767e709..a4abf5a46cd3 100644 --- a/deploy/examples/filesystem-ec.yaml +++ b/deploy/examples/filesystem-ec.yaml @@ -91,3 +91,15 @@ spec: # cpu: "500m" # memory: "1024Mi" # priorityClassName: my-priority-class +--- +# create default csi subvolume group +apiVersion: ceph.rook.io/v1 +kind: CephFilesystemSubVolumeGroup +metadata: + name: myfs-csi # lets keep the svg crd name same as `filesystem name + csi` for the default csi svg + namespace: rook-ceph # namespace:cluster +spec: + # The name of the subvolume group. If not set, the default is the name of the subvolumeGroup CR. + name: csi + # filesystemName is the metadata name of the CephFilesystem CR where the subvolume group will be created + filesystemName: myfs diff --git a/deploy/examples/filesystem-test.yaml b/deploy/examples/filesystem-test.yaml index 7f960027a729..52c00392ebd3 100644 --- a/deploy/examples/filesystem-test.yaml +++ b/deploy/examples/filesystem-test.yaml @@ -23,3 +23,15 @@ spec: metadataServer: activeCount: 1 activeStandby: true +--- +# create default csi subvolume group +apiVersion: ceph.rook.io/v1 +kind: CephFilesystemSubVolumeGroup +metadata: + name: myfs-csi # lets keep the svg crd name same as `filesystem name + csi` for the default csi svg + namespace: rook-ceph # namespace:cluster +spec: + # The name of the subvolume group. If not set, the default is the name of the subvolumeGroup CR. + name: csi + # filesystemName is the metadata name of the CephFilesystem CR where the subvolume group will be created + filesystemName: myfs diff --git a/deploy/examples/filesystem.yaml b/deploy/examples/filesystem.yaml index 44dacaa9b5dc..f824deebcb7c 100644 --- a/deploy/examples/filesystem.yaml +++ b/deploy/examples/filesystem.yaml @@ -136,3 +136,15 @@ spec: # snapshotRetention: # - path: / # duration: "h 24" +--- +# create default csi subvolume group +apiVersion: ceph.rook.io/v1 +kind: CephFilesystemSubVolumeGroup +metadata: + name: myfs-csi # lets keep the svg crd name same as `filesystem name + csi` for the default csi svg + namespace: rook-ceph # namespace:cluster +spec: + # The name of the subvolume group. If not set, the default is the name of the subvolumeGroup CR. + name: csi + # filesystemName is the metadata name of the CephFilesystem CR where the subvolume group will be created + filesystemName: myfs