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-node-exporter] Fix sidecars containers volumeMounts merge #4177

Merged
merged 10 commits into from
Jan 29, 2024
Merged

[prometheus-node-exporter] Fix sidecars containers volumeMounts merge #4177

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b499a46
[node-exporter] Fix sidecars containers volumeMounts merge
ebuildy Jan 24, 2024
f932433
bump chart version
ebuildy Jan 24, 2024
f9bb3a4
Merge branch 'main' into node_exporter_fix_sidecars
ebuildy Jan 24, 2024
5aa9f04
bump chart version
ebuildy Jan 24, 2024
c666cf2
Merge branch 'main' into node_exporter_fix_sidecars
zanhsieh Jan 26, 2024
ea25a46
Patch version
ebuildy Jan 26, 2024
7265548
Update charts/prometheus-node-exporter/templates/daemonset.yaml
ebuildy Jan 28, 2024
e61e2be
Update charts/prometheus-node-exporter/templates/daemonset.yaml
ebuildy Jan 28, 2024
61299bd
fix lint
ebuildy Jan 28, 2024
df66622
Merge branch 'main' into node_exporter_fix_sidecars
zanhsieh Jan 29, 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-node-exporter/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ keywords:
- prometheus
- exporter
type: application
version: 4.26.0
version: 4.26.1
appVersion: 1.7.0
home: https://github.com/prometheus/node_exporter/
sources:
Expand Down
19 changes: 19 additions & 0 deletions charts/prometheus-node-exporter/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,3 +183,22 @@ labelNameLengthLimit: {{ . }}
labelValueLengthLimit: {{ . }}
{{- end }}
{{- end }}



ebuildy marked this conversation as resolved.
Show resolved Hide resolved
{{/* Sets sidecar volumeMounts */}}
{{- define "prometheus-node-exporter.sidecarVolumeMounts" -}}
{{- range $_, $mount := $.Values.sidecarVolumeMount }}
- name: {{ $mount.name }}
mountPath: {{ $mount.mountPath }}
readOnly: {{ $mount.readOnly }}
{{- end }}
{{- range $_, $mount := $.Values.sidecarHostVolumeMounts }}
- name: {{ $mount.name }}
mountPath: {{ $mount.mountPath }}
readOnly: {{ $mount.readOnly }}
{{- if $mount.mountPropagation }}
mountPropagation: {{ $mount.mountPropagation }}
{{- end }}
{{- end }}
{{- end }}
ebuildy marked this conversation as resolved.
Show resolved Hide resolved
28 changes: 10 additions & 18 deletions charts/prometheus-node-exporter/templates/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,24 +160,16 @@ spec:
- name: {{ .name }}
mountPath: {{ .mountPath }}
{{- end }}
{{- with .Values.sidecars }}
{{- toYaml . | nindent 8 }}
{{- if or $.Values.sidecarVolumeMount $.Values.sidecarHostVolumeMounts }}
volumeMounts:
{{- range $_, $mount := $.Values.sidecarVolumeMount }}
- name: {{ $mount.name }}
mountPath: {{ $mount.mountPath }}
readOnly: {{ $mount.readOnly }}
{{- end }}
{{- range $_, $mount := $.Values.sidecarHostVolumeMounts }}
- name: {{ $mount.name }}
mountPath: {{ $mount.mountPath }}
readOnly: {{ $mount.readOnly }}
{{- if $mount.mountPropagation }}
mountPropagation: {{ $mount.mountPropagation }}
{{- end }}
{{- end }}
{{- end }}
{{- range .Values.sidecars }}
{{- $overwrites := dict
"volumeMounts" (concat (include "prometheus-node-exporter.sidecarVolumeMounts" $ | fromYamlArray ) (.volumeMounts | default list) | default list)
ebuildy marked this conversation as resolved.
Show resolved Hide resolved
}}
{{- $defaults := dict
"image" (include "prometheus-node-exporter.image" $)
"securityContext" $.Values.containerSecurityContext
"imagePullPolicy" $.Values.image.pullPolicy
}}
- {{- toYaml (merge $overwrites . $defaults ) | nindent 10 }}
ebuildy marked this conversation as resolved.
Show resolved Hide resolved
{{- end }}
{{- if .Values.kubeRBACProxy.enabled }}
- name: kube-rbac-proxy
Expand Down
9 changes: 7 additions & 2 deletions charts/prometheus-node-exporter/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,8 +398,13 @@ namespaceOverride: ""
## Additional containers for export metrics to text file
##
sidecars: []
ebuildy marked this conversation as resolved.
Show resolved Hide resolved
## - name: nvidia-dcgm-exporter
## image: nvidia/dcgm-exporter:1.4.3
# - name: nvidia-dcgm-exporter
# image: nvidia/dcgm-exporter:1.4.3
# volumeMounts:
# - name: tmp
# mountPath: /tmp
# - name: nvidia-dcgm-exporter2
# image: nvidia/dcgm-exporter:1.4.3

## Volume for sidecar containers
##
Expand Down
Loading