Merge pull request rook#14746 from parth-gr/fix-csi-driver

csi: fix the ROOK_CSI_DISABLE_DRIVER flag in the csi reconcile
rkachach · Sep 23, 2024 · aba78ea · aba78ea
2 parents d15dabf + 166e4f3
commit aba78ea
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/pkg/operator/ceph/csi/controller.go b/pkg/operator/ceph/csi/controller.go
@@ -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")