From 92e5ba59d9793e617f8555dd59696cf6d4fac140 Mon Sep 17 00:00:00 2001
From: Alexander Buntakov <alexander.buntakov@gmail.com>
Date: Wed, 25 Aug 2021 13:19:06 +0300
Subject: [PATCH] fix db name (#10)

* fix db name

* add app.baseDomain
---
 starters/touchin-server/templates/_helpers.tpl    | 2 +-
 starters/touchin-server/templates/deployment.yaml | 2 +-
 starters/touchin-server/values.yaml               | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

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 "<CHARTNAME>.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"
diff --git a/starters/touchin-server/values.yaml b/starters/touchin-server/values.yaml
index 4dd3ec4..f486a1e 100644
--- a/starters/touchin-server/values.yaml
+++ b/starters/touchin-server/values.yaml
@@ -50,6 +50,7 @@ db:
 app:
   port: 8080
   javaOpts: "-Xmx256m"
+  # baseDomain: ""
 
 metrics:
   enabled: true