fixup! refactor observability controller

Author: eguzki

controllers/observability_reconciler.go

@@ -198,7 +198,8 @@ func istioPodMonitorBuild(ns string) *monitoringv1.PodMonitor {
 			APIVersion: monitoringv1.SchemeGroupVersion.String(),
 		},
 		ObjectMeta: metav1.ObjectMeta{
-			Name: istioPodMonitorName,
+			Name:      istioPodMonitorName,
+			Namespace: ns,
 			Labels: map[string]string{
 				kuadrant.ObservabilityLabel: "true",
 			},
@@ -300,7 +301,8 @@ func envoyStatsMonitorBuild(ns string) *monitoringv1.PodMonitor {
 			APIVersion: monitoringv1.SchemeGroupVersion.String(),
 		},
 		ObjectMeta: metav1.ObjectMeta{
-			Name: envoyStatsMonitorName,
+			Name:      envoyStatsMonitorName,
+			Namespace: ns,
 			Labels: map[string]string{
 				kuadrant.ObservabilityLabel: "true",
 			},
@@ -353,8 +355,9 @@ func (r *ObservabilityReconciler) Subscription() *controller.Subscription {
 	}
 }
 
-func (r *ObservabilityReconciler) Reconcile(ctx context.Context, _ []controller.ResourceEvent, topology *machinery.Topology, _ error, _ *sync.Map) error {
-	logger := controller.LoggerFromContext(ctx).WithName("ObservabilityReconciler")
+func (r *ObservabilityReconciler) Reconcile(baseCtx context.Context, _ []controller.ResourceEvent, topology *machinery.Topology, _ error, _ *sync.Map) error {
+	logger := controller.LoggerFromContext(baseCtx).WithName("ObservabilityReconciler")
+	ctx := logr.NewContext(baseCtx, logger)
 	logger.V(1).Info("reconciling observability", "status", "started")
 	defer logger.V(1).Info("reconciling observability", "status", "completed")
 
@@ -380,31 +383,19 @@ func (r *ObservabilityReconciler) Reconcile(ctx context.Context, _ []controller.
 
 	// Kuadrant Operator monitor
 	kOpMonitor := kOpMonitorBuild(r.namespace)
-	err := r.createServiceMonitor(ctx, kOpMonitor, logger)
-	if err != nil {
-		return err
-	}
+	r.createServiceMonitor(ctx, kOpMonitor, logger)
 
 	// DNS Operator monitor
 	dnsOpMonitor := dnsOpMonitorBuild(r.namespace)
-	err = r.createServiceMonitor(ctx, dnsOpMonitor, logger)
-	if err != nil {
-		return err
-	}
+	r.createServiceMonitor(ctx, dnsOpMonitor, logger)
 
 	// Authorino operator monitor
 	authOpMonitor := authOpMonitorBuild(r.namespace)
-	err = r.createServiceMonitor(ctx, authOpMonitor, logger)
-	if err != nil {
-		return err
-	}
+	r.createServiceMonitor(ctx, authOpMonitor, logger)
 
 	// Limitador operator monitor
 	limitOpMonitor := limitOpMonitorBuild(r.namespace)
-	err = r.createServiceMonitor(ctx, limitOpMonitor, logger)
-	if err != nil {
-		return err
-	}
+	r.createServiceMonitor(ctx, limitOpMonitor, logger)
 
 	// Create monitors for each gateway instance of each gateway class
 	gatewayClasses := topology.Targetables().Items(func(o machinery.Object) bool {
@@ -415,31 +406,19 @@ func (r *ObservabilityReconciler) Reconcile(ctx context.Context, _ []controller.
 		gwClass := gatewayClass.(*machinery.GatewayClass)
 		if gwClass.GatewayClass.Spec.ControllerName == istioGatewayControllerName {
 			istiodMonitor := istiodMonitorBuild(istiodMonitorNS)
-			err := r.createServiceMonitor(ctx, istiodMonitor, logger)
-			if err != nil {
-				return err
-			}
+			r.createServiceMonitor(ctx, istiodMonitor, logger)
 
 			for _, gateway := range gateways {
 				istioPodMonitor := istioPodMonitorBuild(gateway.GetNamespace())
-				err = r.createPodMonitor(ctx, istioPodMonitor, logger)
-				if err != nil {
-					return err
-				}
+				r.createPodMonitor(ctx, istioPodMonitor, logger)
 			}
 		} else if gwClass.GatewayClass.Spec.ControllerName == envoyGatewayGatewayControllerName {
 			envoyGatewayMonitor := envoyGatewayMonitorBuild(envoyGatewayMonitorNS)
-			err = r.createServiceMonitor(ctx, envoyGatewayMonitor, logger)
-			if err != nil {
-				return err
-			}
+			r.createServiceMonitor(ctx, envoyGatewayMonitor, logger)
 
 			for _, gateway := range gateways {
 				envoyStatsMonitor := envoyStatsMonitorBuild(gateway.GetNamespace())
-				err = r.createPodMonitor(ctx, envoyStatsMonitor, logger)
-				if err != nil {
-					return err
-				}
+				r.createPodMonitor(ctx, envoyStatsMonitor, logger)
 			}
 		}
 	}