diff --git a/starters/touchin-server/templates/_helpers.tpl b/starters/touchin-server/templates/_helpers.tpl index 9aa3d05..f268d7b 100644 --- a/starters/touchin-server/templates/_helpers.tpl +++ b/starters/touchin-server/templates/_helpers.tpl @@ -96,7 +96,7 @@ Create db environments Get db name */}} {{- define ".db.name" -}} -{{ .Values.db.name }}{{- if .Values.releaseName}}--{{ .Values.releaseName }}{{- end }} +{{ .Values.db.name }}{{- if .Values.releaseName }}--{{ .Values.releaseName }}{{- end }} {{- end }} {{/* diff --git a/starters/touchin-server/templates/deployment.yaml b/starters/touchin-server/templates/deployment.yaml index cd6eb32..893c6b3 100644 --- a/starters/touchin-server/templates/deployment.yaml +++ b/starters/touchin-server/templates/deployment.yaml @@ -71,7 +71,7 @@ spec: name: "postgres12-{{ .Release.Namespace }}" key: postgresql-password - name: spring_datasource_url - value: "jdbc:postgresql://postgres12-{{ .Release.Namespace }}:5432/{{ .Values.db.name }}" + value: "jdbc:postgresql://postgres12-{{ .Release.Namespace }}:5432/{{ $dbName }}" - name: spring_datasource_username value: "postgres" - name: "management_metrics_export_elastic_enabled"