From 9a4b824c3c88dace309cf9a28f0fe1db61f5b507 Mon Sep 17 00:00:00 2001 From: Christian Knell Date: Tue, 3 Oct 2023 17:45:49 +0200 Subject: [PATCH] fixed postgresql include bug --- charts/kutt/templates/_helpers.tpl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/charts/kutt/templates/_helpers.tpl b/charts/kutt/templates/_helpers.tpl index db1734f7..9db84cc9 100644 --- a/charts/kutt/templates/_helpers.tpl +++ b/charts/kutt/templates/_helpers.tpl @@ -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 -}} @@ -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 -}} @@ -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 -}} @@ -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 -}} @@ -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 -}} @@ -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 -}}