introduced variable fluentConfDir in order to configure conf location (…

…#36) * introduced variable fluentConfDir in order to configure conf location Signed-off-by: Etienne Journet <[email protected]> * Added default value, README and signature Signed-off-by: Etienne Journet <[email protected]> * Corrected version number Signed-off-by: Etienne Journet <[email protected]> Co-authored-by: Etienne Journet <[email protected]>
kokuwaio · Dec 2, 2020 · 698d207 · 698d207
1 parent 8cbbe9b
commit 698d207
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/charts/fluentd-elasticsearch/Chart.yaml b/charts/fluentd-elasticsearch/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: fluentd-elasticsearch
-version: 11.1.0
+version: 11.2.0
 appVersion: 3.1.0
 type: application
 home: https://www.fluentd.org/

diff --git a/charts/fluentd-elasticsearch/README.md b/charts/fluentd-elasticsearch/README.md
@@ -119,6 +119,7 @@ The following table lists the configurable parameters of the Fluentd elasticsear
 | `secret` | List of env vars that are set from secrets and added to the fluentd pods | `[]` |
 | `extraVolumeMounts` | Mount extra volume, required to mount ssl certificates when ES has tls enabled | `[]` |
 | `extraVolume` | Extra volume | `[]` |
+| `fluentConfDir` | Specify where to mount fluentd location | `/etc/fluent/config.d` |
 | `hostLogDir.varLog` | Specify where fluentd can find var log | `/var/log` |
 | `hostLogDir.dockerContainers` | Specify where fluentd can find logs for docker container | `/var/lib/docker/containers` |
 | `hostLogDir.libSystemdDir` | Specify where fluentd can find logs for lib Systemd | `/usr/lib64` |

diff --git a/charts/fluentd-elasticsearch/templates/daemonset.yaml b/charts/fluentd-elasticsearch/templates/daemonset.yaml
@@ -174,7 +174,7 @@ spec:
  mountPath: {{ .Values.hostLogDir.libSystemdDir }}
  readOnly: true
  - name: config-volume
- mountPath: /etc/fluent/config.d
+ mountPath: {{ .Values.fluentConfDir }}
 {{- if .Values.extraVolumeMounts }}
 {{ toYaml .Values.extraVolumeMounts | indent 8 }}
 {{- end }}

diff --git a/charts/fluentd-elasticsearch/values.yaml b/charts/fluentd-elasticsearch/values.yaml
@@ -38,6 +38,8 @@ awsSigningSidecar:
 # Pods to make scheduling of the pending Pod possible.
 priorityClassName: ""
 
+fluentConfDir: "/etc/fluent/config.d"
+
 # Specify where fluentd can find logs
 hostLogDir:
  varLog: /var/log