Changed labels

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

Author: yuriolisa

internal/manifests/collector/service.go

@@ -29,10 +29,12 @@ import (
 	"github.com/open-telemetry/opentelemetry-operator/internal/naming"
 )
 
-// headless label is to differentiate the headless service from the clusterIP service.
+// headless and monitoring labels are to differentiate the headless/monitoring services from the clusterIP service.
 const (
-	headlessLabel  = "operator.opentelemetry.io/collector-headless-service"
-	headlessExists = "Exists"
+	headlessLabel    = "operator.opentelemetry.io/collector-headless-service"
+	headlessExists   = "Exists"
+	monitoringLabel  = "operator.opentelemetry.io/collector-monitoring-service"
+	monitoringExists = "Exists"
 )
 
 func HeadlessService(params manifests.Params) (*corev1.Service, error) {
@@ -44,7 +46,7 @@ func HeadlessService(params manifests.Params) (*corev1.Service, error) {
 	h.Name = naming.HeadlessService(params.OtelCol.Name)
 	h.Labels[headlessLabel] = headlessExists
 
-	// copy to avoid modifying params.OtelCol.Annotations
+	// copy to avoid modifying params.OtelCol.annotations
 	annotations := map[string]string{
 		"service.beta.openshift.io/serving-cert-secret-name": fmt.Sprintf("%s-tls", h.Name),
 	}
@@ -61,6 +63,7 @@ func MonitoringService(params manifests.Params) (*corev1.Service, error) {
 
 	name := naming.MonitoringService(params.OtelCol.Name)
 	labels := manifestutils.Labels(params.OtelCol.ObjectMeta, name, params.OtelCol.Spec.Image, ComponentOpenTelemetryCollector, []string{})
+	labels[monitoringLabel] = monitoringExists
 
 	out, err := params.OtelCol.Spec.Config.Yaml()
 	if err != nil {

internal/manifests/collector/servicemonitor.go

@@ -44,7 +44,6 @@ func ServiceMonitor(params manifests.Params) (*monitoringv1.ServiceMonitor, erro
 	}
 	name := naming.ServiceMonitor(params.OtelCol.Name)
 	labels := manifestutils.Labels(params.OtelCol.ObjectMeta, name, params.OtelCol.Spec.Image, ComponentOpenTelemetryCollector, []string{})
-	selectorMatchLabels := manifestutils.SelectorMatchLabels(params.OtelCol.ObjectMeta, ComponentOpenTelemetryCollector)
 	sm = monitoringv1.ServiceMonitor{
 		ObjectMeta: metav1.ObjectMeta{
 			Namespace: params.OtelCol.Namespace,
@@ -61,7 +60,9 @@ func ServiceMonitor(params manifests.Params) (*monitoringv1.ServiceMonitor, erro
 				MatchNames: []string{params.OtelCol.Namespace},
 			},
 			Selector: metav1.LabelSelector{
-				MatchLabels: selectorMatchLabels,
+				MatchLabels: map[string]string{
+					"operator.opentelemetry.io/collector-monitoring-service": "Exists",
+				},
 			},
 		},
 	}

internal/manifests/collector/servicemonitor_test.go

@@ -60,11 +60,7 @@ func TestDesiredServiceMonitorsWithPrometheus(t *testing.T) {
 	assert.Equal(t, "prometheus-dev", actual.Spec.Endpoints[1].Port)
 	assert.Equal(t, "prometheus-prod", actual.Spec.Endpoints[2].Port)
 	expectedSelectorLabels := map[string]string{
-		"app.kubernetes.io/component":  "opentelemetry-collector",
-		"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":       naming.MonitoringService(params.OtelCol.Name),
+		"operator.opentelemetry.io/collector-monitoring-service": "Exists",
 	}
 	assert.Equal(t, expectedSelectorLabels, actual.Spec.Selector.MatchLabels)
 }

internal/manifests/manifestutils/labels.go

@@ -81,14 +81,3 @@ func SelectorLabels(instance metav1.ObjectMeta, component string) map[string]str
 		"app.kubernetes.io/component":  component,
 	}
 }
-
-// SelectorMatchLabels return the common labels that should be used on ServiceMonitor when the Spec.Observability.Metrics.EnableMetrics is true.
-func SelectorMatchLabels(instance metav1.ObjectMeta, component string) map[string]string {
-	return map[string]string{
-		"app.kubernetes.io/managed-by": "opentelemetry-operator",
-		"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":       naming.MonitoringService(instance.Name),
-	}
-}

internal/manifests/manifestutils/labels_test.go

@@ -168,23 +168,3 @@ func TestSelectorLabels(t *testing.T) {
 	// verify
 	assert.Equal(t, expected, result)
 }
-
-func TestSelectorMatchLabels(t *testing.T) {
-	// prepare
-	expected := map[string]string{
-		"app.kubernetes.io/component":  "opentelemetry-collector",
-		"app.kubernetes.io/instance":   "my-namespace.my-opentelemetry",
-		"app.kubernetes.io/managed-by": "opentelemetry-operator",
-		"app.kubernetes.io/part-of":    "opentelemetry",
-		"app.kubernetes.io/name":       "my-opentelemetry-collector-monitoring",
-	}
-	otelcol := v1alpha1.OpenTelemetryCollector{
-		ObjectMeta: metav1.ObjectMeta{Name: "my-opentelemetry", Namespace: "my-namespace"},
-	}
-
-	// test
-	result := SelectorMatchLabels(otelcol.ObjectMeta, "opentelemetry-collector")
-
-	// verify
-	assert.Equal(t, expected, result)
-}

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

@@ -17,9 +17,7 @@ spec:
     - create-sm-prometheus
   selector:
     matchLabels:
-      app.kubernetes.io/managed-by: opentelemetry-operator
-      app.kubernetes.io/instance: create-sm-prometheus.simplest
-      app.kubernetes.io/name: simplest-collector-monitoring
+      operator.opentelemetry.io/collector-monitoring-service: "Exists"
 ---
 apiVersion: v1
 kind: Service

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

@@ -16,9 +16,8 @@ spec:
     - create-sm-prometheus
   selector:
     matchLabels:
-      app.kubernetes.io/managed-by: opentelemetry-operator
-      app.kubernetes.io/instance: create-sm-prometheus.simplest
-      app.kubernetes.io/name: simplest-collector-monitoring
+      operator.opentelemetry.io/collector-monitoring-service: "Exists"
+
 ---
 apiVersion: v1
 kind: Service

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

@@ -17,6 +17,4 @@ spec:
     - create-sm-prometheus
   selector:
     matchLabels:
-      app.kubernetes.io/managed-by: opentelemetry-operator
-      app.kubernetes.io/instance: create-sm-prometheus.simplest
-      app.kubernetes.io/name: simplest-collector-monitoring
+      operator.opentelemetry.io/collector-monitoring-service: "Exists"

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

@@ -16,6 +16,4 @@ spec:
     - create-sm-prometheus
   selector:
     matchLabels:
-      app.kubernetes.io/managed-by: opentelemetry-operator
-      app.kubernetes.io/instance: create-sm-prometheus.simplest
-      app.kubernetes.io/name: simplest-collector-monitoring
+      operator.opentelemetry.io/collector-monitoring-service: "Exists"