From 93a3aaa86fd9e21b3dfe565a1f21f3562874fea5 Mon Sep 17 00:00:00 2001 From: Henrik Solberg Date: Fri, 16 Jun 2023 09:41:35 +0200 Subject: [PATCH] Helm: Add option to configure honorLabels for serviceMonitor. Signed-off-by: Henrik Solberg --- charts/flagger/README.md | 1 + charts/flagger/templates/servicemonitor.yaml | 2 +- charts/flagger/values.yaml | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/charts/flagger/README.md b/charts/flagger/README.md index aaa8534b..d9190d31 100644 --- a/charts/flagger/README.md +++ b/charts/flagger/README.md @@ -141,6 +141,7 @@ The following tables lists the configurable parameters of the Flagger chart and | `prometheus.retention` | Prometheus data retention | `2h` | | `selectorLabels` | List of labels that Flagger uses to create pod selectors | `app,name,app.kubernetes.io/name` | | `serviceMonitor.enabled` | If `true`, creates service and serviceMonitor for monitoring Flagger metrics | `false` | +| `serviceMonitor.honorLabels` | If `true`, label conflicts are resolved by keeping label values from the scraped data and ignoring the conflicting server-side labels | `false` | | `configTracking.enabled` | If `true`, flagger will track changes in Secrets and ConfigMaps referenced in the target deployment | `true` | | `eventWebhook` | If set, Flagger will publish events to the given webhook | None | | `slack.url` | Slack incoming webhook | None | diff --git a/charts/flagger/templates/servicemonitor.yaml b/charts/flagger/templates/servicemonitor.yaml index d318276e..844ceac6 100644 --- a/charts/flagger/templates/servicemonitor.yaml +++ b/charts/flagger/templates/servicemonitor.yaml @@ -13,7 +13,7 @@ spec: port: http interval: 30s scrapeTimeout: 30s - honorLabels: false + honorLabels: {{ .Values.serviceMonitor.honorLabels }} namespaceSelector: matchNames: - {{ .Release.Namespace }} diff --git a/charts/flagger/values.yaml b/charts/flagger/values.yaml index 5c09b3b5..ee10e6ee 100644 --- a/charts/flagger/values.yaml +++ b/charts/flagger/values.yaml @@ -26,6 +26,7 @@ metricsServer: "http://prometheus:9090" # creates serviceMonitor for monitoring Flagger metrics serviceMonitor: enabled: false + honorLabels: false # accepted values are kubernetes, istio, linkerd, appmesh, contour, nginx, gloo, skipper, traefik, apisix, osm meshProvider: ""