[prometheus] make path.rootfs conditional (#737)

* [prometheus] make path.rootfs condition Not always possible to mount / from host, see issue #467 Signed-off-by: William Johansson <[email protected]> * [prometheus] bump minor version Signed-off-by: William Johansson <[email protected]> * [prometheus] bump minor version Signed-off-by: William Johansson <[email protected]> Co-authored-by: André Bauer <[email protected]>
prometheus-community · Mar 10, 2021 · 46c8e5a · 46c8e5a
1 parent 0ec6d33
commit 46c8e5a
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,7 +1,7 @@
 apiVersion: v2
 name: prometheus
-version: 13.5.0
 appVersion: 2.24.0
+version: 13.6.0
 description: Prometheus is a monitoring system and time series database.
 home: https://prometheus.io/
 icon: https://raw.githubusercontent.com/prometheus/prometheus.github.io/master/assets/prometheus_logo-cb55bb5c346.png

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