Skip to content

Commit c246317

Browse files
committed
csi: create only required resource in external mode
In downstream external mode, we'll only create required csi-operator resources like ceph connection and client profile CR's. Signed-off-by: subhamkrai <srai@redhat.com>
1 parent 2a48994 commit c246317

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

pkg/operator/ceph/cluster/mon/mon.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1174,7 +1174,7 @@ func (c *Cluster) saveMonConfig() error {
11741174
return errors.Wrap(err, "failed to update csi cluster config")
11751175
}
11761176

1177-
if csi.EnableCSIOperator() && len(c.ClusterInfo.AllMonitors()) > 0 {
1177+
if (csi.EnableCSIOperator() || c.spec.External.Enable) && len(c.ClusterInfo.AllMonitors()) > 0 {
11781178
err := csi.CreateUpdateCephConnection(c.context.Client, c.ClusterInfo, c.spec)
11791179
if err != nil {
11801180
return errors.Wrap(err, "failed to create/update cephConnection")

pkg/operator/ceph/file/subvolumegroup/controller.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ func (r *ReconcileCephFilesystemSubVolumeGroup) reconcile(request reconcile.Requ
272272

273273
r.updateStatus(observedGeneration, request.NamespacedName, cephv1.ConditionReady)
274274

275-
if csi.EnableCSIOperator() {
275+
if csi.EnableCSIOperator() || cephCluster.Spec.External.Enable {
276276
err = csi.CreateUpdateClientProfileSubVolumeGroup(r.clusterInfo.Context, r.client, r.clusterInfo, cephFilesystemNamespacedName, buildClusterID(cephFilesystemSubVolumeGroup), cephCluster.Name)
277277
if err != nil {
278278
return reconcile.Result{}, errors.Wrap(err, "failed to create ceph csi-op config CR for subVolGrp ns")

pkg/operator/ceph/pool/radosnamespace/controller.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ func (r *ReconcileCephBlockPoolRadosNamespace) reconcile(request reconcile.Reque
297297

298298
r.updateStatus(r.client, namespacedName, cephv1.ConditionReady)
299299

300-
if csi.EnableCSIOperator() {
300+
if csi.EnableCSIOperator() || cephCluster.Spec.External.Enable {
301301
err = csi.CreateUpdateClientProfileRadosNamespace(r.clusterInfo.Context, r.client, r.clusterInfo, cephBlockPoolNamespacedName, buildClusterID(cephBlockPoolRadosNamespace), cephCluster.Name)
302302
if err != nil {
303303
return reconcile.Result{}, errors.Wrap(err, "failed to create ceph csi-op config CR for RadosNamespace")

0 commit comments

Comments
 (0)