Remove the central service monitor

Author: ruivieira

controllers/monitor.go

@@ -13,8 +13,7 @@ import (
 )
 
 const (
-	centralServiceMonitorTemplatePath = "service/service-monitor-central.tmpl.yaml"
-	localServiceMonitorTemplatePath   = "service/service-monitor-local.tmpl.yaml"
+	localServiceMonitorTemplatePath = "service/service-monitor-local.tmpl.yaml"
 )
 
 type ServiceMonitorConfig struct {
@@ -23,52 +22,6 @@ type ServiceMonitorConfig struct {
 	ServiceName   string
 }
 
-// createCentralServiceMonitorObject generates the ServiceMonitor spec for central ServiceMonitor
-func createCentralServiceMonitorObject(ctx context.Context, deploymentNamespace string) (*monitoringv1.ServiceMonitor, error) {
-
-	config := ServiceMonitorConfig{
-		Namespace:     deploymentNamespace,
-		ComponentName: componentName,
-		ServiceName:   serviceMonitorName,
-	}
-
-	var serviceMonitor *monitoringv1.ServiceMonitor
-	serviceMonitor, err := templateParser.ParseResource[monitoringv1.ServiceMonitor](centralServiceMonitorTemplatePath, config, reflect.TypeOf(&monitoringv1.ServiceMonitor{}))
-	if err != nil {
-		log.FromContext(ctx).Error(err, "Error parsing the central ServiceMonitor template")
-		return nil, err
-	}
-
-	return serviceMonitor, nil
-}
-
-// ensureCentralServiceMonitor ensures that the central ServiceMonitor is created
-func (r *TrustyAIServiceReconciler) ensureCentralServiceMonitor(ctx context.Context) error {
-	serviceMonitor, err := createCentralServiceMonitorObject(ctx, r.Namespace)
-	if err != nil {
-		return err
-	}
-
-	// Check if this ServiceMonitor already exists
-	found := &monitoringv1.ServiceMonitor{}
-	err = r.Get(ctx, types.NamespacedName{Name: serviceMonitor.Name, Namespace: serviceMonitor.Namespace}, found)
-	if err != nil {
-		if errors.IsNotFound(err) {
-			log.FromContext(ctx).Info("Creating a new central ServiceMonitor", "ServiceMonitor.Namespace", serviceMonitor.Namespace, "ServiceMonitor.Name", serviceMonitor.Name)
-			err = r.Create(ctx, serviceMonitor)
-			if err != nil {
-				log.FromContext(ctx).Error(err, "Failed to create central ServiceMonitor", "ServiceMonitor.Namespace", serviceMonitor.Namespace, "ServiceMonitor.Name", serviceMonitor.Name)
-				return err
-			}
-		} else {
-			log.FromContext(ctx).Error(err, "Failed to get central ServiceMonitor", "ServiceMonitor.Namespace", serviceMonitor.Namespace, "ServiceMonitor.Name", serviceMonitor.Name)
-			return err
-		}
-	}
-
-	return nil
-}
-
 // createLocalServiceMonitorObject generates the ServiceMonitor spec for a local ServiceMonitor
 func createLocalServiceMonitorObject(ctx context.Context, deploymentNamespace string, serviceMonitorName string) (*monitoringv1.ServiceMonitor, error) {
 

controllers/monitor_test.go

@@ -24,38 +24,6 @@ var _ = Describe("Service Monitor Reconciliation", func() {
 		ctx = context.Background()
 	})
 
-	Context("When creating a central ServiceMonitor", func() {
-
-		It("Should have correct values", func() {
-
-			err := reconciler.ensureCentralServiceMonitor(ctx)
-			Expect(err).ToNot(HaveOccurred())
-
-			// Define the ServiceMonitor object and fetch from the cluster
-			serviceMonitor := &monitoringv1.ServiceMonitor{}
-			err = k8sClient.Get(ctx, types.NamespacedName{Name: serviceMonitorName, Namespace: reconciler.Namespace}, serviceMonitor)
-			Expect(err).NotTo(HaveOccurred())
-
-			Expect(serviceMonitor.ObjectMeta.Name).To(Equal(serviceMonitorName))
-			Expect(serviceMonitor.ObjectMeta.Namespace).To(Equal(reconciler.Namespace))
-			Expect(serviceMonitor.Labels["modelmesh-service"]).To(Equal("modelmesh-serving"))
-
-			Expect(serviceMonitor.Spec.Selector.MatchLabels["app.kubernetes.io/part-of"]).To(Equal(componentName))
-
-			Expect(serviceMonitor.Spec.NamespaceSelector.Any).To(BeTrue())
-
-			Expect(serviceMonitor.Spec.Endpoints).To(HaveLen(1))
-			endpoint := serviceMonitor.Spec.Endpoints[0]
-			Expect(endpoint.BearerTokenSecret.Key).To(Equal(""))
-			Expect(endpoint.HonorLabels).To(BeTrue())
-
-			Expect(endpoint.Path).To(Equal("/q/metrics"))
-			Expect(endpoint.Scheme).To(Equal("http"))
-			Expect(endpoint.Params["match[]"]).To(ConsistOf("{__name__= \"trustyai_spd\"}", "{__name__= \"trustyai_dir\"}"))
-
-		})
-	})
-
 	Context("When creating a local ServiceMonitor", func() {
 		var instance *trustyaiopendatahubiov1alpha1.TrustyAIService
 		It("Should have correct values", func() {

controllers/templates/service/service-monitor-central.tmpl.yaml

@@ -217,12 +217,6 @@ func (r *TrustyAIServiceReconciler) Reconcile(ctx context.Context, req ctrl.Requ
 		return ctrl.Result{}, err
 	}
 
-	// Central Service Monitor
-	err = r.ensureCentralServiceMonitor(ctx)
-	if err != nil {
-		return RequeueWithError(err)
-	}
-
 	// Create route
 	// TODO: Change argument order
 	err = r.ReconcileRoute(instance, ctx)