Refactor observability schemas out to file

Signed-off-by: David Martin <[email protected]>

api/v1beta1/topology.go

@@ -5,13 +5,13 @@ import (
 	limitadorv1alpha1 "github.com/kuadrant/limitador-operator/api/v1alpha1"
 	"github.com/kuadrant/policy-machinery/controller"
 	"github.com/kuadrant/policy-machinery/machinery"
-	monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
 	"github.com/samber/lo"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	gatewayapiv1 "sigs.k8s.io/gateway-api/apis/v1"
 
 	"github.com/kuadrant/kuadrant-operator/pkg/kuadrant"
+	observability "github.com/kuadrant/kuadrant-operator/pkg/observability"
 )
 
 var (
@@ -71,7 +71,7 @@ func LinkKuadrantToServiceMonitor(objs controller.Store) machinery.LinkFunc {
 
 	return machinery.LinkFunc{
 		From: KuadrantGroupKind,
-		To:   schema.GroupKind{Group: monitoringv1.SchemeGroupVersion.Group, Kind: monitoringv1.ServiceMonitorsKind},
+		To:   observability.ServiceMonitorGroupKind,
 		Func: func(child machinery.Object) []machinery.Object {
 			return lo.Filter(kuadrants, func(_ machinery.Object, _ int) bool {
 				if metaObj, ok := child.(metav1.Object); ok {
@@ -90,7 +90,7 @@ func LinkKuadrantToPodMonitor(objs controller.Store) machinery.LinkFunc {
 
 	return machinery.LinkFunc{
 		From: KuadrantGroupKind,
-		To:   schema.GroupKind{Group: monitoringv1.SchemeGroupVersion.Group, Kind: monitoringv1.PodMonitorsKind},
+		To:   observability.PodMonitorGroupKind,
 		Func: func(child machinery.Object) []machinery.Object {
 			return lo.Filter(kuadrants, func(_ machinery.Object, _ int) bool {
 				if metaObj, ok := child.(metav1.Object); ok {

controllers/observability_reconciler.go

@@ -19,6 +19,7 @@ import (
 
 	kuadrantv1beta1 "github.com/kuadrant/kuadrant-operator/api/v1beta1"
 	"github.com/kuadrant/kuadrant-operator/pkg/kuadrant"
+	"github.com/kuadrant/kuadrant-operator/pkg/observability"
 )
 
 //+kubebuilder:rbac:groups=monitoring.coreos.com,resources=servicemonitors;podmonitors,verbs=get;list;watch;create;update;patch;delete
@@ -308,8 +309,8 @@ func NewObservabilityReconciler(client *dynamic.DynamicClient, rm meta.RESTMappe
 func (r *ObservabilityReconciler) Subscription() *controller.Subscription {
 	return &controller.Subscription{ReconcileFunc: r.Reconcile, Events: []controller.ResourceEventMatcher{
 		{Kind: &kuadrantv1beta1.KuadrantGroupKind},
-		{Kind: ptr.To(schema.GroupKind{Group: monitoringv1.SchemeGroupVersion.Group, Kind: monitoringv1.ServiceMonitorsKind}), EventType: ptr.To(controller.DeleteEvent)},
-		{Kind: ptr.To(schema.GroupKind{Group: monitoringv1.SchemeGroupVersion.Group, Kind: monitoringv1.PodMonitorsKind}), EventType: ptr.To(controller.DeleteEvent)},
+		{Kind: ptr.To(observability.ServiceMonitorGroupKind), EventType: ptr.To(controller.DeleteEvent)},
+		{Kind: ptr.To(observability.PodMonitorGroupKind), EventType: ptr.To(controller.DeleteEvent)},
 		{Kind: &machinery.GatewayGroupKind}, // all events
 		{Kind: &machinery.GatewayClassGroupKind, EventType: ptr.To(controller.CreateEvent)},
 		{Kind: &machinery.GatewayClassGroupKind, EventType: ptr.To(controller.DeleteEvent)},
@@ -343,16 +344,20 @@ func (r *ObservabilityReconciler) Reconcile(ctx context.Context, _ []controller.
 	logger.V(1).Info("observability enabled, creating monitors")
 
 	// Kuadrant Operator monitor
-	r.createMonitor(ctx, monitorObjs, kOpMonitorSpec, r.namespace, logger)
+	kOpMonitorSpec.SetNamespace(r.namespace)
+	r.createMonitor(ctx, monitorObjs, kOpMonitorSpec, observability.ServiceMonitorsResource, logger)
 
 	// DNS Operator monitor
-	r.createMonitor(ctx, monitorObjs, dnsOpMonitorSpec, r.namespace, logger)
+	dnsOpMonitorSpec.SetNamespace(r.namespace)
+	r.createMonitor(ctx, monitorObjs, dnsOpMonitorSpec, observability.ServiceMonitorsResource, logger)
 
 	// Authorino operator monitor
-	r.createMonitor(ctx, monitorObjs, authOpMonitorSpec, r.namespace, logger)
+	authOpMonitorSpec.SetNamespace(r.namespace)
+	r.createMonitor(ctx, monitorObjs, authOpMonitorSpec, observability.ServiceMonitorsResource, logger)
 
 	// Limitador operator monitor
-	r.createMonitor(ctx, monitorObjs, limitOpMonitorSpec, r.namespace, logger)
+	limitOpMonitorSpec.SetNamespace(r.namespace)
+	r.createMonitor(ctx, monitorObjs, limitOpMonitorSpec, observability.ServiceMonitorsResource, logger)
 
 	// Create monitors for each gateway instance of each gateway class
 	gatewayClasses := topology.Targetables().Items(func(o machinery.Object) bool {
@@ -363,21 +368,30 @@ func (r *ObservabilityReconciler) Reconcile(ctx context.Context, _ []controller.
 		gwClass := gatewayClass.(*machinery.GatewayClass)
 		if gwClass.GatewayClass.Spec.ControllerName == istioGatewayControllerName {
 			for _, gateway := range gateways {
-				r.createMonitor(ctx, monitorObjs, istiodMonitorSpec, istiodMonitorNS, logger)
-				r.createMonitor(ctx, monitorObjs, istioPodMonitorSpec, gateway.GetNamespace(), logger)
+				istiodMonitorSpec.SetNamespace(istiodMonitorNS)
+				r.createMonitor(ctx, monitorObjs, istiodMonitorSpec, observability.ServiceMonitorsResource, logger)
+				istioPodMonitorSpec.SetNamespace(gateway.GetNamespace())
+				r.createMonitor(ctx, monitorObjs, istioPodMonitorSpec, observability.PodMonitorsResource, logger)
 			}
 		} else if gwClass.GatewayClass.Spec.ControllerName == envoyGatewayGatewayControllerName {
 			for _, gateway := range gateways {
-				r.createMonitor(ctx, monitorObjs, envoyGatewayMonitorSpec, envoyGatewayMonitorNS, logger)
-				r.createMonitor(ctx, monitorObjs, envoyStatsMonitorSpec, gateway.GetNamespace(), logger)
+				envoyGatewayMonitorSpec.SetNamespace(envoyGatewayMonitorNS)
+				r.createMonitor(ctx, monitorObjs, envoyGatewayMonitorSpec, observability.ServiceMonitorsResource, logger)
+				envoyStatsMonitorSpec.SetNamespace(gateway.GetNamespace())
+				r.createMonitor(ctx, monitorObjs, envoyStatsMonitorSpec, observability.PodMonitorsResource, logger)
 			}
 		}
 	}
 
 	return nil
 }
 
-func (r *ObservabilityReconciler) createMonitor(ctx context.Context, monitorObjs []machinery.Object, monitor client.Object, ns string, logger logr.Logger) {
+func (r *ObservabilityReconciler) createMonitor(ctx context.Context, monitorObjs []machinery.Object, monitor client.Object, mappingResource schema.GroupVersionResource, logger logr.Logger) {
+	ns := monitor.GetNamespace()
+	if ns == "" {
+		logger.V(1).Info(fmt.Sprintf("cannot create monitor '%s' as namespace is not set, skipping create", monitor.GetName()))
+		return
+	}
 	_, monitorExists := lo.Find(monitorObjs, func(item machinery.Object) bool {
 		return item.GroupVersionKind().Kind == monitor.GetObjectKind().GroupVersionKind().Kind && item.GetName() == monitor.GetName() && item.GetNamespace() == ns
 	})
@@ -393,12 +407,7 @@ func (r *ObservabilityReconciler) createMonitor(ctx context.Context, monitorObjs
 		return
 	}
 
-	mapping, err := r.restMapper.RESTMapping(monitor.GetObjectKind().GroupVersionKind().GroupKind())
-	if err != nil {
-		logger.Error(err, fmt.Sprintf("failed to get monitor restmapping %s/%s", ns, monitor.GetName()))
-		return
-	}
-	if _, err = r.Client.Resource(mapping.Resource).Namespace(ns).Create(ctx, obj, metav1.CreateOptions{}); err != nil {
+	if _, err = r.Client.Resource(mappingResource).Namespace(ns).Create(ctx, obj, metav1.CreateOptions{}); err != nil {
 		logger.Error(err, fmt.Sprintf("error creating monitor %s/%s", ns, monitor.GetName()))
 		return
 	}

controllers/state_of_the_world.go

@@ -37,6 +37,7 @@ import (
 	kuadrantgatewayapi "github.com/kuadrant/kuadrant-operator/pkg/gatewayapi"
 	"github.com/kuadrant/kuadrant-operator/pkg/istio"
 	"github.com/kuadrant/kuadrant-operator/pkg/kuadrant"
+	"github.com/kuadrant/kuadrant-operator/pkg/observability"
 	"github.com/kuadrant/kuadrant-operator/pkg/openshift"
 	"github.com/kuadrant/kuadrant-operator/pkg/openshift/consoleplugin"
 	"github.com/kuadrant/kuadrant-operator/pkg/utils"
@@ -423,8 +424,8 @@ func (b *BootOptionsBuilder) getObservabilityOptions() []controller.ControllerOp
 			controller.FilterResourcesByLabel[*monitoringv1.PodMonitor](kuadrant.ObservabilityLabel),
 		)),
 		controller.WithObjectKinds(
-			schema.GroupKind{Group: monitoringv1.SchemeGroupVersion.Group, Kind: monitoringv1.ServiceMonitorsKind},
-			schema.GroupKind{Group: monitoringv1.SchemeGroupVersion.Group, Kind: monitoringv1.PodMonitorsKind},
+			observability.ServiceMonitorGroupKind,
+			observability.PodMonitorGroupKind,
 		),
 		controller.WithObjectLinks(
 			kuadrantv1beta1.LinkKuadrantToServiceMonitor,

pkg/observability/schema.go

@@ -0,0 +1,14 @@
+package observability
+
+import (
+	monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+)
+
+var (
+	ServiceMonitorsResource = monitoringv1.SchemeGroupVersion.WithResource("servicemonitors")
+	PodMonitorsResource     = monitoringv1.SchemeGroupVersion.WithResource("podmonitors")
+
+	ServiceMonitorGroupKind = schema.GroupKind{Group: monitoringv1.SchemeGroupVersion.Group, Kind: monitoringv1.ServiceMonitorsKind}
+	PodMonitorGroupKind     = schema.GroupKind{Group: monitoringv1.SchemeGroupVersion.Group, Kind: monitoringv1.PodMonitorsKind}
+)