From 85dc21270434b97b3710fcd5084eca2a1c586fff Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Mon, 17 Jan 2022 20:39:09 +0530 Subject: [PATCH] csi: add support to create volumesnapshotclass add support for helm charts to create default volumesnapshotclass for cephfs and rbd fixes: #9566 Signed-off-by: Madhu Rajanna --- .../templates/volumesnapshotclass.yaml | 48 +++++++++++++++++++ deploy/charts/rook-ceph-cluster/values.yaml | 16 +++++++ 2 files changed, 64 insertions(+) create mode 100644 deploy/charts/rook-ceph-cluster/templates/volumesnapshotclass.yaml diff --git a/deploy/charts/rook-ceph-cluster/templates/volumesnapshotclass.yaml b/deploy/charts/rook-ceph-cluster/templates/volumesnapshotclass.yaml new file mode 100644 index 000000000..704eb43f9 --- /dev/null +++ b/deploy/charts/rook-ceph-cluster/templates/volumesnapshotclass.yaml @@ -0,0 +1,48 @@ +{{- $filesystemvsc := .Values.cephFileSystemVolumeSnapshotClass -}} +{{- $blockpoolvsc := .Values.cephBlockPoolsVolumeSnapshotClass -}} + +--- +{{- if default false $filesystemvsc.enabled }} +{{- if .Capabilities.APIVersions.Has "snapshot.storage.k8s.io/v1" }} +apiVersion: snapshot.storage.k8s.io/v1 +{{- else }} +apiVersion: snapshot.storage.k8s.io/v1beta1 +{{- end }} +kind: VolumeSnapshotClass +metadata: + name: {{ $filesystemvsc.name }} + annotations: + snapshot.storage.kubernetes.io/is-default-class: "{{ if default false $filesystemvsc.isDefault }}true{{ else }}false{{ end }}" +driver: {{ .Values.operatorNamespace }}.cephfs.csi.ceph.com +parameters: + clusterID: {{ .Release.Namespace }} + csi.storage.k8s.io/snapshotter-secret-name: rook-csi-cephfs-provisioner + csi.storage.k8s.io/snapshotter-secret-namespace: {{ .Release.Namespace }} +{{- if $filesystemvsc.parameters }} +{{ toYaml $filesystemvsc.parameters | indent 2 }} +{{- end }} +deletionPolicy: {{ default "Delete" $filesystemvsc.deletionPolicy }} +{{- end }} + +--- +{{- if default false $blockpoolvsc.enabled }} +{{- if .Capabilities.APIVersions.Has "snapshot.storage.k8s.io/v1" }} +apiVersion: snapshot.storage.k8s.io/v1 +{{- else }} +apiVersion: snapshot.storage.k8s.io/v1beta1 +{{- end }} +kind: VolumeSnapshotClass +metadata: + name: {{ $blockpoolvsc.name }} + annotations: + snapshot.storage.kubernetes.io/is-default-class: "{{ if default false $blockpoolvsc.isDefault }}true{{ else }}false{{ end }}" +driver: {{ .Values.operatorNamespace }}.rbd.csi.ceph.com +parameters: + clusterID: {{ .Release.Namespace }} + csi.storage.k8s.io/snapshotter-secret-name: rook-csi-rbd-provisioner + csi.storage.k8s.io/snapshotter-secret-namespace: {{ .Release.Namespace }} +{{- if $blockpoolvsc.parameters }} +{{ toYaml $blockpoolvsc.parameters | indent 2 }} +{{- end }} +deletionPolicy: {{ default "Delete" $blockpoolvsc.deletionPolicy }} +{{- end }} diff --git a/deploy/charts/rook-ceph-cluster/values.yaml b/deploy/charts/rook-ceph-cluster/values.yaml index 1ca0664ec..6b7444bb8 100644 --- a/deploy/charts/rook-ceph-cluster/values.yaml +++ b/deploy/charts/rook-ceph-cluster/values.yaml @@ -397,6 +397,22 @@ cephFileSystems: # in hyperconverged settings where the volume is mounted on the same node as the osds. csi.storage.k8s.io/fstype: ext4 +cephFileSystemVolumeSnapshotClass: + enabled: false + name: ceph-filesystem + isDefault: true + deletionPolicy: Delete + # see https://rook.io/docs/rook/latest/ceph-csi-snapshot.html#cephfs-snapshots for available configuration + parameters: {} + +cephBlockPoolsVolumeSnapshotClass: + enabled: false + name: ceph-block + isDefault: false + deletionPolicy: Delete + # see https://rook.io/docs/rook/latest/ceph-csi-snapshot.html#rbd-snapshots for available configuration + parameters: {} + cephObjectStores: - name: ceph-objectstore # see https://github.com/rook/rook/blob/master/Documentation/ceph-object-store-crd.md#object-store-settings for available configuration