openstack/openstack-helm-infra
Code Issues Proposed changes

Merge "Fluentd: Add support for arbitrary environment vars"

Browse Source
This commit is contained in:
Zuul 2019-09-05 18:29:04 +00:00 committed by Gerrit Code Review
commit 010fc1fc65
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fluentd/templates/deployment-fluentd.yaml
View File

@ -163,6 +163,9 @@ spec:
value: {{ tuple "elasticsearch" "internal" "http" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | quote }} value: {{ tuple "elasticsearch" "internal" "http" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | quote }}
- name: KAFKA_BROKER - name: KAFKA_BROKER
value: {{ $kafkaBrokerURI }} 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 - name: ELASTICSEARCH_USERNAME
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:

2
fluentd/values.yaml
View File

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