From eead60457b5b39de859c2d3f4c2d169f77a5c956 Mon Sep 17 00:00:00 2001 From: kubealex Date: Tue, 21 Sep 2021 14:49:03 +0200 Subject: [PATCH 1/2] ceph: add default field to filesystem-sc helm chart I Added the chance to default filesystem storageclass in helm chart Signed-off-by: kubealex --- cluster/charts/rook-ceph-cluster/templates/cephfilesystem.yaml | 2 ++ cluster/charts/rook-ceph-cluster/values.yaml | 1 + 2 files changed, 3 insertions(+) diff --git a/cluster/charts/rook-ceph-cluster/templates/cephfilesystem.yaml b/cluster/charts/rook-ceph-cluster/templates/cephfilesystem.yaml index 73be71f60..c2eeb5032 100644 --- a/cluster/charts/rook-ceph-cluster/templates/cephfilesystem.yaml +++ b/cluster/charts/rook-ceph-cluster/templates/cephfilesystem.yaml @@ -13,6 +13,8 @@ apiVersion: storage.k8s.io/v1 kind: StorageClass metadata: name: {{ $filesystem.storageClass.name }} + annotations: + storageclass.kubernetes.io/is-default-class: "{{ if default false $filesystem.storageClass.isDefault }}true{{ else }}false{{ end }}" provisioner: {{ $root.Values.operatorNamespace }}.cephfs.csi.ceph.com parameters: fsName: {{ $filesystem.name }} diff --git a/cluster/charts/rook-ceph-cluster/values.yaml b/cluster/charts/rook-ceph-cluster/values.yaml index 8cace5e27..0ea3a1e46 100644 --- a/cluster/charts/rook-ceph-cluster/values.yaml +++ b/cluster/charts/rook-ceph-cluster/values.yaml @@ -410,6 +410,7 @@ cephObjectStores: storageClass: enabled: true name: ceph-bucket + isDefault: false reclaimPolicy: Delete # see https://github.com/rook/rook/blob/master/Documentation/ceph-object-bucket-claim.md#storageclass for available configuration parameters: From d5f42aa4a1f2ab99f6d19f89dbd2d1736060d7a7 Mon Sep 17 00:00:00 2001 From: kubealex Date: Tue, 21 Sep 2021 20:05:11 +0200 Subject: [PATCH 2/2] ceph: corrected placement of values I fixed the placement of the modification, from object storage to filesystem Signed-off-by: kubealex --- cluster/charts/rook-ceph-cluster/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster/charts/rook-ceph-cluster/values.yaml b/cluster/charts/rook-ceph-cluster/values.yaml index 0ea3a1e46..9091ec255 100644 --- a/cluster/charts/rook-ceph-cluster/values.yaml +++ b/cluster/charts/rook-ceph-cluster/values.yaml @@ -369,6 +369,7 @@ cephFileSystems: activeStandby: true storageClass: enabled: true + isDefault: false name: ceph-filesystem reclaimPolicy: Delete # see https://github.com/rook/rook/blob/master/Documentation/ceph-filesystem.md#provision-storage for available configuration @@ -410,7 +411,6 @@ cephObjectStores: storageClass: enabled: true name: ceph-bucket - isDefault: false reclaimPolicy: Delete # see https://github.com/rook/rook/blob/master/Documentation/ceph-object-bucket-claim.md#storageclass for available configuration parameters: