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

[prometheus-blackbox-exporter] Adjust configPath handling #4915

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

[prometheus-blackbox-exporter] Adjust configPath handling #4915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b14e213
[prometheus-blackbox-exporter] Adjust configPath handling
Jakob3xD Oct 15, 2024
04baa2b
[prometheus-blackbox-exporter] fix typo in config arg
Jakob3xD Oct 15, 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: 10.0.0
appVersion: v0.25.0
kubeVersion: ">=1.21.0-0"
home: https://github.com/prometheus/blackbox_exporter
Expand Down
6 changes: 6 additions & 0 deletions charts/prometheus-blackbox-exporter/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,12 @@ helm upgrade [RELEASE_NAME] [CHART] --install

_See [helm upgrade](https://helm.sh/docs/helm/helm_upgrade/) for command documentation._

### To 10.0.0

This version changed the config path handing.
- The `configPath` value overwrites the default config path.
- The default value, if no `config` is defined, got removed. You can set the removed default `/etc/blackbox_exporter/config.yml` via the `configPath` value.

### To 9.0.0

This version remove pod security policy as it is deprecated.
Expand Down
10 changes: 1 addition & 9 deletions charts/prometheus-blackbox-exporter/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,15 +228,7 @@ containers:
{{- end }}
{{- end }}
args:
{{- if .Values.config }}
{{- if .Values.configPath }}
- "--config.file={{ .Values.configPath }}"
{{- else }}
- "--config.file=/config/blackbox.yaml"
{{- end }}
{{- else }}
- "--config.file=/etc/blackbox_exporter/config.yml"
{{- end }}
- --config.file={{ .Values.configPath | default "/config/blackbox.yaml" }}
Copy link
Member

Choose a reason for hiding this comment

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

As this is a major updat anyway we might think about to rename the var to .Values.configFile too.
Imho this fits better as the var currently contains a filename and not only the path.
Thoughts?

{{- with .Values.extraArgs }}
{{ tpl (toYaml .) $ | indent 2 }}
{{- end }}
Expand Down