truecharts/charts
1
0
Fork 0
mirror of https://github.com/truecharts/charts.git synced 2026-07-12 04:11:25 -03:00
Code Issues Packages Projects Releases Wiki Activity

another potential db fix

Browse Source
This commit is contained in:
kjeld Schouten-Lebbing
2021-08-31 19:08:24 +02:00
parent f9261e5c88
commit bc25dd9373
4 changed files with 31 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
charts/stable/fireflyiii/Chart.yaml
View File

@@ -27,4 +27,4 @@ name: fireflyiii
sources:
- https://github.com/firefly-iii/firefly-iii/
type: application
version: 6.0.11
version: 6.0.12

19
charts/stable/fireflyiii/templates/_secrets.tpl
View File

@@ -8,16 +8,25 @@ metadata:
{{- $dbcredsname := ( printf "%v-%v" .Release.Name "dbcreds" ) }}
name: {{ $dbcredsname }}
data:
{{- $dbPass := "" }}
{{ $rootPass := "" }}
{{ $urlPass := "" }}
{{- if .Release.IsInstall }}
postgresql-password: {{ randAlphaNum 50 | b64enc | quote }}
postgresql-postgres-password: {{ randAlphaNum 50 | b64enc | quote }}
{{ $dbPass = ( randAlphaNum 50 | b64enc | quote ) }}
{{ $rootPass = ( randAlphaNum 50 | b64enc | quote ) }}
{{ $urlPass = $dbPass }}
{{ 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" }}
{{ $dbPass = ( index (lookup "v1" "Secret" .Release.Namespace ( $dbcredsname | quote ) ).data "postgresql-postgres-password" ) }}
{{ $rootPass = ( index (lookup "v1" "Secret" .Release.Namespace ( $dbcredsname | quote ) ).data "postgresql-postgres-password" ) }}
{{ $urlPass = ( ( index (lookup "v1" "Secret" .Release.Namespace ( $dbcredsname | quote ) ).data "postgresql-postgres-password" ) | b64dec | quote ) }}
{{ end }}
url: {{ ( printf "%v%v:%v@%v-%v:%v/%v" "postgresql://" .Values.postgresql.postgresqlUsername $dbPass .Release.Name "postgresql" "5432" .Values.postgresql.postgresqlDatabase ) | b64enc | quote }}
postgresql-password: {{ $dbPass }}
postgresql-postgres-password: {{ $rootPass }}
url: {{ ( printf "%v%v:%v@%v-%v:%v/%v" "postgresql://" .Values.postgresql.postgresqlUsername $urlPass .Release.Name "postgresql" "5432" .Values.postgresql.postgresqlDatabase ) | b64enc | quote }}
postgresql_host: {{ ( printf "%v-%v" .Release.Name "postgresql" ) | b64enc | quote }}
type: Opaque

2
charts/stable/vaultwarden/Chart.yaml
View File

@@ -31,4 +31,4 @@ name: vaultwarden
sources:
- https://github.com/dani-garcia/vaultwarden
type: application
version: 5.0.11
version: 5.0.12

20
charts/stable/vaultwarden/templates/_secrets.tpl
View File

@@ -44,15 +44,25 @@ metadata:
{{- $dbcredsname := ( printf "%v-%v" .Release.Name "dbcreds" ) }}
name: {{ $dbcredsname }}
data:
{{- $dbPass := "" }}
{{ $rootPass := "" }}
{{ $urlPass := "" }}
{{- if .Release.IsInstall }}
postgresql-password: {{ randAlphaNum 50 | b64enc | quote }}
postgresql-postgres-password: {{ randAlphaNum 50 | b64enc | quote }}
{{ $dbPass = ( randAlphaNum 50 | b64enc | quote ) }}
{{ $rootPass = ( randAlphaNum 50 | b64enc | quote ) }}
{{ $urlPass = $dbPass }}
{{ 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" }}
{{ $dbPass = ( index (lookup "v1" "Secret" .Release.Namespace ( $dbcredsname | quote ) ).data "postgresql-postgres-password" ) }}
{{ $rootPass = ( index (lookup "v1" "Secret" .Release.Namespace ( $dbcredsname | quote ) ).data "postgresql-postgres-password" ) }}
{{ $urlPass = ( ( index (lookup "v1" "Secret" .Release.Namespace ( $dbcredsname | quote ) ).data "postgresql-postgres-password" ) | b64dec | quote ) }}
{{ end }}
url: {{ ( printf "%v%v:%v@%v-%v:%v/%v" "postgresql://" .Values.postgresql.postgresqlUsername $dbPass .Release.Name "postgresql" "5432" .Values.postgresql.postgresqlDatabase ) | b64enc | quote }}
postgresql-password: {{ $dbPass }}
postgresql-postgres-password: {{ $rootPass }}
url: {{ ( printf "%v%v:%v@%v-%v:%v/%v" "postgresql://" .Values.postgresql.postgresqlUsername $urlPass .Release.Name "postgresql" "5432" .Values.postgresql.postgresqlDatabase ) | b64enc | quote }}
postgresql_host: {{ ( printf "%v-%v" .Release.Name "postgresql" ) | b64enc | quote }}
type: Opaque
{{- end -}}