From 4a8d479f6aebb42e217741cd3cdd4e9d50b6a70d Mon Sep 17 00:00:00 2001
From: Alex Snast <alexsn@fb.com>
Date: Thu, 28 Nov 2019 16:15:04 +0200
Subject: [PATCH] [stable/fluentd] adding option to mount extra volumes
 (#19216)

Signed-off-by: Alex Snast <alexsn@fb.com>
---
 stable/fluentd/Chart.yaml                |  2 +-
 stable/fluentd/README.md                 |  2 ++
 stable/fluentd/templates/deployment.yaml |  6 ++++++
 stable/fluentd/values.yaml               | 10 ++++++++++
 4 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/stable/fluentd/Chart.yaml b/stable/fluentd/Chart.yaml
index c2dc294193..905b50b45c 100644
--- a/stable/fluentd/Chart.yaml
+++ b/stable/fluentd/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 description: A Fluentd Elasticsearch Helm chart for Kubernetes.
 icon: https://raw.githubusercontent.com/fluent/fluentd-docs/master/public/logo/Fluentd_square.png
 name: fluentd
-version: 2.2.1
+version: 2.3.0
 appVersion: v2.4.0
 home: https://www.fluentd.org/
 sources:
diff --git a/stable/fluentd/README.md b/stable/fluentd/README.md
index 953614ff5e..a5f23a83b9 100644
--- a/stable/fluentd/README.md
+++ b/stable/fluentd/README.md
@@ -57,6 +57,8 @@ Parameter | Description | Default
 `image.tag` | Image tag | `v2.4.0`
 `imagePullSecrets` | Specify image pull secrets | `nil` (does not add image pull secrets to deployed pods)
 `extraEnvVars` | Adds additional environment variables to the deployment (in yaml syntax) | `{}` See [values.yaml](values.yaml)
+`extraVolumeMounts` | Mount extra volumes (in yaml syntax) | `` See [values.yaml](values.yaml)
+`extraVolumes` | Extra volumes (in yaml syntax) | `` See [values.yaml](values.yaml)
 `ingress.enabled` | enable ingress | `false`
 `ingress.labels` | list of labels for the ingress rule | See [values.yaml](values.yaml)
 `ingress.annotations` | list of annotations for the ingress rule | `kubernetes.io/ingress.class: nginx` See [values.yaml](values.yaml)
diff --git a/stable/fluentd/templates/deployment.yaml b/stable/fluentd/templates/deployment.yaml
index 3f57c3513e..745e128800 100644
--- a/stable/fluentd/templates/deployment.yaml
+++ b/stable/fluentd/templates/deployment.yaml
@@ -97,6 +97,9 @@ spec:
           mountPath: /etc/fluent/config.d
         - name: buffer
           mountPath: "/var/log/fluentd-buffers"
+{{- if .Values.extraVolumeMounts }}
+{{ toYaml .Values.extraVolumeMounts | indent 8 }}
+{{- end }}
       serviceAccountName: {{ template "fluentd.fullname" . }}
       volumes:
         - name: config-volume-{{ template "fluentd.fullname" . }}
@@ -111,6 +114,9 @@ spec:
         - name: buffer  
           emptyDir: {}
         {{- end }}
+{{- if .Values.extraVolumes }}
+{{ toYaml .Values.extraVolumes | indent 8 }}
+{{- end }}
     {{- with .Values.nodeSelector }}
       nodeSelector:
 {{ toYaml . | indent 8 }}
diff --git a/stable/fluentd/values.yaml b/stable/fluentd/values.yaml
index 37b14b6f46..bedebaacbd 100644
--- a/stable/fluentd/values.yaml
+++ b/stable/fluentd/values.yaml
@@ -27,6 +27,16 @@ extraEnvVars:
 #        name: secret_name
 #        key: secret_key
 
+# extraVolumes:
+#   - name: es-certs
+#     secret:
+#       defaultMode: 420
+#       secretName: es-certs
+# extraVolumeMounts:
+#   - name: es-certs
+#     mountPath: /certs
+#     readOnly: true
+
 plugins:
   enabled: false
   pluginsList: []