Fixes for extraEnv

- Fixed indentation
- Fixed default type (yaml sequences instead of maps)
This commit is contained in:
Nicolas Bonneval 2020-12-01 17:48:50 +01:00 committed by Nicolas Bonneval
parent 12faeacf88
commit 54e3a205f9
3 changed files with 4 additions and 4 deletions

View file

@ -95,7 +95,7 @@ spec:
key: redis-password key: redis-password
{{- end }} {{- end }}
{{- with .Values.synapse.extraEnv }} {{- with .Values.synapse.extraEnv }}
{{ . | toYaml }} {{- . | toYaml | nindent 12 }}
{{- end }} {{- end }}
image: "{{ .Values.image.repository }}:{{ include "matrix-synapse.imageTag" . }}" image: "{{ .Values.image.repository }}:{{ include "matrix-synapse.imageTag" . }}"
imagePullPolicy: {{ .Values.image.pullPolicy }} imagePullPolicy: {{ .Values.image.pullPolicy }}

View file

@ -83,7 +83,7 @@ spec:
key: redis-password key: redis-password
{{- end }} {{- end }}
{{- with $config.extraEnv | default $default.extraEnv }} {{- with $config.extraEnv | default $default.extraEnv }}
{{ . | toYaml }} {{- . | toYaml | nindent 12 }}
{{- end }} {{- end }}
securityContext: securityContext:
{{- $config.securityContext | default $default.securityContext | toYaml | nindent 12 }} {{- $config.securityContext | default $default.securityContext | toYaml | nindent 12 }}

View file

@ -158,7 +158,7 @@ synapse:
## Additional environment variables to apply to the main Synapse pod ## Additional environment variables to apply to the main Synapse pod
## ##
extraEnv: {} extraEnv: []
# - name: LD_PRELOAD # - name: LD_PRELOAD
# value: /usr/lib/x86_64-linux-gnu/libjemalloc.so.2 # value: /usr/lib/x86_64-linux-gnu/libjemalloc.so.2
# - name: SYNAPSE_CACHE_FACTOR # - name: SYNAPSE_CACHE_FACTOR
@ -262,7 +262,7 @@ workers:
## Additional environment variables to add to the worker. ## Additional environment variables to add to the worker.
## ##
extraEnv: {} extraEnv: []
# - name: LD_PRELOAD # - name: LD_PRELOAD
# value: /usr/lib/x86_64-linux-gnu/libjemalloc.so.2 # value: /usr/lib/x86_64-linux-gnu/libjemalloc.so.2
# - name: SYNAPSE_CACHE_FACTOR # - name: SYNAPSE_CACHE_FACTOR