Fixed labels names

Signed-off-by: Yuri Sa <[email protected]>

Author: yuriolisa

internal/manifests/collector/podmonitor_test.go

@@ -48,7 +48,7 @@ func TestDesiredPodMonitors(t *testing.T) {
 		"app.kubernetes.io/instance":   fmt.Sprintf("%s.%s", params.OtelCol.Namespace, params.OtelCol.Name),
 		"app.kubernetes.io/managed-by": "opentelemetry-operator",
 		"app.kubernetes.io/part-of":    "opentelemetry",
-		"app.kubernetes.io/name":       "otel-collector-monitoring",
+		"app.kubernetes.io/name":       fmt.Sprintf("%s-monitoring", params.OtelCol.Name),
 	}
 	assert.Equal(t, expectedSelectorLabels, actual.Spec.Selector.MatchLabels)
 }
@@ -71,7 +71,7 @@ func TestDesiredPodMonitorsWithPrometheus(t *testing.T) {
 		"app.kubernetes.io/instance":   fmt.Sprintf("%s.%s", params.OtelCol.Namespace, params.OtelCol.Name),
 		"app.kubernetes.io/managed-by": "opentelemetry-operator",
 		"app.kubernetes.io/part-of":    "opentelemetry",
-		"app.kubernetes.io/name":       "otel-collector-monitoring",
+		"app.kubernetes.io/name":       fmt.Sprintf("%s-monitoring", params.OtelCol.Name),
 	}
 	assert.Equal(t, expectedSelectorLabels, actual.Spec.Selector.MatchLabels)
 }

internal/manifests/collector/servicemonitor_test.go

@@ -40,7 +40,7 @@ func TestDesiredServiceMonitors(t *testing.T) {
 		"app.kubernetes.io/instance":   fmt.Sprintf("%s.%s", params.OtelCol.Namespace, params.OtelCol.Name),
 		"app.kubernetes.io/managed-by": "opentelemetry-operator",
 		"app.kubernetes.io/part-of":    "opentelemetry",
-		"app.kubernetes.io/name":       "otel-collector-monitoring",
+		"app.kubernetes.io/name":       fmt.Sprintf("%s-monitoring", params.OtelCol.Name),
 	}
 	assert.Equal(t, expectedSelectorLabels, actual.Spec.Selector.MatchLabels)
 }
@@ -62,7 +62,7 @@ func TestDesiredServiceMonitorsWithPrometheus(t *testing.T) {
 		"app.kubernetes.io/instance":   fmt.Sprintf("%s.%s", params.OtelCol.Namespace, params.OtelCol.Name),
 		"app.kubernetes.io/managed-by": "opentelemetry-operator",
 		"app.kubernetes.io/part-of":    "opentelemetry",
-		"app.kubernetes.io/name":       "otel-collector-monitoring",
+		"app.kubernetes.io/name":       fmt.Sprintf("%s-monitoring", params.OtelCol.Name),
 	}
 	assert.Equal(t, expectedSelectorLabels, actual.Spec.Selector.MatchLabels)
 }

internal/manifests/manifestutils/labels.go

@@ -15,6 +15,7 @@
 package manifestutils
 
 import (
+	"fmt"
 	"regexp"
 	"strings"
 
@@ -88,6 +89,6 @@ func SelectorMatchLabels(instance metav1.ObjectMeta, component string) map[strin
 		"app.kubernetes.io/instance":   naming.Truncate("%s.%s", 63, instance.Namespace, instance.Name),
 		"app.kubernetes.io/part-of":    "opentelemetry",
 		"app.kubernetes.io/component":  component,
-		"app.kubernetes.io/name":       "otel-collector-monitoring",
+		"app.kubernetes.io/name":       fmt.Sprintf("%s-monitoring", instance.Name),
 	}
 }

internal/manifests/manifestutils/labels_test.go

@@ -176,7 +176,7 @@ func TestSelectorMatchLabels(t *testing.T) {
 		"app.kubernetes.io/instance":   "my-namespace.my-opentelemetry-collector",
 		"app.kubernetes.io/managed-by": "opentelemetry-operator",
 		"app.kubernetes.io/part-of":    "opentelemetry",
-		"app.kubernetes.io/name":       "otel-collector-monitoring",
+		"app.kubernetes.io/name":       "my-opentelemetry-collector-monitoring",
 	}
 	otelcol := v1alpha1.OpenTelemetryCollector{
 		ObjectMeta: metav1.ObjectMeta{Name: "my-opentelemetry-collector", Namespace: "my-namespace"},

tests/e2e-prometheuscr/create-pm-prometheus-exporters/01-assert.yaml

@@ -42,4 +42,4 @@ spec:
     matchLabels:
       app.kubernetes.io/managed-by: opentelemetry-operator
       app.kubernetes.io/instance: create-pm-prometheus.simplest
-      app.kubernetes.io/name: otel-collector-monitoring
+      app.kubernetes.io/name: simplest-collector-monitoring

tests/e2e-prometheuscr/create-sm-prometheus-exporters/01-assert.yaml

@@ -19,7 +19,7 @@ spec:
     matchLabels:
       app.kubernetes.io/managed-by: opentelemetry-operator
       app.kubernetes.io/instance: create-sm-prometheus.simplest
-      app.kubernetes.io/name: otel-collector-monitoring
+      app.kubernetes.io/name: simplest-collector-monitoring
 ---
 apiVersion: v1
 kind: Service

tests/e2e-prometheuscr/create-sm-prometheus-exporters/02-assert.yaml

@@ -18,7 +18,7 @@ spec:
     matchLabels:
       app.kubernetes.io/managed-by: opentelemetry-operator
       app.kubernetes.io/instance: create-sm-prometheus.simplest
-      app.kubernetes.io/name: otel-collector-monitoring
+      app.kubernetes.io/name: simplest-collector-monitoring
 ---
 apiVersion: v1
 kind: Service

tests/e2e-prometheuscr/create-sm-prometheus-exporters/05-assert.yaml

@@ -19,4 +19,4 @@ spec:
     matchLabels:
       app.kubernetes.io/managed-by: opentelemetry-operator
       app.kubernetes.io/instance: create-sm-prometheus.simplest
-      app.kubernetes.io/name: otel-collector-monitoring
+      app.kubernetes.io/name: simplest-collector-monitoring

tests/e2e-prometheuscr/create-sm-prometheus-exporters/06-assert.yaml

@@ -18,4 +18,4 @@ spec:
     matchLabels:
       app.kubernetes.io/managed-by: opentelemetry-operator
       app.kubernetes.io/instance: create-sm-prometheus.simplest
-      app.kubernetes.io/name: otel-collector-monitoring
+      app.kubernetes.io/name: simplest-collector-monitoring