Fixing the conditionals, part two

This commit is contained in:
Skyler Mäntysaari 2023-07-21 05:01:52 +03:00
parent 5eb5026847
commit 7f4c3f622e

View file

@ -53,7 +53,7 @@ data:
{{ end }} {{ end }}
COMPROMISED_PASSWORD_CHECK: {{ .Values.backend.config.COMPROMISED_PASSWORD_CHECK | default true }} COMPROMISED_PASSWORD_CHECK: {{ .Values.backend.config.COMPROMISED_PASSWORD_CHECK | default true }}
DISABLE_REGISTRATION: {{ .Values.backend.config.DISABLE_REGISTRATION | default false }} DISABLE_REGISTRATION: {{ .Values.backend.config.DISABLE_REGISTRATION | default false }}
FEED_RETENTION: {{ .Values.backend.config.FEED_RETENTION | int | default 30 }} FEED_RETENTION: {{ .Values.backend.config.FEED_RETENTION | default 30 | int }}
{{- if and (.Values.backend.config.database) (not .Values.postgresql.enabled) }} {{- if and (.Values.backend.config.database) (not .Values.postgresql.enabled) }}
hibernate.connection.url: {{.Values.backend.config.database.connection_url }} hibernate.connection.url: {{.Values.backend.config.database.connection_url }}
{{- if and (.Values.backend.config.database) (.Values.backend.config.database.driver_class) (.Values.backend.config.database.dialect) (not .Values.postgresql.enabled)}} {{- if and (.Values.backend.config.database) (.Values.backend.config.database.driver_class) (.Values.backend.config.database.dialect) (not .Values.postgresql.enabled)}}
@ -62,7 +62,7 @@ data:
hibernate.connection.username: {{.Values.backend.config.database.username }} hibernate.connection.username: {{.Values.backend.config.database.username }}
hibernate.connection.password: {{.Values.backend.config.database.password }} hibernate.connection.password: {{.Values.backend.config.database.password }}
{{ end }} {{ end }}
{{- else if (not .Values.backend.config.database.driver_class) (not .Values.backend.config.database.dialect) }} {{- else if and (not .Values.backend.config.database.driver_class) (not .Values.backend.config.database.dialect) }}
hibernate.connection.driver_class: org.postgresql.Driver hibernate.connection.driver_class: org.postgresql.Driver
hibernate.dialect: org.hibernate.dialect.PostgreSQLDialect hibernate.dialect: org.hibernate.dialect.PostgreSQLDialect
{{- if .Values.backend.config.database.secret }} {{- if .Values.backend.config.database.secret }}