Bitnami/charts
2
0
Fork 0
mirror of https://github.com/bitnami/charts.git synced 2026-03-15 06:47:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

[bitnami/external-dns] Add targetLabels option to ServiceMonitor (#29828)

Browse Source 
* [bitnami/external-dns] Add targetLabels option to ServiceMonitor

Fixes #29332

Signed-off-by: Ryan Matthews <ryan@mrrsm.com>

* Update CHANGELOG.md

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>

* Update bitnami/external-dns/templates/servicemonitor.yaml

Co-authored-by: Miguel Ruiz <miguel.ruiz@broadcom.com>
Signed-off-by: Ryan Matthews <ryan@mrrsm.com>

* Bump chart minor version

Signed-off-by: Ryan Matthews <ryan@mrrsm.com>

* Update value types as array

Signed-off-by: Miguel Ruiz <miguel.ruiz@broadcom.com>

Signed-off-by: Miguel Ruiz <miguel.ruiz@broadcom.com>

* Update README.md with readme-generator-for-helm

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>

* Update CHANGELOG.md

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>

* Update CHANGELOG.md

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>

* Update values description

Signed-off-by: Miguel Ruiz <miguel.ruiz@broadcom.com>

Signed-off-by: Miguel Ruiz <miguel.ruiz@broadcom.com>

* Update CHANGELOG.md

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>

* Update README.md with readme-generator-for-helm

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>

* Bump chart version

Signed-off-by: Miguel Ruiz <miguel.ruiz@broadcom.com>

Signed-off-by: Miguel Ruiz <miguel.ruiz@broadcom.com>

* Update CHANGELOG.md

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>

---------

Signed-off-by: Ryan Matthews <ryan@mrrsm.com>
Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
Signed-off-by: Miguel Ruiz <miguel.ruiz@broadcom.com>
Co-authored-by: Bitnami Containers <bitnami-bot@vmware.com>
Co-authored-by: Miguel Ruiz <miguel.ruiz@broadcom.com>
This commit is contained in:
Ryan Matthews
2024-11-05 04:45:52 -05:00
committed by GitHub
parent 1cfa790448
commit bba5754878
5 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bitnami/external-dns/CHANGELOG.md
View File

@@ -1,8 +1,12 @@
# Changelog
## 8.4.0 (2024-11-04)
## 8.5.0 (2024-11-05)
* [bitnami/external-dns] add support for multiple rfc2136 zones ([#30011](https://github.com/bitnami/charts/pull/30011))
* [bitnami/external-dns] Add targetLabels option to ServiceMonitor ([#29828](https://github.com/bitnami/charts/pull/29828))
## 8.4.0 (2024-11-05)
* [bitnami/external-dns] add support for multiple rfc2136 zones (#30011) ([174879d](https://github.com/bitnami/charts/commit/174879da11cc5678e38f5bcf8b1633e6a0f64376)), closes [#30011](https://github.com/bitnami/charts/issues/30011)
## <small>8.3.12 (2024-10-29)</small>

2
bitnami/external-dns/Chart.yaml
View File

@@ -28,4 +28,4 @@ maintainers:
name: external-dns
sources:
- https://github.com/bitnami/charts/tree/main/bitnami/external-dns
version: 8.4.0
version: 8.5.0

2
bitnami/external-dns/README.md
View File

@@ -432,6 +432,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` | Labels from the Kubernetes service to be transferred to the created metrics | `[]` |
| `metrics.serviceMonitor.podTargetLabels` | Labels from the Kubernetes pod to be transferred to the created metrics | `[]` |
| `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` |

6
bitnami/external-dns/templates/servicemonitor.yaml
View File

@@ -37,6 +37,12 @@ spec:
{{- if .Values.metrics.serviceMonitor.jobLabel }}
jobLabel: {{ .Values.metrics.serviceMonitor.jobLabel }}
{{- end }}
{{- if .Values.metrics.serviceMonitor.podTargetLabels }}
podTargetLabels: {{- include "common.tplvalues.render" ( dict "value" .Values.metrics.serviceMonitor.podTargetLabels "context" $) | nindent 4 }}
{{- end }}
{{- if .Values.metrics.serviceMonitor.targetLabels }}
targetLabels: {{- include "common.tplvalues.render" ( dict "value" .Values.metrics.serviceMonitor.targetLabels "context" $) | nindent 4 }}
{{- end }}
namespaceSelector:
matchNames:
- {{ .Release.Namespace }}

4
bitnami/external-dns/values.yaml
View File

@@ -1279,6 +1279,10 @@ metrics:
## ref: https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#prometheusspec
##
labels: {}
## @param metrics.serviceMonitor.targetLabels Labels from the Kubernetes service to be transferred to the created metrics
targetLabels: []
## @param metrics.serviceMonitor.podTargetLabels Labels from the Kubernetes pod to be transferred to the created metrics
podTargetLabels: []
## @param metrics.serviceMonitor.annotations Additional custom annotations for the ServiceMonitor
##
annotations: {}