delete service monitor in openshift montitoring namespace

Signed-off-by: Coleen Iona Quadros <[email protected]>

operators/multiclusterobservability/controllers/multiclusterobservability/multiclusterobservability_controller.go

@@ -8,6 +8,7 @@ import (
 	"fmt"
 	"os"
 	"reflect"
+	"strings"
 	"time"
 
 	"github.com/go-logr/logr"
@@ -316,6 +317,11 @@ func (r *MultiClusterObservabilityReconciler) Reconcile(ctx context.Context, req
 			reqLogger.Error(err, "Failed to delete the specific PrometheusRule in the openshift-monitoring namespace")
 			return ctrl.Result{}, err
 		}
+		// Delete ServiceMonitor from openshft-monitoring namespace
+		if err := r.deleteServiceMonitorInOpenshiftMonitoringNamespace(ctx); err != nil {
+			reqLogger.Error(err, "Failed to delete service monitor in the openshift-monitoring namespace")
+			return ctrl.Result{}, err
+		}
 	}
 
 	//update status
@@ -950,6 +956,7 @@ func cleanUpClusterScopedResources(
 	return nil
 }
 
+// Delete the PrometheusRule in openshift-monitoring namespace
 func (r *MultiClusterObservabilityReconciler) deleteSpecificPrometheusRule(ctx context.Context) error {
 	promRule := &monitoringv1.PrometheusRule{}
 	err := r.Client.Get(ctx, client.ObjectKey{Name: "acm-observability-alert-rules",
@@ -968,3 +975,25 @@ func (r *MultiClusterObservabilityReconciler) deleteSpecificPrometheusRule(ctx c
 
 	return nil
 }
+
+// Delete the ServiceMonitor in openshift-monitoring namespace
+func (r *MultiClusterObservabilityReconciler) deleteServiceMonitorInOpenshiftMonitoringNamespace(ctx context.Context) error {
+	serviceMonitorList := &monitoringv1.ServiceMonitorList{}
+	err := r.Client.List(ctx, serviceMonitorList, client.InNamespace("openshift-monitoring"))
+	if !apierrors.IsNotFound(err) && err != nil {
+		log.Error(err, "Failed to fetch ServiceMonitors")
+		return err
+	}
+
+	for _, sm := range serviceMonitorList.Items {
+		if strings.HasPrefix(sm.Name, "observability-") {
+			err = r.Client.Delete(ctx, sm)
+			if err != nil {
+				log.Error(err, "Failed to delete ServiceMonitor", "ServiceMonitorName", sm.Name)
+				return err
+			}
+			log.Info("Deleted ServiceMonitor", "ServiceMonitorName", sm.Name)
+		}
+	}
+	return nil
+}