style(database): database name convention over configuration

Author: duanhongyi

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

@@ -11,6 +11,4 @@ metadata:
 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 }}
-  controller-database-name: {{ if .Values.controllerDatabaseName | default "" | ne "" }}{{ .Values.controllerDatabaseName | b64enc }}{{ else }}{{ randAlphaNum 32 | b64enc }}{{ end }}
-  passport-database-name: {{ if .Values.passportDatabaseName | default "" | ne "" }}{{ .Values.passportDatabaseName | b64enc }}{{ else }}{{ randAlphaNum 32 | b64enc }}{{ end }}
 {{- end }}

contrib/ci/test.sh

@@ -22,8 +22,6 @@ 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,8 +12,6 @@ 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"
@@ -62,20 +60,6 @@ if [ "$1" = 'postgres' ]; then
 		: ${POSTGRES_USER:=postgres}
 		export POSTGRES_USER
 
-		if [ "$POSTGRES_CONTROLLER" != '' ]; then
-			psql --username postgres <<-EOSQL
-				CREATE DATABASE "$POSTGRES_CONTROLLER" ;
-			EOSQL
-			echo
-		fi
-
-		if [ "$POSTGRES_PASSPORT" != '' ]; then
-			psql --username postgres <<-EOSQL
-				CREATE DATABASE "$POSTGRES_PASSPORT" ;
-			EOSQL
-			echo
-		fi
-
 		if [ "$POSTGRES_USER" = 'postgres' ]; then
 			op='ALTER'
 		else
@@ -87,7 +71,13 @@ if [ "$1" = 'postgres' ]; then
 		EOSQL
 		echo
 
+		# Initialize the passport and controller databases
+		psql --username postgres <<-EOSQL
+			CREATE DATABASE passport;
+			CREATE DATABASE controller;
+		EOSQL
 		echo
+
 		for f in /docker-entrypoint-initdb.d/*; do
 			case "$f" in
 				*.sh)  echo "$0: running $f"; . "$f" ;;