Merge "Fluentd: Add support for arbitrary environment vars"

fluentd/templates/deployment-fluentd.yaml

@@ -163,6 +163,9 @@ spec:
               value: {{ tuple "elasticsearch" "internal" "http" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | quote }}
             - name: KAFKA_BROKER
               value: {{ $kafkaBrokerURI }}
+{{- if .Values.pod.env.fluentd }}
+{{ include "helm-toolkit.utils.to_k8s_env_vars" .Values.pod.env.fluentd | indent 12 }}
+{{- end }}
             - name: ELASTICSEARCH_USERNAME
               valueFrom:
                 secretKeyRef:

fluentd/values.yaml

@@ -405,6 +405,8 @@ network_policy:
       - {}
 
 pod:
+  env:
+    fluentd: null
   tolerations:
     fluentd:
       enabled: false