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

Jump to bottom

Bug 2083993: [release-4.11] ocs-to-ocs: revert disabling cephfs csi driver #1672

Merged
merged 1 commit into from May 12, 2022
Merged

Bug 2083993: [release-4.11] ocs-to-ocs: revert disabling cephfs csi driver #1672

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 7 additions & 3 deletions controllers/storagecluster/external_resources.go
View file
Open in desktop
Expand Up @@ -561,9 +561,13 @@ func (r *StorageClusterReconciler) createExternalStorageClusterResources(instanc
r.Log.Error(err, "Failed to create needed StorageClasses.")
return err
}
if err = r.setRookCSICephFS(enableRookCSICephFS, instance); err != nil {
r.Log.Error(err, "Failed to set RookEnableCephFSCSIKey to EnableRookCSICephFS.", "RookEnableCephFSCSIKey", rookEnableCephFSCSIKey, "EnableRookCSICephFS", enableRookCSICephFS)
return err
// We do not want to disable CephFS csi driver in consumer mode since
// CephFS storageclass is available by default.
if !IsOCSConsumerMode(instance) {
if err = r.setRookCSICephFS(enableRookCSICephFS, instance); err != nil {
r.Log.Error(err, "Failed to set RookEnableCephFSCSIKey to EnableRookCSICephFS.", "RookEnableCephFSCSIKey", rookEnableCephFSCSIKey, "EnableRookCSICephFS", enableRookCSICephFS)
return err
}
}
if extCephObjectStores != nil {
if err = r.createCephObjectStores(extCephObjectStores, instance); err != nil {
Expand Down