Fix metrics selectors (#1742)

* Enable metrics Signed-off-by: Ruben Vargas <[email protected]> * Fix tests Signed-off-by: Ruben Vargas <[email protected]> * Disable prometheus resources creation Signed-off-by: Ruben Vargas <[email protected]>
jaegertracing · Mar 23, 2022 · 306403c · 306403c
1 parent e78ca97
commit 306403c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -362,7 +362,7 @@ bundle-build: ## Build the bundle image.
 
 .PHONY: bundle-push
 bundle-push: ## Push the bundle image.
-	$(MAKE) docker-push IMG=$(BUNDLE_IMG)
+	docker push $(BUNDLE_IMG)
 
 .PHONY: opm
 OPM = ./bin/opm

diff --git a/bundle/manifests/jaeger-operator-metrics_v1_service.yaml b/bundle/manifests/jaeger-operator-metrics_v1_service.yaml
@@ -3,7 +3,7 @@ kind: Service
 metadata:
   creationTimestamp: null
   labels:
-    control-plane: jaeger-operator
+    app.kubernetes.io/component: metrics
     name: jaeger-operator
   name: jaeger-operator-metrics
 spec:

diff --git a/config/prometheus/monitor.yaml b/config/prometheus/monitor.yaml
@@ -4,7 +4,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   labels:
-    control-plane: controller-manager
+    name: jaeger-operator
   name: jaeger-operator-metrics-monitor
 spec:
   endpoints:
@@ -19,3 +19,4 @@ spec:
   selector:
     matchLabels:
       name: jaeger-operator
+      app.kubernetes.io/component: metrics
diff --git a/config/rbac/auth_proxy_service.yaml b/config/rbac/auth_proxy_service.yaml
@@ -2,7 +2,8 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    control-plane:  jaeger-operator
+    name: jaeger-operator
+    app.kubernetes.io/component: metrics
   name: jaeger-operator-metrics
 spec:
   ports: