Start both auto and federated service monitor controller

Signed-off-by: Tamal Saha <[email protected]>
open-viz · Jan 28, 2024 · 9012417 · 9012417
1 parent 5522257
commit 9012417
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/pkg/apiserver/apiserver.go b/pkg/apiserver/apiserver.go
@@ -201,24 +201,19 @@ func (c completedConfig) New(ctx context.Context) (*UIServer, error) {
 		Group: monitoring.GroupName,
 		Kind:  monitoringv1.ServiceMonitorsKind,
 	}, func(ctx context.Context, mgr ctrl.Manager) {
-		if err = servicemonitorcontroller.NewFederationReconciler(
+		if err = servicemonitorcontroller.NewAutoReconciler(
 			c.ExtraConfig.ClientConfig,
 			mgr.GetClient(),
 		).SetupWithManager(mgr); err != nil {
-			klog.Error(err, "unable to create controller", " federation controller", "ServiceMonitor")
+			klog.Error(err, "unable to create controller", "auto controller", "ServiceMonitor")
 			os.Exit(1)
 		}
-	})
 
-	apiextensions.RegisterSetup(schema.GroupKind{
-		Group: monitoring.GroupName,
-		Kind:  monitoringv1.ServiceMonitorsKind,
-	}, func(ctx context.Context, mgr ctrl.Manager) {
-		if err = servicemonitorcontroller.NewAutoReconciler(
+		if err = servicemonitorcontroller.NewFederationReconciler(
 			c.ExtraConfig.ClientConfig,
 			mgr.GetClient(),
 		).SetupWithManager(mgr); err != nil {
-			klog.Error(err, "unable to create controller", "auto controller", "ServiceMonitor")
+			klog.Error(err, "unable to create controller", " federation controller", "ServiceMonitor")
 			os.Exit(1)
 		}
 	})

diff --git a/pkg/cmds/operator.go b/pkg/cmds/operator.go
@@ -28,7 +28,6 @@ import (
 )
 
 func NewCmdOperator(ctx context.Context) *cobra.Command {
-	// o := server.NewOperatorOptions()
 	o := server.NewOperatorOptions()
 
 	cmd := &cobra.Command{