label ceph svg correctly if datapool name is empty

Signed-off-by: Leela Venkaiah G <[email protected]>
red-hat-storage · Mar 25, 2024 · 06dddb6 · 06dddb6
1 parent b2c8236
commit 06dddb6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/controllers/storageclassrequest/storageclassrequest_controller.go b/controllers/storageclassrequest/storageclassrequest_controller.go
@@ -416,7 +416,11 @@ func (r *StorageClassRequestReconciler) reconcileCephFilesystemSubVolumeGroup()
 		// This label is required to set the dataPool on the CephFS
 		// storageclass so that each PVC created from CephFS storageclass can
 		// use correct dataPool backed by deviceclass.
-		addLabel(r.cephFilesystemSubVolumeGroup, v1alpha1.CephFileSystemDataPoolLabel, fmt.Sprintf("%s-%s", cephFilesystem.Name, dataPool.Name))
+		labelValue := cephFilesystem.Name
+		if dataPool.Name != "" {
+			labelValue = fmt.Sprintf("%s-%s", labelValue, dataPool.Name)
+		}
+		addLabel(r.cephFilesystemSubVolumeGroup, v1alpha1.CephFileSystemDataPoolLabel, labelValue)
 
 		r.cephFilesystemSubVolumeGroup.Spec = rookCephv1.CephFilesystemSubVolumeGroupSpec{
 			FilesystemName: cephFilesystem.Name,

diff --git a/deploy/ocs-operator/manifests/provider-role.yaml b/deploy/ocs-operator/manifests/provider-role.yaml
@@ -15,6 +15,7 @@ rules:
   - ceph.rook.io
   resources:
   - cephfilesystemsubvolumegroups
+  - cephblockpoolradosnamespaces
   verbs:
   - get
   - list

diff --git a/rbac/provider-role.yaml b/rbac/provider-role.yaml
@@ -15,6 +15,7 @@ rules:
   - ceph.rook.io
   resources:
   - cephfilesystemsubvolumegroups
+  - cephblockpoolradosnamespaces
   verbs:
   - get
   - list