Readded common labels

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

Author: yuriolisa

controllers/builder_test.go

@@ -1949,7 +1949,11 @@ prometheus_cr:
 						},
 						Selector: v1.LabelSelector{
 							MatchLabels: map[string]string{
-								"operator.opentelemetry.io/collector-monitoring-service": "Exists",
+								"app.kubernetes.io/component":  "opentelemetry-targetallocator",
+								"app.kubernetes.io/instance":   "test.test",
+								"app.kubernetes.io/managed-by": "opentelemetry-operator",
+								"app.kubernetes.io/name":       "test-targetallocator",
+								"app.kubernetes.io/part-of":    "opentelemetry",
 							},
 						},
 						NamespaceSelector: monitoringv1.NamespaceSelector{

internal/manifests/collector/service.go

@@ -31,10 +31,9 @@ import (
 
 // 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"
-	monitoringLabel  = "operator.opentelemetry.io/collector-monitoring-service"
-	monitoringExists = "Exists"
+	headlessLabel   = "operator.opentelemetry.io/collector-headless-service"
+	monitoringLabel = "operator.opentelemetry.io/collector-monitoring-service"
+	valueExists     = "Exists"
 )
 
 func HeadlessService(params manifests.Params) (*corev1.Service, error) {
@@ -44,9 +43,9 @@ func HeadlessService(params manifests.Params) (*corev1.Service, error) {
 	}
 
 	h.Name = naming.HeadlessService(params.OtelCol.Name)
-	h.Labels[headlessLabel] = headlessExists
+	h.Labels[headlessLabel] = valueExists
 
-	// 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),
 	}
@@ -63,7 +62,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
+	labels[monitoringLabel] = valueExists
 
 	out, err := params.OtelCol.Spec.Config.Yaml()
 	if err != nil {

internal/manifests/collector/servicemonitor.go

@@ -44,6 +44,9 @@ 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{})
+	selectorLabels := manifestutils.SelectorLabels(params.OtelCol.ObjectMeta, ComponentOpenTelemetryCollector)
+	selectorLabels[monitoringLabel] = valueExists
+
 	sm = monitoringv1.ServiceMonitor{
 		ObjectMeta: metav1.ObjectMeta{
 			Namespace: params.OtelCol.Namespace,
@@ -60,9 +63,7 @@ func ServiceMonitor(params manifests.Params) (*monitoringv1.ServiceMonitor, erro
 				MatchNames: []string{params.OtelCol.Namespace},
 			},
 			Selector: metav1.LabelSelector{
-				MatchLabels: map[string]string{
-					"operator.opentelemetry.io/collector-monitoring-service": "Exists",
-				},
+				MatchLabels: selectorLabels,
 			},
 		},
 	}

internal/manifests/collector/servicemonitor_test.go

@@ -36,6 +36,10 @@ func TestDesiredServiceMonitors(t *testing.T) {
 	assert.Equal(t, params.OtelCol.Namespace, actual.Namespace)
 	assert.Equal(t, "monitoring", actual.Spec.Endpoints[0].Port)
 	expectedSelectorLabels := map[string]string{
+		"app.kubernetes.io/component":                            "opentelemetry-collector",
+		"app.kubernetes.io/instance":                             "default.test",
+		"app.kubernetes.io/managed-by":                           "opentelemetry-operator",
+		"app.kubernetes.io/part-of":                              "opentelemetry",
 		"operator.opentelemetry.io/collector-monitoring-service": "Exists",
 	}
 	assert.Equal(t, expectedSelectorLabels, actual.Spec.Selector.MatchLabels)
@@ -54,6 +58,10 @@ 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":                             "default.test",
+		"app.kubernetes.io/managed-by":                           "opentelemetry-operator",
+		"app.kubernetes.io/part-of":                              "opentelemetry",
 		"operator.opentelemetry.io/collector-monitoring-service": "Exists",
 	}
 	assert.Equal(t, expectedSelectorLabels, actual.Spec.Selector.MatchLabels)

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

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

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

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

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

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

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

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