feedc0de/my-rook-config
1
0
Fork 0
forked from rook/rook
Code Pull Requests Activity

core: move clusterInfo discovery in converged cluster

Browse Source 
The external code has its own mechanism to look up the clusterInfo so
let's move this to the non-external condition to clarify the code.

Signed-off-by: Sébastien Han <seb@redhat.com>
This commit is contained in:
Sébastien Han
2022-02-17 15:32:37 +01:00
parent fdcad15b87
commit 47b8bb989e
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/operator/ceph/cluster/cluster.go
+12 -13
View File
@@ -173,19 +173,6 @@ func (c *ClusterController) initializeCluster(cluster *cluster) error {
}
}
clusterInfo, _, _, err := mon.LoadClusterInfo(c.context, c.OpManagerCtx, cluster.Namespace)
if err != nil {
if errors.Is(err, mon.ClusterInfoNoClusterNoSecret) {
logger.Info("clusterInfo not yet found, must be a new cluster.")
} else {
return errors.Wrap(err, "failed to load cluster info")
}
} else {
clusterInfo.OwnerInfo = cluster.ownerInfo
clusterInfo.SetName(c.namespacedName.Name)
cluster.ClusterInfo = clusterInfo
}
// Depending on the cluster type choose the correct orchestation
if cluster.Spec.External.Enable {
err := c.configureExternalCephCluster(cluster)
@@ -194,6 +181,18 @@ func (c *ClusterController) initializeCluster(cluster *cluster) error {
return errors.Wrap(err, "failed to configure external ceph cluster")
}
} else {
clusterInfo, _, _, err := mon.LoadClusterInfo(c.context, c.OpManagerCtx, cluster.Namespace)
if err != nil {
if errors.Is(err, mon.ClusterInfoNoClusterNoSecret) {
logger.Info("clusterInfo not yet found, must be a new cluster.")
} else {
return errors.Wrap(err, "failed to load cluster info")
}
} else {
clusterInfo.OwnerInfo = cluster.ownerInfo
clusterInfo.SetName(c.namespacedName.Name)
cluster.ClusterInfo = clusterInfo
}
// If the local cluster has already been configured, immediately start monitoring the cluster.
// Test if the cluster has already been configured if the mgr deployment has been created.
// If the mgr does not exist, the mons have never been verified to be in quorum.