Skip to content

Commit 1621eed

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 1621eed

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

pkg/operator/ceph/cluster/cluster_external.go

+10
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,16 @@ func (c *ClusterController) configureExternalCephCluster(cluster *cluster) error
176176
}
177177
}
178178

179+
logger.Info("create cephConnection and defaultClientProfile for external mode")
180+
err = csi.CreateUpdateCephConnection(c.context.Client, cluster.ClusterInfo, *cluster.Spec)
181+
if err != nil {
182+
return errors.Wrap(err, "failed to create/update cephConnection")
183+
}
184+
err = csi.CreateDefaultClientProfile(c.context.Client, cluster.ClusterInfo, cluster.ClusterInfo.NamespacedName())
185+
if err != nil {
186+
return errors.Wrap(err, "failed to create/update default client profile")
187+
}
188+
179189
// We don't update the connection status since it is done by the health go routine
180190
return nil
181191
}

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)