From 613e9f8369c9c310a9c326e296ead673d7f8935a Mon Sep 17 00:00:00 2001 From: Edwin Tye Date: Fri, 10 Nov 2023 18:32:42 +0000 Subject: [PATCH 1/2] helm: correct namespace for service monitor --- charts/k6-operator/templates/prometheus/serviceMonitor.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/charts/k6-operator/templates/prometheus/serviceMonitor.yaml b/charts/k6-operator/templates/prometheus/serviceMonitor.yaml index 948f0cc8..c1e2833b 100644 --- a/charts/k6-operator/templates/prometheus/serviceMonitor.yaml +++ b/charts/k6-operator/templates/prometheus/serviceMonitor.yaml @@ -12,8 +12,11 @@ metadata: annotations: {{- include "k6-operator.customAnnotations" . | default "" | nindent 4 }} name: controller-manager-metrics-monitor - namespace: system + namespace: {{- include "k6-operator.namespace" . }} spec: + namespaceSelector: + matchNames: + - {{- include "k6-operator.namespace" . }} endpoints: - path: /metrics port: https From 5c74b21e95bb5fef0b7ba723c3e8c3ca0475d2a9 Mon Sep 17 00:00:00 2001 From: Edwin Tye Date: Fri, 10 Nov 2023 18:35:25 +0000 Subject: [PATCH 2/2] helm: add correct label to pod for svc --- charts/k6-operator/templates/deployment.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/charts/k6-operator/templates/deployment.yaml b/charts/k6-operator/templates/deployment.yaml index 4fe5c5bf..21c373ef 100644 --- a/charts/k6-operator/templates/deployment.yaml +++ b/charts/k6-operator/templates/deployment.yaml @@ -18,6 +18,7 @@ spec: template: metadata: labels: + control-plane: "controller-manager" {{- include "k6-operator.selectorLabels" . | nindent 8 }} {{- include "k6-operator.podLabels" . | nindent 8 }} spec: