[incubator/fluentd-cloudwatch] Add configurable volumes and volumeMounts (#18670)

* Update daemonset.yaml file to have configurable volumes and volumeMounts. This allows us to add volumes and volumeMounts. For example, the kubelet writes to journald. We want to add a volume "/run/log/journal" and its volume mount so that fluentd-cloudwatch can send the kubelet log messages to CloudWatch.

Signed-off-by: Aditya Pahuja <aditya.pahuja@digital.cabinet-office.gov.uk>

* Bump fluentd-cloudwatch chart version

Signed-off-by: Aditya Pahuja <aditya.pahuja@digital.cabinet-office.gov.uk>

incubator/fluentd-cloudwatch/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
 name: fluentd-cloudwatch
-version: 0.12.0
+version: 0.12.1
 appVersion: v1.7.3-debian-cloudwatch-1.0
 description: A Fluentd CloudWatch Helm chart for Kubernetes.
 home: https://www.fluentd.org/

incubator/fluentd-cloudwatch/README.md

@@ -67,7 +67,9 @@ The following table lists the configurable parameters of the Fluentd Cloudwatch
 | `rbac.create`                   | If true, create & use RBAC resources                                            | `false`                               |
 | `rbac.serviceAccountName`       | existing ServiceAccount to use (ignored if rbac.create=true)                    | `default`                             |
 | `rbac.pspEnabled`               | PodSecuritypolicy                                                               | `false`                               |
-| `rbac.serviceAccountAnnotations`| Additional Service Account annotations	                                        | `{}`                                  |
+| `rbac.serviceAccountAnnotations`| Additional Service Account annotations                                          | `{}`                                  |
+| `volumeMounts`                  | Add volume mounts to daemon set                                                 | `[]`                                  |
+| `volumes`                       | Add volumes to daemon set                                                       | `[]`                                  |
 | `tolerations`                   | Add tolerations                                                                 | `[]`                                  |
 | `extraVars`                     | Add pod environment variables (must be specified as a single line object)       | `[]`                                  |
 | `updateStrategy`                | Define daemonset update strategy                                                | `OnDelete`                            |

incubator/fluentd-cloudwatch/templates/daemonset.yaml

@@ -71,6 +71,11 @@ spec:
           readOnly: true
         - name: config
           mountPath: /fluentd/etc
+        - name: config-volume
+          mountPath: /config-volume
+{{- if .Values.volumeMounts }}
+{{ toYaml .Values.volumeMounts | indent 8 }}
+{{- end }}
 {{- if .Values.priorityClassName }}
       priorityClassName: "{{ .Values.priorityClassName }}"
 {{- end }}
@@ -87,6 +92,9 @@ spec:
       - name: config-volume
         configMap:
           name: {{ template "fluentd-cloudwatch.fullname" . }}
+{{- if .Values.volumes }}
+{{ toYaml .Values.volumes | indent 6 }}
+{{- end }}
 {{- if .Values.tolerations }}
       tolerations:
 {{ toYaml .Values.tolerations | indent 6 }}

incubator/fluentd-cloudwatch/values.yaml

@@ -40,6 +40,17 @@ nodeSelector: {}
 #            values:
 #            - master
 affinity: {}
+
+volumeMounts: []
+#   - name: runlogjournal
+#     mountPath: /run/log/journal
+#     readOnly: true
+
+volumes: []
+#   - name: runlogjournal
+#     hostPath:
+#       path: /run/log/journal
+
 ## Add tolerations if specified
 tolerations: []
 #   - key: node-role.kubernetes.io/master