truecharts/library-charts
1
0
Fork 0
mirror of https://github.com/truecharts/library-charts.git synced 2026-07-06 07:26:21 -03:00
Code Issues Packages Projects Releases Wiki Activity

fix root context

Browse Source
This commit is contained in:
Kjeld Schouten-Lebbing
2023-02-28 10:57:37 +01:00
parent c8d319835d
commit f746320d7c
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
library/common/templates/class/_cnpgCluster.tpl
View File

@@ -37,7 +37,7 @@ spec:
{{- $olddbprevious2 := lookup "v1" "Secret" .Release.Namespace "dbcreds" }}
bootstrap:
{{- if and .Values.postgresql.enabled ( or $olddbprevious1 $olddbprevious2 ) .Release.IsUpgrade }}
{{- if and $.Values.postgresql.enabled ( or $olddbprevious1 $olddbprevious2 ) $.Release.IsUpgrade }}
pg_basebackup:
source: old-db
{{- else }}
@@ -80,7 +80,7 @@ spec:
reusePVC: on
externalClusters:
{{- if and .Values.postgresql.enabled ( or $olddbprevious1 $olddbprevious2 ) .Release.IsUpgrade }}
{{- if and $.Values.postgresql.enabled ( or $olddbprevious1 $olddbprevious2 ) $.Release.IsUpgrade }}
- name: old-db
connectionParameters:
host: {{ (printf "%v-%v" .Release.Name "postgresql" ) }}

8
library/common/templates/spawner/_cnpg.tpl
View File

@@ -37,9 +37,9 @@
{{- $dbprevious := lookup "v1" "Secret" $.Release.Namespace ( printf "%s-user" $cnpgValues.name ) }}
{{- if $dbprevious }}
{{- $dbPass = ( index $dbprevious.data "user-password" ) | b64dec }}
{{- else if and .Values.postgresql.enabled $olddbprevious1 .Release.IsUpgrade }}
{{- else if and $.Values.postgresql.enabled $olddbprevious1 $.Release.IsUpgrade }}
{{- $dbPass = ( index $olddbprevious1.data "postgresql-password" ) | b64dec }}
{{- else if and .Values.postgresql.enabled $olddbprevious2 .Release.IsUpgrade }}
{{- else if and $.Values.postgresql.enabled $olddbprevious2 $.Release.IsUpgrade }}
{{- $dbPass = ( index $olddbprevious2.data "postgresql-password" ) | b64dec }}
{{- else }}
{{- $dbPass = $cnpgValues.password | default ( randAlphaNum 62 ) }}
@@ -49,9 +49,9 @@
{{- $pgprevious := lookup "v1" "Secret" $.Release.Namespace ( printf "%s-superuser" $cnpgValues.name ) }}
{{- if $pgprevious }}
{{- $pgPass = ( index $dbprevious.data "superuser-password" ) | b64dec }}
{{- else if and .Values.postgresql.enabled $olddbprevious1 .Release.IsUpgrade }}
{{- else if and $.Values.postgresql.enabled $olddbprevious1 $.Release.IsUpgrade }}
{{- $pgPass = ( index $olddbprevious1.data "postgresql-postgres-password" ) | b64dec }}
{{- else if and .Values.postgresql.enabled $olddbprevious2 .Release.IsUpgrade }}
{{- else if and $.Values.postgresql.enabled $olddbprevious2 $.Release.IsUpgrade }}
{{- $pgPass = ( index $olddbprevious2.data "postgresql-postgres-password" ) | b64dec }}
{{- else }}
{{- $pgPass = $cnpgValues.superUserPassword | default ( randAlphaNum 62 ) }}