Add env, envFrom, extraVolumes and extraVolumeMounts configurable val…

…ues.

In order to provide maximum flexibility with fluent-bit's ever-growing list of output plugins that can require sensitive info such as api keys or password.

Signed-off-by: Naseem <naseem@transit.app>

charts/fluent-bit/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 name: fluent-bit
 description: Fast and lightweight log processor and forwarder or Linux, OSX and BSD family operating systems.
-version: 0.1.1
+version: 0.1.2
 appVersion: 1.3.7
 icon: https://fluentbit.io/assets/img/logo1-default.png
 home: https://fluentbit.io/

charts/fluent-bit/README.md

@@ -50,6 +50,10 @@ helm install fluent-bit fluent/fluent-bit
 | config.service.HTTP_Server | bool | `true` |  |
 | config.service.Log_Level | string | `"info"` |  |
 | config.service.Parsers_File | string | `"custom_parsers.conf"` |  |
+| env | list | `[]` |  |
+| envFrom | list | `[]` |  |
+| extraVolumeMounts | list | `[]` |  |
+| extraVolumes | list | `[]` |  |
 | fullnameOverride | string | `""` |  |
 | image.pullPolicy | string | `"IfNotPresent"` |  |
 | image.repository | string | `"fluent/fluent-bit"` |  |

charts/fluent-bit/templates/daemonset.yaml

@@ -34,6 +34,14 @@ spec:
             {{- toYaml .Values.securityContext | nindent 12 }}
           image: "{{ .Values.image.repository }}:{{ .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
+        {{- if .Values.env }}
+          env:
+          {{- toYaml .Values.env | nindent 10 }}
+        {{- end }}
+        {{- if .Values.envFrom }}
+          envFrom:
+          {{- toYaml .Values.envFrom | nindent 10 }}
+        {{- end }}
           ports:
             - name: http
               containerPort: 2020
@@ -63,6 +71,9 @@ spec:
             - name: etcmachineid
               mountPath: /etc/machine-id
               readOnly: true
+          {{- if .Values.extraVolumeMounts }}
+            {{- toYaml .Values.extraVolumeMounts | nindent 12 }}
+          {{- end }}
       volumes:
         - name: config
           configMap:
@@ -77,6 +88,9 @@ spec:
           hostPath:
             path: /etc/machine-id
             type: File
+      {{- if .Values.extraVolumes }}
+        {{- toYaml .Values.extraVolumes | nindent 8 }}
+      {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

charts/fluent-bit/values.yaml

@@ -51,9 +51,16 @@ affinity: {}
 
 podAnnotations: {}
 
-## Ref: https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption/#priorityclass
 priorityClassName: ""
 
+env: []
+
+envFrom: []
+
+extraVolumes: []
+
+extraVolumeMounts: []
+
 config:
   ## Ref: https://docs.fluentbit.io/manual/service
   service: