Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[prometheus-blackbox-exporter] add commonLabels to pod #4855

Merged
merged 4 commits into from
Nov 6, 2024
Merged

[prometheus-blackbox-exporter] add commonLabels to pod #4855

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ade0cc4
add commonLabels to pod
es1o Sep 13, 2024
1d4992c
Bump chart version
es1o Oct 3, 2024
d665c7a
Merge branch 'main' into common-labels
es1o Oct 3, 2024
8811900
Merge branch 'main' into common-labels
es1o Oct 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/prometheus-blackbox-exporter/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
description: Prometheus Blackbox Exporter
name: prometheus-blackbox-exporter
version: 9.0.1
version: 9.0.3
appVersion: v0.25.0
kubeVersion: ">=1.21.0-0"
home: https://github.com/prometheus/blackbox_exporter
Expand Down
3 changes: 3 additions & 0 deletions charts/prometheus-blackbox-exporter/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ spec:
metadata:
labels:
{{- include "prometheus-blackbox-exporter.selectorLabels" . | nindent 8 }}
{{- if .Values.commonLabels }}
{{ toYaml .Values.commonLabels | indent 8 }}
{{- end }}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should not be necessary: https://github.com/es1o/helm-charts/blob/common-labels/charts/prometheus-blackbox-exporter/templates/_helpers.tpl#L46-L48

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@monotek It is necessary because prometheus-blackbox-exporter.labels are not used here, only prometheus-blackbox-exporter.selectorLabels that doesn't have .Values.commonLabels.

{{- if .Values.pod.labels }}
{{ toYaml .Values.pod.labels | indent 8 }}
{{- end }}
Expand Down