From e1986ae605a5ad4605c73ca5ed6d75601e41900c Mon Sep 17 00:00:00 2001 From: parth-gr Date: Wed, 8 Jan 2025 19:38:05 +0530 Subject: [PATCH] external: fix sc name for rados namespace Currently, the sc name is hardcoded, in future if we support multiple rados namespace per tenant we need a variable name updating sc names to contain rados-namespace name rook pr: rook/rook#15243 Signed-off-by: parth-gr --- .../storagecluster/external_resources.go | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/controllers/storagecluster/external_resources.go b/controllers/storagecluster/external_resources.go index 610769eb85..94ddc09307 100644 --- a/controllers/storagecluster/external_resources.go +++ b/controllers/storagecluster/external_resources.go @@ -25,15 +25,15 @@ import ( ) const ( - externalClusterDetailsSecret = "rook-ceph-external-cluster-details" - externalClusterDetailsKey = "external_cluster_details" - cephFsStorageClassName = "cephfs" - cephRbdStorageClassName = "ceph-rbd" - cephRbdRadosNamespaceStorageClassName = "ceph-rbd-rados-namespace" - cephRbdTopologyStorageClassName = "ceph-rbd-topology" - cephRgwStorageClassName = "ceph-rgw" - externalCephRgwEndpointKey = "endpoint" - cephRgwTLSSecretKey = "ceph-rgw-tls-cert" + externalClusterDetailsSecret = "rook-ceph-external-cluster-details" + externalClusterDetailsKey = "external_cluster_details" + cephFsStorageClassName = "cephfs" + cephRbdStorageClassName = "ceph-rbd" + cephRbdRadosNamespaceStorageClassNamePrefix = "ceph-rbd-rados-namespace" + cephRbdTopologyStorageClassName = "ceph-rbd-topology" + cephRgwStorageClassName = "ceph-rgw" + externalCephRgwEndpointKey = "endpoint" + cephRgwTLSSecretKey = "ceph-rgw-tls-cert" ) const ( @@ -375,7 +375,7 @@ func (r *StorageClusterReconciler) createExternalStorageClusterResources(instanc enableRookCSICephFS = true } else if d.Name == cephRbdStorageClassName { scc = newCephBlockPoolStorageClassConfiguration(instance) - } else if d.Name == cephRbdRadosNamespaceStorageClassName { + } else if strings.HasPrefix(d.Name, cephRbdRadosNamespaceStorageClassNamePrefix) { // ceph-rbd-rados-namespace- scc = newCephBlockPoolStorageClassConfiguration(instance) // update the storageclass name to rados storagesclass name scc.storageClass.Name = fmt.Sprintf("%s-%s", instance.Name, d.Name)