DevOps/truecharts
2
0
Fork 0
Code Issues Pull Requests Actions 27 Packages Projects Releases 1 Wiki Activity

feat(postgresql): also set and remember postgresql root password

Browse Source
This commit is contained in:
kjeld Schouten-Lebbing
2021-11-08 17:40:48 +01:00
parent 19fe769103
commit 7e08a5f591
4 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
charts/dependency/postgresql/Chart.yaml
+1 -1
View File
@@ -22,7 +22,7 @@ name: postgresql
sources: sources:
- https://www.postgresql.org/ - https://www.postgresql.org/
type: application type: application
version: 5.1.13 version: 5.1.14
annotations: annotations:
truecharts.org/catagories: | truecharts.org/catagories: |
- database - database
charts/dependency/postgresql/values.yaml
+5
View File
@@ -32,6 +32,7 @@ persistence:
postgresqlPassword: "testpass" postgresqlPassword: "testpass"
postgresqlUsername: "test" postgresqlUsername: "test"
postgresqlDatabase: "test" postgresqlDatabase: "test"
postgrespassword: "testroot"
existingSecret: "" existingSecret: ""
envValueFrom: envValueFrom:
@@ -39,6 +40,10 @@ envValueFrom:
secretKeyRef: secretKeyRef:
name: '{{ ( tpl .Values.existingSecret $ ) | default ( include "common.names.fullname" . ) }}' name: '{{ ( tpl .Values.existingSecret $ ) | default ( include "common.names.fullname" . ) }}'
key: "postgresql-password" key: "postgresql-password"
POSTGRESQL_POSTGRES_PASSWORD:
secretKeyRef:
name: '{{ ( tpl .Values.existingSecret $ ) | default ( include "common.names.fullname" . ) }}'
key: "postgresql-postgres-password"
envTpl: envTpl:
POSTGRES_USER: "{{ .Values.postgresqlUsername }}" POSTGRES_USER: "{{ .Values.postgresqlUsername }}"
charts/library/common/Chart.yaml
+1 -1
View File
@@ -15,4 +15,4 @@ maintainers:
name: common name: common
sources: null sources: null
type: library type: library
version: 8.5.3 version: 8.5.4
charts/library/common/templates/lib/dependencies/_postgresInjector.tpl
+5 -1
View File
@@ -14,15 +14,18 @@ metadata:
name: dbcreds name: dbcreds
{{- $dbprevious := lookup "v1" "Secret" .Release.Namespace "dbcreds" }} {{- $dbprevious := lookup "v1" "Secret" .Release.Namespace "dbcreds" }}
{{- $dbPass := "" }} {{- $dbPass := "" }}
{{- $pgPass := "" }}
data: data:
{{- if $dbprevious }} {{- if $dbprevious }}
{{- $dbPass = ( index $dbprevious.data "postgresql-password" ) | b64dec }} {{- $dbPass = ( index $dbprevious.data "postgresql-password" ) | b64dec }}
{{- $pgPass = ( index $dbprevious.data "postgresql-postgres-password" ) | b64dec }}
postgresql-password: {{ ( index $dbprevious.data "postgresql-password" ) }} postgresql-password: {{ ( index $dbprevious.data "postgresql-password" ) }}
postgresql-postgres-password: {{ ( index $dbprevious.data "postgresql-postgres-password" ) }} postgresql-postgres-password: {{ ( index $dbprevious.data "postgresql-postgres-password" ) }}
{{- else }} {{- else }}
{{- $dbPass = randAlphaNum 50 }} {{- $dbPass = randAlphaNum 50 }}
{{- $pgPass = randAlphaNum 50 }}
postgresql-password: {{ $dbPass | b64enc | quote }} postgresql-password: {{ $dbPass | b64enc | quote }}
postgresql-postgres-password: {{ randAlphaNum 50 | b64enc | quote }} postgresql-postgres-password: {{ $pgPass | b64enc | quote }}
{{- end }} {{- end }}
url: {{ ( printf "postgresql://%v:%v@%v-postgresql:5432/%v" .Values.postgresql.postgresqlUsername $dbPass .Release.Name .Values.postgresql.postgresqlDatabase ) | b64enc | quote }} url: {{ ( printf "postgresql://%v:%v@%v-postgresql:5432/%v" .Values.postgresql.postgresqlUsername $dbPass .Release.Name .Values.postgresql.postgresqlDatabase ) | b64enc | quote }}
urlnossl: {{ ( printf "postgresql://%v:%v@%v-postgresql:5432/%v?sslmode=disable" .Values.postgresql.postgresqlUsername $dbPass .Release.Name .Values.postgresql.postgresqlDatabase ) | b64enc | quote }} urlnossl: {{ ( printf "postgresql://%v:%v@%v-postgresql:5432/%v?sslmode=disable" .Values.postgresql.postgresqlUsername $dbPass .Release.Name .Values.postgresql.postgresqlDatabase ) | b64enc | quote }}
@@ -31,6 +34,7 @@ data:
jdbc: {{ ( printf "jdbc:postgresql://%v-postgresql:5432/%v" .Release.Name .Values.postgresql.postgresqlDatabase ) | b64enc | quote }} jdbc: {{ ( printf "jdbc:postgresql://%v-postgresql:5432/%v" .Release.Name .Values.postgresql.postgresqlDatabase ) | b64enc | quote }}
type: Opaque type: Opaque
{{- $_ := set .Values.postgresql "postgresqlPassword" ( $dbPass | quote ) }} {{- $_ := set .Values.postgresql "postgresqlPassword" ( $dbPass | quote ) }}
{{- $_ := set .Values.postgresql "postgrespassword" ( $pgPass | quote ) }}
{{- $_ := set .Values.postgresql.url "plain" ( ( printf "%v-%v" .Release.Name "postgresql" ) | quote ) }} {{- $_ := set .Values.postgresql.url "plain" ( ( printf "%v-%v" .Release.Name "postgresql" ) | quote ) }}
{{- $_ := set .Values.postgresql.url "plainhost" ( ( printf "%v-%v" .Release.Name "postgresql" ) | quote ) }} {{- $_ := set .Values.postgresql.url "plainhost" ( ( printf "%v-%v" .Release.Name "postgresql" ) | quote ) }}
{{- $_ := set .Values.postgresql.url "plainport" ( ( printf "%v-%v:5432" .Release.Name "postgresql" ) | quote ) }} {{- $_ := set .Values.postgresql.url "plainport" ( ( printf "%v-%v:5432" .Release.Name "postgresql" ) | quote ) }}