Hub metrics collector feature (stolostron#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]>
coleenquadros · Feb 10, 2024 · e6c815c · e6c815c
1 parent 8603ec0
commit e6c815c
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 18 deletions.
diff --git a/operators/multiclusterobservability/controllers/placementrule/placementrule_controller.go b/operators/multiclusterobservability/controllers/placementrule/placementrule_controller.go
@@ -136,14 +136,6 @@ func (r *PlacementRuleReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 		return ctrl.Result{}, nil
 	}
 
-	//Check for MulticlusterGlobalHub CRD
-	mcghCrdExists := r.CRDMap[config.MCGHCrdName]
-	log.Info("Coleen MulticlusterGlobalHub CRD exists", "exists", mcghCrdExists)
-	//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

diff --git a/operators/multiclusterobservability/main.go b/operators/multiclusterobservability/main.go
@@ -7,7 +7,6 @@ package main
 import (
 	"flag"
 	"fmt"
-	"github.com/cloudflare/cfssl/log"
 	"os"
 
 	// Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.)
@@ -261,18 +260,10 @@ func main() {
 		os.Exit(1)
 	}
 
-	mcghCrdExists, err := operatorsutil.CheckCRDExist(crdClient, config.MCGHCrdName)
-	log.Info("Coleen Checking if MCGH CRD exists", "exists", mcghCrdExists)
-	if err != nil {
-		setupLog.Error(err, "Coleen")
-		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,7 +249,6 @@ 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"
 )