From e72205a3013f4c8a5924449a272856edb14f1b31 Mon Sep 17 00:00:00 2001 From: Ryan Matthews Date: Tue, 8 Oct 2024 14:57:01 -0400 Subject: [PATCH 1/2] [bitnami/external-dns] Add targetLabels option to ServiceMonitor Fixes #29332 Signed-off-by: Ryan Matthews --- bitnami/external-dns/Chart.yaml | 2 +- bitnami/external-dns/README.md | 2 ++ bitnami/external-dns/templates/servicemonitor.yaml | 8 ++++++++ bitnami/external-dns/values.yaml | 10 ++++++++++ 4 files changed, 21 insertions(+), 1 deletion(-) diff --git a/bitnami/external-dns/Chart.yaml b/bitnami/external-dns/Chart.yaml index fb45a7532ec6d4..22e0e7f175d15d 100644 --- a/bitnami/external-dns/Chart.yaml +++ b/bitnami/external-dns/Chart.yaml @@ -28,4 +28,4 @@ maintainers: name: external-dns sources: - https://github.com/bitnami/charts/tree/main/bitnami/external-dns -version: 8.3.9 +version: 8.3.10 diff --git a/bitnami/external-dns/README.md b/bitnami/external-dns/README.md index 4285195d68913a..346e9d84d7974c 100644 --- a/bitnami/external-dns/README.md +++ b/bitnami/external-dns/README.md @@ -431,6 +431,8 @@ helm install my-release \ | `metrics.serviceMonitor.relabelings` | Prometheus relabeling rules | `[]` | | `metrics.serviceMonitor.honorLabels` | Specify honorLabels parameter to add the scrape endpoint | `false` | | `metrics.serviceMonitor.labels` | Used to pass Labels that are required by the installed Prometheus Operator | `{}` | +| `metrics.serviceMonitor.targetLabels` | Used to keep given service's labels in target | `{}` | +| `metrics.serviceMonitor.podTargetLabels` | Used to keep given pod's labels in target | `{}` | | `metrics.serviceMonitor.annotations` | Additional custom annotations for the ServiceMonitor | `{}` | | `metrics.serviceMonitor.jobLabel` | The name of the label on the target service to use as the job name in prometheus. | `""` | | `metrics.googlePodMonitor.enabled` | Create Google Managed Prometheus PodMonitoring object | `false` | diff --git a/bitnami/external-dns/templates/servicemonitor.yaml b/bitnami/external-dns/templates/servicemonitor.yaml index ab62f7c93b684b..ff646d290325b1 100644 --- a/bitnami/external-dns/templates/servicemonitor.yaml +++ b/bitnami/external-dns/templates/servicemonitor.yaml @@ -37,6 +37,14 @@ spec: {{- if .Values.metrics.serviceMonitor.jobLabel }} jobLabel: {{ .Values.metrics.serviceMonitor.jobLabel }} {{- end }} + {{- with .Values.metrics.serviceMonitor.podTargetLabels }} + podTargetLabels: + {{- toYaml . | nindent 4 }} + {{- end }} + {{- with .Values.metrics.serviceMonitor.targetLabels }} + targetLabels: + {{- toYaml . | nindent 4 }} + {{- end }} namespaceSelector: matchNames: - {{ .Release.Namespace }} diff --git a/bitnami/external-dns/values.yaml b/bitnami/external-dns/values.yaml index d8a804584064a9..06552781ac34c0 100644 --- a/bitnami/external-dns/values.yaml +++ b/bitnami/external-dns/values.yaml @@ -1272,6 +1272,16 @@ metrics: ## ref: https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#prometheusspec ## labels: {} + ## @param metrics.serviceMonitor.targetLabels Used to keep given service's labels in target + ## e.g: + ## - app.kubernetes.io/name + ## + targetLabels: {} + ## @param metrics.serviceMonitor.podTargetLabels Used to keep given pod's labels in target + ## e.g: + ## - app.kubernetes.io/name + ## + podTargetLabels: {} ## @param metrics.serviceMonitor.annotations Additional custom annotations for the ServiceMonitor ## annotations: {} From aad411387dc181da6cb831bdf10b05d71a37f836 Mon Sep 17 00:00:00 2001 From: Bitnami Containers Date: Tue, 8 Oct 2024 19:11:47 +0000 Subject: [PATCH 2/2] Update CHANGELOG.md Signed-off-by: Bitnami Containers --- bitnami/external-dns/CHANGELOG.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/bitnami/external-dns/CHANGELOG.md b/bitnami/external-dns/CHANGELOG.md index a337ee46efbce7..0503b9ab1886a8 100644 --- a/bitnami/external-dns/CHANGELOG.md +++ b/bitnami/external-dns/CHANGELOG.md @@ -1,8 +1,12 @@ # Changelog -## 8.3.9 (2024-10-02) +## 8.3.10 (2024-10-08) -* [bitnami/external-dns] Release 8.3.9 ([#29690](https://github.com/bitnami/charts/pull/29690)) +* [bitnami/external-dns] Add targetLabels option to ServiceMonitor ([#29828](https://github.com/bitnami/charts/pull/29828)) + +## 8.3.9 (2024-10-02) + +* [bitnami/external-dns] Release 8.3.9 (#29690) ([c30d45e](https://github.com/bitnami/charts/commit/c30d45e45592f7d8647c19c484f455e85359ff7e)), closes [#29690](https://github.com/bitnami/charts/issues/29690) ## 8.3.8 (2024-09-16)