Fix metrics selectors

Makefile

@@ -361,7 +361,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

bundle/manifests/jaeger-operator-metrics-monitor_monitoring.coreos.com_v1_servicemonitor.yaml

@@ -0,0 +1,20 @@
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  labels:
+    name: jaeger-operator
+  name: jaeger-operator-metrics-monitor
+spec:
+  endpoints:
+  - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
+    interval: 30s
+    path: /metrics
+    scheme: https
+    scrapeTimeout: 10s
+    targetPort: 8443
+    tlsConfig:
+      insecureSkipVerify: true
+  selector:
+    matchLabels:
+      app.kubernetes.io/component: metrics
+      name: jaeger-operator

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:

config/default/kustomization.yaml

@@ -22,7 +22,7 @@ bases:
 - ../webhook
 - ../certmanager
 # [PROMETHEUS] To enable prometheus monitor, uncomment all sections with 'PROMETHEUS'.
-#- ../prometheus
+- ../prometheus
 
 patchesStrategicMerge:
 # Protect the /metrics endpoint by putting it behind auth.

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

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:

tests/templates/kuttl-test.yaml

@@ -3,7 +3,7 @@ kind: TestSuite
 crdDir: ../../_build/crds/
 artifactsDir: ../../_build/artifacts/
 commands:
-  - script: cd ../../.. && make cert-manager
+  - script: cd ../../.. && make cert-manager && make deploy-prometheus-operator
   - script: kubectl create namespace observability 2>&1 | grep -v "already exists" || true
   - command: kubectl apply -f ../../_build/manifests/01-jaeger-operator.yaml -n observability
   - command: kubectl wait --timeout=5m --for=condition=available deployment jaeger-operator -n observability