Merge pull request #1024 from austincunningham/THREESCALE-11344-2.15

Threescale 11344 2.15 create an generic pod monitor mutator to apply changes to the update

Author: austincunningham

pkg/3scale/amp/operator/system_reconciler.go

@@ -288,7 +288,7 @@ func (r *SystemReconciler) Reconcile() (reconcile.Result, error) {
 		return reconcile.Result{}, err
 	}
 
-	err = r.ReconcilePodMonitor(system.SystemAppPodMonitor(), reconcilers.CreateOnlyMutator)
+	err = r.ReconcilePodMonitor(system.SystemAppPodMonitor(), reconcilers.GenericPodMonitorMutator)
 	if err != nil {
 		return reconcile.Result{}, err
 	}

pkg/reconcilers/pod_monitors.go

@@ -0,0 +1,27 @@
+package reconcilers
+
+import (
+	"fmt"
+	"github.com/3scale/3scale-operator/pkg/common"
+	monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
+	"reflect"
+)
+
+func GenericPodMonitorMutator(existingObj, desiredObj common.KubernetesObject) (bool, error) {
+	existing, ok := existingObj.(*monitoringv1.PodMonitor)
+	if !ok {
+		return false, fmt.Errorf("%T is not a *monitoringv1.PodMonitor", existingObj)
+	}
+	desired, ok := desiredObj.(*monitoringv1.PodMonitor)
+	if !ok {
+		return false, fmt.Errorf("%T is not a *monitoringv1.PodMonitor", desiredObj)
+	}
+
+	updated := false
+	if !reflect.DeepEqual(desired.Spec, existing.Spec) {
+		existing.Spec = desired.Spec
+		updated = true
+	}
+
+	return updated, nil
+}

pkg/reconcilers/pod_monitors_test.go

@@ -0,0 +1,43 @@
+package reconcilers
+
+import (
+	monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"testing"
+)
+
+func podMonitoringTestFactory(port string) *monitoringv1.PodMonitor {
+	return &monitoringv1.PodMonitor{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: "test-app",
+		},
+		Spec: monitoringv1.PodMonitorSpec{
+			PodMetricsEndpoints: []monitoringv1.PodMetricsEndpoint{
+				{
+					Port:   port,
+					Path:   "/metrics",
+					Scheme: "http",
+				},
+			},
+		},
+	}
+}
+func TestGenericPodMonitorMutator(t *testing.T) {
+	var existingPort string = "8080"
+	var desiredPort string = "9090"
+
+	existing := podMonitoringTestFactory(existingPort)
+	desired := podMonitoringTestFactory(desiredPort)
+
+	update, err := GenericPodMonitorMutator(existing, desired)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if !update {
+		t.Fatal("when defaults can be applied, reconciler reported no update needed")
+	}
+
+	if existing.Spec.PodMetricsEndpoints[0].Port != desiredPort {
+		t.Fatalf("PodMonitor not reconciled. Expected: %s, got: %s", desiredPort, existing.Spec.PodMetricsEndpoints[0].Port)
+	}
+}