Merge "Fluentd: Add support for arbitrary environment vars"

2019-09-05 18:29:04 +00:00 · 2019-09-05 18:29:04 +00:00 · 010fc1fc65
parent 6c3cd0a8ce 5b14b6c162
commit 010fc1fc65
2 changed files with 5 additions and 0 deletions
--- a/fluentd/templates/deployment-fluentd.yaml
+++ b/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:
--- a/fluentd/values.yaml
+++ b/fluentd/values.yaml
@ -405,6 +405,8 @@ network_policy:
      - {}

 pod:
+  env:
+    fluentd: null
  tolerations:
    fluentd:
      enabled: false