Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions chart/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ spec:
envFrom:
- secretRef:
name: {{ .Values.config.existingSecret }}
{{- with .Values.controller.extraEnv }}
env:
{{- toYaml . | nindent 12 }}
{{- end }}
{{- else }}
# Use hardcoded plaintext values (less secure)
env:
Expand All @@ -44,4 +48,7 @@ spec:
value: {{ .Values.config.OED_DB_PORT }}
- name: OED_DB_NAME
value: {{ .Values.config.OED_DB_NAME }}
{{- with .Values.controller.extraEnv }}
{{- toYaml . | nindent 12 }}
{{- end }}
{{- end }}
9 changes: 9 additions & 0 deletions chart/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,15 @@ controller:
limits:
memory: 1Gi

# Additional environment variables for the container, as a list of {name, value}
extraEnv:
# Trust X-Forwarded-* from the ingress so generated URLs use https and logs show client
# addresses. 10.42.0.0/16 is this cluster's pod network, so every pod in the cluster is
# trusted, not only Traefik; outside clients can't spoof their address. Not "*", which
# would log the first X-Forwarded-For entry, one an outside client can set.
- name: FORWARDED_ALLOW_IPS
value: "10.42.0.0/16"

# TODO: parameterize labels, tolerations, nodeSelector, etc?


Expand Down
Loading