chore(database): create database

Author: lijianguo

charts/database/templates/database-secret-creds.yaml

@@ -10,5 +10,7 @@ metadata:
     "helm.sh/hook": pre-install
 data:
   user: {{ if .Values.username | default "" | ne "" }}{{ .Values.username | b64enc }}{{ else }}{{ randAlphaNum 32 | b64enc }}{{ end }}
-  password: {{ if .Values.password | default "" | ne "" }}{{ .Values.password | b64enc }}{{ else }}{{ randAlphaNum 32 | b64enc }}
-{{ end }}
+  password: {{ if .Values.password | default "" | ne "" }}{{ .Values.password | b64enc }}{{ else }}{{ randAlphaNum 32 | b64enc }}{{ end }}
+  controller-database-name: {{ if .Values.controller_database_name | default "" | ne "" }}{{ .Values.controller_database_name | b64enc }}{{ else }}{{ randAlphaNum 32 | b64enc }}{{ end }}
+  passport-database-name: {{ if .Values.passport_database_name | default "" | ne "" }}{{ .Values.passport_database_name | b64enc }}{{ else }}{{ randAlphaNum 32 | b64enc }}{{ end }}
+{{- end }}

charts/database/values.yaml

@@ -9,3 +9,5 @@ timeout: "1200"
 # If left empty they will be generated using randAlphaNum
 username: ""
 password: ""
+controller_database_name: "drycc_controller"
+passport_database_name: "drycc_passport"

contrib/ci/test.sh

@@ -22,6 +22,8 @@ create-postgres-creds() {
   mkdir -p "${CURRENT_DIR}"/tmp/creds
   echo "testuser" > "${CURRENT_DIR}"/tmp/creds/user
   echo "icanttellyou" > "${CURRENT_DIR}"/tmp/creds/password
+  echo "drycc_controller" > "${CURRENT_DIR}"/tmp/creds/controller-database-name
+  echo "drycc_passport" > "${CURRENT_DIR}"/tmp/creds/passport-database-name
 }
 
 start-postgres() {

rootfs/docker-entrypoint.sh

@@ -12,6 +12,8 @@ set_listen_addresses() {
 
 POSTGRES_USER="$(cat /var/run/secrets/drycc/database/creds/user)"
 POSTGRES_PASSWORD="$(cat /var/run/secrets/drycc/database/creds/password)"
+POSTGRES_CONTROLLER="$(cat /var/run/secrets/drycc/database/creds/controller-database-name)"
+POSTGRES_PASSPORT="$(cat /var/run/secrets/drycc/database/creds/passport-database-name)"
 
 if [ "$1" = 'postgres' ]; then
 	mkdir -p "$PGDATA"
@@ -59,12 +61,18 @@ if [ "$1" = 'postgres' ]; then
 			-w start
 
 		: ${POSTGRES_USER:=postgres}
-		: ${POSTGRES_DB:=$POSTGRES_USER}
-		export POSTGRES_USER POSTGRES_DB
+		export POSTGRES_USER
 
-		if [ "$POSTGRES_DB" != 'postgres' ]; then
+		if [ "$POSTGRES_CONTROLLER" != '' ]; then
 			psql --username postgres <<-EOSQL
-				CREATE DATABASE "$POSTGRES_DB" ;
+				CREATE DATABASE "$POSTGRES_CONTROLLER" ;
+			EOSQL
+			echo
+		fi
+
+		if [ "$POSTGRES_PASSPORT" != '' ]; then
+			psql --username postgres <<-EOSQL
+				CREATE DATABASE "$POSTGRES_PASSPORT" ;
 			EOSQL
 			echo
 		fi