fix: add Prometheus scraping annotations only if serviceMonitor not c…

…reated
traefik · Oct 17, 2023 · 6b2268f · 6b2268f
1 parent d1a2770
commit 6b2268f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/traefik/templates/_podtemplate.tpl b/traefik/templates/_podtemplate.tpl
@@ -5,7 +5,7 @@
       {{- toYaml . | nindent 8 }}
       {{- end }}
       {{- if .Values.metrics }}
-      {{- if .Values.metrics.prometheus }}
+      {{- if and (.Values.metrics.prometheus) (not .Values.metrics.prometheus.serviceMonitor) }}
         prometheus.io/scrape: "true"
         prometheus.io/path: "/metrics"
         prometheus.io/port: {{ quote (index .Values.ports .Values.metrics.prometheus.entryPoint).port }}

diff --git a/traefik/tests/pod-config_test.yaml b/traefik/tests/pod-config_test.yaml
@@ -613,3 +613,12 @@ tests:
       - equal:
           path: spec.template.spec.dnsConfig.options[1].name
           value: "edns0"
+  - it: should not have prometheus annotations
+    set:
+      metrics:
+        prometheus:
+          serviceMonitor:
+            jobLabel: traefik
+    asserts:
+      - isNull:
+          path: spec.template.metadata.annotations.prometheus.io/scrape