[POLICY] Allow to override username and password from env 19/104819/1
authorKrzysztof Opasiak <k.opasiak@samsung.com>
Tue, 31 Mar 2020 20:56:00 +0000 (22:56 +0200)
committerKrzysztof Opasiak <k.opasiak@samsung.com>
Wed, 1 Apr 2020 00:06:49 +0000 (02:06 +0200)
To avoid hardcoding password in base.conf let's allow to override DB
username and password from the environment variable.

Issue-ID: OOM-2342
Signed-off-by: Krzysztof Opasiak <k.opasiak@samsung.com>
Change-Id: I9fc9506b3908da06d0ad221f63d0a56c783788db

kubernetes/policy/charts/policy-common/resources/config/scripts/do-start.sh

index 052b6f2..0e47310 100644 (file)
@@ -78,8 +78,17 @@ else
                # wait for DB up
                # now that DB is up, invoke database upgrade
                # (which does nothing if the db is already up-to-date)
-               dbuser=$(echo $(grep '^JDBC_USER=' base.conf | cut -f2 -d=))
-               dbpw=$(echo $(grep '^JDBC_PASSWORD=' base.conf | cut -f2 -d=))
+               if [[ -v JDBC_USER ]]; then
+                       dbuser=${JDBC_USER};
+               else
+                       dbuser=$(echo $(grep '^JDBC_USER=' base.conf | cut -f2 -d=))
+               fi
+
+               if [[ -v JDBC_PASSWORD ]]; then
+                       dbpw=${JDBC_PASSWORD}
+               else
+                       dbpw=$(echo $(grep '^JDBC_PASSWORD=' base.conf | cut -f2 -d=))
+               fi
                db_upgrade_remote.sh $dbuser $dbpw {{.Values.global.mariadb.service.name}}
        fi