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] fix issue when set extra containers #3850

Merged
merged 29 commits into from
Nov 16, 2023
Merged

[prometheus-blackbox-exporter] fix issue when set extra containers #3850

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
615516b
fix issue when set extra containers
allanhung Oct 2, 2023
369c37e
Merge branch 'main' into main
allanhung Oct 3, 2023
c47c11f
Merge branch 'main' into main
zanhsieh Oct 3, 2023
b6ec297
Merge branch 'main' into main
allanhung Oct 5, 2023
387af50
Merge branch 'main' into main
allanhung Oct 6, 2023
30093ed
Merge branch 'main' into main
allanhung Oct 9, 2023
a92bd18
Merge branch 'main' into main
allanhung Oct 11, 2023
c4bcb64
Merge branch 'main' into main
allanhung Oct 12, 2023
e537bae
Merge branch 'main' into main
allanhung Oct 13, 2023
9977502
Merge branch 'main' into main
allanhung Oct 16, 2023
69b7c44
Merge branch 'main' of https://github.com/prometheus-community/helm-c…
allanhung Oct 16, 2023
991ca37
Merge branch 'main' of https://github.com/allanhung/prometheus-commun…
allanhung Oct 16, 2023
89c3714
consistent indentation
allanhung Oct 17, 2023
83edafa
Merge branch 'main' into main
zanhsieh Oct 17, 2023
a0894be
Merge branch 'main' into main
allanhung Oct 18, 2023
cad5ddd
Merge branch 'main' into main
allanhung Oct 18, 2023
2202590
Merge branch 'main' into main
allanhung Oct 20, 2023
aa77ae0
Merge branch 'main' into main
allanhung Oct 22, 2023
c995fea
Merge branch 'main' into main
allanhung Oct 23, 2023
95af1e9
Merge branch 'main' into main
allanhung Oct 25, 2023
69d017c
Merge branch 'main' into main
allanhung Oct 25, 2023
b157ff2
Merge branch 'main' into main
allanhung Oct 27, 2023
6c8d2ef
Merge branch 'main' into main
allanhung Oct 29, 2023
aab498b
Merge branch 'main' into main
allanhung Nov 6, 2023
e700e3d
Merge branch 'main' into main
allanhung Nov 9, 2023
55bf173
Merge branch 'main' into main
allanhung Nov 11, 2023
148fb7f
Merge branch 'main' into main
allanhung Nov 12, 2023
ec2d985
Merge branch 'main' into main
allanhung Nov 13, 2023
0210e8b
Merge branch 'main' into main
zanhsieh Nov 15, 2023
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: 8.4.0
version: 8.4.1
appVersion: v0.24.0
home: https://github.com/prometheus/blackbox_exporter
sources:
Expand Down
8 changes: 4 additions & 4 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 @@ -110,7 +110,7 @@ automountServiceAccountToken: {{ .Values.automountServiceAccountToken }}
serviceAccountName: {{ template "prometheus-blackbox-exporter.serviceAccountName" . }}
{{- with .Values.topologySpreadConstraints }}
topologySpreadConstraints:
{{- toYaml . | nindent 2 }}
{{ toYaml . }}
{{- end }}
{{- with .Values.nodeSelector }}
nodeSelector:
Expand All @@ -122,7 +122,7 @@ affinity:
{{- end }}
{{- with .Values.tolerations }}
tolerations:
{{- toYaml . | nindent 2 }}
{{ toYaml . }}
{{- end }}
{{- if .Values.image.pullSecrets }}
imagePullSecrets:
Expand Down Expand Up @@ -150,10 +150,10 @@ securityContext:
{{- end }}
{{- with .Values.extraInitContainers }}
initContainers:
{{- toYaml . | indent 2 }}
{{ toYaml . }}
{{- end }}
containers:
{{- with .Values.extraContainers }}
{{ with .Values.extraContainers }}
allanhung marked this conversation as resolved.
Show resolved Hide resolved
allanhung marked this conversation as resolved.
Show resolved Hide resolved
{{- toYaml . }}
{{- end }}
- name: blackbox-exporter
Expand Down