More generic handling of volumes and volumeMounts in Promtail helm template

production/helm/templates/promtail/daemonset.yaml

@@ -45,11 +45,13 @@ spec:
           volumeMounts:
             - name: config
               mountPath: /etc/promtail
-            - name: varlog
-              mountPath: /var/log
-            - name: varlibdockercontainers
-              mountPath: {{ .Values.promtail.containerRootPath }}/containers
-              readOnly: true
+          {{- range .Values.promtail.volumeMounts }}
+            - name: {{ .name }}
+              mountPath: {{ .mountPath }}
+              {{- if .readOnly }}
+              readOnly: {{ .readOnly}}
+              {{- end }}
+          {{- end }}
           env:
           - name: HOSTNAME
             valueFrom:
@@ -89,9 +91,8 @@ spec:
         - name: config
           configMap:
             name: {{ template "promtail.fullname" . }}
-        - name: varlog
+        {{- range .Values.promtail.volumes }}
+        - name: {{ .name }}
           hostPath:
-            path: /var/log
-        - name: varlibdockercontainers
-          hostPath:
-            path: {{ .Values.promtail.containerRootPath }}/containers
+            path: {{ .path }}
+        {{- end }} 

production/helm/values.yaml

@@ -98,13 +98,25 @@ promtail:
   deploymentStrategy: RollingUpdate
 
   entryParser: docker
-  containerRootPath: /var/lib/docker
 
   image:
     repository: grafana/promtail
     tag: master
     pullPolicy: Always # Always pull while in BETA
 
+  volumes:
+    - name: varlog
+      path: /var/log
+    - name: varlibdockercontainers
+      path: /var/lib/docker/containers
+
+  volumeMounts:
+    - name: varlog
+      mountPath: /var/log
+    - name: varlibdockercontainers
+      mountPath: /var/lib/docker/containers
+      readOnly: true
+
   service:
     port: 3100
     annotations: {}