Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add ROOK_OBC_PROVISIONER_NAME_PREFIX to Rook Config #2510

Merged
merged 1 commit into from
Mar 22, 2024
Merged

add ROOK_OBC_PROVISIONER_NAME_PREFIX to Rook Config #2510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion controllers/storagecluster/generate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
14 changes: 7 additions & 7 deletions controllers/storagecluster/storageclasses.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import (
"context"
"encoding/json"
"fmt"
"os"
"reflect"
"strings"

Expand All @@ -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.
Expand Down Expand Up @@ -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,
Expand Down
Loading