Hub metrics collector feature (#1316)

* install Metrics Without Addon Signed-off-by: clyang82 <[email protected]> * install Metrics Without Addon Signed-off-by: clyang82 <[email protected]> * install Metrics Without Addon Signed-off-by: clyang82 <[email protected]> * modify endpoint operator Signed-off-by: clyang82 <[email protected]> * modify endpoint operator Signed-off-by: clyang82 <[email protected]> * check for global hub operator and prevent observability from installing in the spokes Signed-off-by: Coleen Iona Quadros <[email protected]> --------- Signed-off-by: clyang82 <[email protected]> Signed-off-by: Coleen Iona Quadros <[email protected]> Co-authored-by: clyang82 <[email protected]>
stolostron · Feb 8, 2024 · c47191c · c47191c
1 parent 3953cd8
commit c47191c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/operators/multiclusterobservability/controllers/placementrule/placementrule_controller.go b/operators/multiclusterobservability/controllers/placementrule/placementrule_controller.go
@@ -136,14 +136,21 @@ func (r *PlacementRuleReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 		return ctrl.Result{}, nil
 	}
 
+	//Check for MulticlusterGlobalHub CRD
+	mcghCrdExists := r.CRDMap[config.MCGHCrdName]
+	//if Multicluster Global hub exists we block metrics-collector creation in spokes
+	if mcghCrdExists {
+		mco.Spec.ObservabilityAddonSpec.EnableMetrics = false
+	}
+
 	if !deleteAll && !mco.Spec.ObservabilityAddonSpec.EnableMetrics {
 		reqLogger.Info("EnableMetrics is set to false. Delete Observability addons")
 		deleteAll = true
 	}
 
 	// check if the MCH CRD exists
 	mchCrdExists := r.CRDMap[config.MCHCrdName]
-	// requeue after 10 seconds if the mch crd exists and image image manifests map is empty
+	// requeue after 10 seconds if the mch crd exists and image  manifests map is empty
 	if mchCrdExists && len(config.GetImageManifests()) == 0 {
 		// if the mch CR is not ready, then requeue the request after 10s
 		return ctrl.Result{RequeueAfter: 10 * time.Second}, nil

diff --git a/operators/multiclusterobservability/main.go b/operators/multiclusterobservability/main.go
@@ -260,10 +260,17 @@ func main() {
 		os.Exit(1)
 	}
 
+	mcghCrdExists, err := operatorsutil.CheckCRDExist(crdClient, config.MCGHCrdName)
+	if err != nil {
+		setupLog.Error(err, "")
+		os.Exit(1)
+	}
+
 	crdMaps := map[string]bool{
 		config.MCHCrdName:                     mchCrdExists,
 		config.StorageVersionMigrationCrdName: svmCrdExists,
 		config.IngressControllerCRD:           ingressCtlCrdExists,
+		config.MCGHCrdName:                    mcghCrdExists,
 	}
 
 	if err = (&mcoctrl.MultiClusterObservabilityReconciler{

diff --git a/operators/multiclusterobservability/pkg/config/config.go b/operators/multiclusterobservability/pkg/config/config.go
@@ -249,6 +249,7 @@ const (
 	IngressControllerCRD           = "ingresscontrollers.operator.openshift.io"
 	MCHCrdName                     = "multiclusterhubs.operator.open-cluster-management.io"
 	MCOCrdName                     = "multiclusterobservabilities.observability.open-cluster-management.io"
+	MCGHCrdName                    = "multiclusterglobalhubs.operator.open-cluster-management.io"
 	StorageVersionMigrationCrdName = "storageversionmigrations.migration.k8s.io"
 )