add ROOK_OBC_PROVISIONER_NAME_PREFIX to Rook Config

Similar to CSI_DRIVER_NAME_PREFIX for obc provisioner so that the obc provisioner always checks for storageclass with name `openshift-storage.ceph.rook.io/bucket` Signed-off-by: Jiffin Tony Thottan <[email protected]>
red-hat-storage · Mar 15, 2024 · 98a17f0 · 98a17f0
1 parent 6aa944d
commit 98a17f0
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/controllers/storagecluster/generate.go b/controllers/storagecluster/generate.go
@@ -116,7 +116,7 @@ func generateNameForSnapshotClass(initData *ocsv1.StorageCluster, snapshotType S
 }
 
 func generateNameForSnapshotClassDriver(snapshotType SnapshotterType) string {
-	return fmt.Sprintf("%s.%s.csi.ceph.com", csiDriverNamePrefix, snapshotType)
+	return fmt.Sprintf("%s.%s.csi.ceph.com", storageclassDriverNamePrefix, snapshotType)
 }
 
 func generateNameForSnapshotClassSecret(instance *ocsv1.StorageCluster, snapshotType SnapshotterType) string {

diff --git a/controllers/storagecluster/storageclasses.go b/controllers/storagecluster/storageclasses.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"os"
 	"reflect"
 	"strings"
 
@@ -27,14 +26,15 @@ const (
 	storageClassSkippedError      = "some StorageClasses were skipped while waiting for pre-requisites to be met"
 	defaultStorageClassAnnotation = "storageclass.kubernetes.io/is-default-class"
 
-	//csi driver name prefix
-	csiDriverNamePrefix = "openshift-storage"
+	//storage class driver name prefix
+	storageclassDriverNamePrefix = "openshift-storage"
 )
 
 var (
-	rbdDriverName    = csiDriverNamePrefix + ".rbd.csi.ceph.com"
-	cephFSDriverName = csiDriverNamePrefix + ".cephfs.csi.ceph.com"
-	nfsDriverName    = csiDriverNamePrefix + ".nfs.csi.ceph.com"
+	rbdDriverName    = storageclassDriverNamePrefix + ".rbd.csi.ceph.com"
+	cephFSDriverName = storageclassDriverNamePrefix + ".cephfs.csi.ceph.com"
+	nfsDriverName    = storageclassDriverNamePrefix + ".nfs.csi.ceph.com"
+	obcDriverName    = storageclassDriverNamePrefix + ".ceph.rook.io/bucket"
 )
 
 // StorageClassConfiguration provides configuration options for a StorageClass.
@@ -426,7 +426,7 @@ func newCephOBCStorageClassConfiguration(initData *ocsv1.StorageCluster) Storage
 					"description": "Provides Object Bucket Claims (OBCs)",
 				},
 			},
-			Provisioner:   fmt.Sprintf("%s.ceph.rook.io/bucket", os.Getenv(util.OperatorNamespaceEnvVar)),
+			Provisioner:   obcDriverName,
 			ReclaimPolicy: &reclaimPolicy,
 			Parameters: map[string]string{
 				"objectStoreNamespace": initData.Namespace,

diff --git a/deploy/ocs-operator/manifests/ocs-operator.clusterserviceversion.yaml b/deploy/ocs-operator/manifests/ocs-operator.clusterserviceversion.yaml
@@ -3247,6 +3247,8 @@ spec:
                       fieldPath: metadata.namespace
                 - name: ROOK_OBC_WATCH_OPERATOR_NAMESPACE
                   value: "true"
+                - name: ROOK_OBC_PROVISIONER_NAME_PREFIX
+                  value: openshift-storage
                 image: docker.io/rook/ceph:v1.13.0-beta.0.41.g1647c2afc
                 name: rook-ceph-operator
                 resources: {}

diff --git a/tools/csv-merger/csv-merger.go b/tools/csv-merger/csv-merger.go
@@ -369,6 +369,10 @@ func unmarshalCSV(filePath string) *csvv1.ClusterServiceVersion {
 				Name:  "ROOK_OBC_WATCH_OPERATOR_NAMESPACE",
 				Value: "true",
 			},
+			{
+				Name:  "ROOK_OBC_PROVISIONER_NAME_PREFIX",
+				Value: "openshift-storage",
+			},
 		}
 
 		if *rookCsiCephImage != "" {