Skip to content

Commit

Permalink
fixed postgresql include bug
Browse files Browse the repository at this point in the history
  • Loading branch information
christianhuth committed Oct 3, 2023
1 parent 67a1123 commit 9a4b824
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions charts/kutt/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ Return the hostname of the postgresql to use
*/}}
{{- define "kutt.postgresql.hostname" -}}
{{- if .Values.postgresql.enabled -}}
{{- printf "%s" (include "postgresql.primary.fullname" .Subcharts.postgresql) -}}
{{- printf "%s" (include "postgresql.v1.primary.fullname" .Subcharts.postgresql) -}}
{{- else -}}
{{- printf "%s" (tpl .Values.externalPostgresql.hostname $) -}}
{{- end -}}
Expand All @@ -77,7 +77,7 @@ Return postgresql service port
*/}}
{{- define "kutt.postgresql.port" -}}
{{- if .Values.postgresql.enabled -}}
{{- printf "%s" (include "postgresql.service.port" .Subcharts.postgresql) -}}
{{- printf "%s" (include "postgresql.v1.service.port" .Subcharts.postgresql) -}}
{{- else -}}
{{- printf "%s" (tpl (toString .Values.externalPostgresql.port) $) -}}
{{- end -}}
Expand All @@ -88,7 +88,7 @@ Return the name for the database to use
*/}}
{{- define "kutt.postgresql.database" -}}
{{- if .Values.postgresql.enabled -}}
{{- printf "%s" (include "postgresql.database" .Subcharts.postgresql) -}}
{{- printf "%s" (include "postgresql.v1.database" .Subcharts.postgresql) -}}
{{- else -}}
{{- printf "%s" (tpl .Values.externalPostgresql.auth.database $) -}}
{{- end -}}
Expand All @@ -99,7 +99,7 @@ Return the name for the user to use
*/}}
{{- define "kutt.postgresql.username" -}}
{{- if .Values.postgresql.enabled -}}
{{- printf "%s" (include "postgresql.username" .Subcharts.postgresql) -}}
{{- printf "%s" (include "postgresql.v1.username" .Subcharts.postgresql) -}}
{{- else -}}
{{- printf "%s" (tpl .Values.externalPostgresql.auth.username $) -}}
{{- end -}}
Expand All @@ -110,7 +110,7 @@ Get the name of the secret containing the postgresql user password
*/}}
{{- define "kutt.postgresql.secretName" -}}
{{- if .Values.postgresql.enabled -}}
{{- printf "%s" (include "postgresql.secretName" .Subcharts.postgresql) -}}
{{- printf "%s" (include "postgresql.v1.secretName" .Subcharts.postgresql) -}}
{{- else if .Values.externalPostgresql.auth.existingSecret -}}
{{- printf "%s" (tpl .Values.externalPostgresql.auth.existingSecret $) -}}
{{- else -}}
Expand All @@ -123,7 +123,7 @@ Get the user-password key for the postgresql user password
*/}}
{{- define "kutt.postgresql.userPasswordKey" -}}
{{- if .Values.postgresql.enabled -}}
{{- printf "%s" (include "postgresql.userPasswordKey" .Subcharts.postgresql) -}}
{{- printf "%s" (include "postgresql.v1.userPasswordKey" .Subcharts.postgresql) -}}
{{- else if .Values.externalPostgresql.auth.userPasswordKey -}}
{{- printf "%s" (tpl .Values.externalPostgresql.auth.userPasswordKey $) -}}
{{- else -}}
Expand Down

0 comments on commit 9a4b824

Please sign in to comment.