annother attempt at bitwarden/fireflyiii fix

This commit is contained in:
kjeld Schouten-Lebbing
2021-08-31 18:40:02 +02:00
parent ce9969be4f
commit 36046257fc
4 changed files with 18 additions and 20 deletions
@@ -43,17 +43,16 @@ metadata:
{{- include "common.labels" . | nindent 4 }}
{{- $dbcredsname := ( printf "%v-%v" .Release.Name "dbcreds" ) }}
name: {{ $dbcredsname }}
{{- $previous := lookup "v1" "Secret" .Release.Namespace $dbcredsname }}
{{- $dbPass := "" }}
data:
{{- if $previous }}
postgresql-password: {{ ( index $previous.data "postgresql-password" ) }}
postgresql-postgres-password: {{ ( index $previous.data "postgresql-postgres-password" ) }}
{{- else }}
{{- $dbPass = randAlphaNum 50 }}
postgresql-password: {{ $dbPass | b64enc | quote }}
{{- if .Release.IsInstall }}
postgresql-password: {{ randAlphaNum 50 | b64enc | quote }}
postgresql-postgres-password: {{ randAlphaNum 50 | b64enc | quote }}
{{- end }}
{{ else }}
# `index` function is necessary because the property name contains a dash.
# Otherwise (...).data.db_password would have worked too.
postgresql-password: {{ index (lookup "v1" "Secret" .Release.Namespace ( $dbcredsname | quote ) ).data "postgresql-password" }}
postgresql-postgres-password: {{ index (lookup "v1" "Secret" .Release.Namespace ( $dbcredsname | quote ) ).data "postgresql-postgres-password" }}
{{ end }}
url: {{ ( printf "%v%v:%v@%v-%v:%v/%v" "postgresql://" .Values.postgresql.postgresqlUsername $dbPass .Release.Name "postgresql" "5432" .Values.postgresql.postgresqlDatabase ) | b64enc | quote }}
type: Opaque
{{- end -}}