Merge pull request #14759 from rook/mergify/bp/release-1.15/pr-14746

csi: fix the ROOK_CSI_DISABLE_DRIVER flag in the csi reconcile  (backport #14746)
This commit is contained in:
mergify[bot] authored and GitHub committed 2024-09-24 13:03:32 +00:00
commit 0ea35c9ee0
1 file changed
+1 -2
+1 -2
View File
@@ -332,8 +332,7 @@ func (r *ReconcileCSI) reconcile(request reconcile.Request) (reconcile.Result, e
}
}
if !EnableCSIOperator() {
if !disableCSI && !EnableCSIOperator() {
err = r.validateAndConfigureDrivers(serverVersion, ownerInfo)
if err != nil {
return opcontroller.ImmediateRetryResult, errors.Wrap(err, "failed to configure ceph csi")