Marko Oldenburg
ac8181519c
Removed hardcoded environment variables from the `common.yaml` template and refactored them to utilize the newly structured values from `Values.controllers.main.containers.main.env`. This change enhances maintainability and clarity by aligning environmental variables with the current values schema. Additionally, the code was cleaned up by ensuring proper indentation and structure for readability. No breaking changes or significant shifts in functionality were introduced; the refactor merely improves the organization of environment configuration.
50 lines
1.8 KiB
YAML
50 lines
1.8 KiB
YAML
{{/* Append the hardcoded settings */}}
|
|
{{- define "healthchecks.harcodedValues" -}}
|
|
PAPERLESS_TIME_ZONE: {{ .Values.controllers.main.containers.main.env.TZ }}
|
|
PAPERLESS_PORT: {{ quote .Values.service.main.ports.http.port }}
|
|
|
|
{{- with .Values.ingress.main }}
|
|
{{- if and .enabled .hosts }}
|
|
PAPERLESS_URL: http{{ if .tls }}s{{ end }}://{{ (first .hosts).host }}
|
|
{{- end }}
|
|
{{- end }}
|
|
|
|
{{- if .Values.postgresql.enabled }}
|
|
{{- with .Values.postgresql }}
|
|
PAPERLESS_DBENGINE: postgresql
|
|
PAPERLESS_DBHOST: {{ $.Release.Name }}-postgresql
|
|
PAPERLESS_DBNAME: {{ .auth.database }}
|
|
PAPERLESS_DBUSER: {{ default "postgres" .auth.username }}
|
|
PAPERLESS_DBPASS:
|
|
secretKeyRef:
|
|
name: {{ .auth.existingSecret | default (printf "%s-postgresql" $.Release.Name) }}
|
|
key: {{ if not .auth.password }}postgres-{{ end }}password
|
|
{{- end }}
|
|
{{- else if .Values.mariadb.enabled }}
|
|
{{- with .Values.mariadb}}
|
|
PAPERLESS_DBENGINE: mariadb
|
|
PAPERLESS_DBHOST: {{ $.Release.Name }}-mariadb
|
|
PAPERLESS_DBNAME: {{ .auth.database }}
|
|
PAPERLESS_DBUSER: {{ .auth.username }}
|
|
PAPERLESS_DBPASS:
|
|
secretKeyRef:
|
|
name: {{ .auth.existingSecret | default (printf "%s-mariadb" $.Release.Name) }}
|
|
key: mariadb-password
|
|
{{- end }}
|
|
{{- end }}
|
|
|
|
{{- if .Values.redis.enabled }}
|
|
{{- with .Values.redis }}
|
|
A_REDIS_PASSWORD:
|
|
secretKeyRef:
|
|
name: {{ .auth.existingSecret | default (printf "%s-redis" $.Release.Name) }}
|
|
key: {{ .auth.existingSecretPasswordKey | default "redis-password" }}
|
|
PAPERLESS_REDIS: redis://{{ .auth.username }}:$(A_REDIS_PASSWORD)@{{ $.Release.Name }}-redis-master
|
|
{{- end }}
|
|
{{- end }}
|
|
{{- end -}}
|
|
{{- /* Mergt die Umgebungsvariablen in den 'env'-Block des Haupt-Containers */ -}}
|
|
{{- $_ := mergeOverwrite .Values.controllers.main.containers.main.env (include "healthchecks.harcodedValues" . | fromYaml) -}}
|
|
|
|
{{/* Render the templates */}}
|
|
{{ include "bjw-s.common.loader.all" . }} |