[prometheus] make path.rootfs condition

Not always possible to mount / from host, see issue prometheus-community#467
radhus · Mar 7, 2021 · 45e7a3c · 45e7a3c
1 parent 1a48c84
commit 45e7a3c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/charts/prometheus/Chart.yaml b/charts/prometheus/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: prometheus
-version: 13.4.0
+version: 13.4.1
 appVersion: 2.24.0
 description: Prometheus is a monitoring system and time series database.
 home: https://prometheus.io/

diff --git a/charts/prometheus/templates/node-exporter/daemonset.yaml b/charts/prometheus/templates/node-exporter/daemonset.yaml
@@ -45,7 +45,9 @@ spec:
           args:
             - --path.procfs=/host/proc
             - --path.sysfs=/host/sys
+          {{- if .Values.nodeExporter.hostRootfs }}
             - --path.rootfs=/host/root
+          {{- end }}
           {{- if .Values.nodeExporter.hostNetwork }}
             - --web.listen-address=:{{ .Values.nodeExporter.service.hostPort }}
           {{- end }}
@@ -73,10 +75,12 @@ spec:
             - name: sys
               mountPath: /host/sys
               readOnly: true
+          {{- if .Values.nodeExporter.hostRootfs }}
             - name: root
               mountPath: /host/root
               mountPropagation: HostToContainer
               readOnly: true
+          {{- end }}
           {{- range .Values.nodeExporter.extraHostPathMounts }}
             - name: {{ .name }}
               mountPath: {{ .mountPath }}
@@ -123,9 +127,11 @@ spec:
         - name: sys
           hostPath:
             path: /sys
+      {{- if .Values.nodeExporter.hostRootfs }}
         - name: root
           hostPath:
             path: /
+      {{- end }}
       {{- range .Values.nodeExporter.extraHostPathMounts }}
         - name: {{ .name }}
           hostPath:

diff --git a/charts/prometheus/values.yaml b/charts/prometheus/values.yaml
@@ -442,6 +442,10 @@ nodeExporter:
   ##
   hostPID: true
 
+  ## If true, node-exporter pods mounts host / at /host/root
+  ##
+  hostRootfs: true
+
   ## node-exporter container name
   ##
   name: node-exporter