feat: add postgres option (#6557)

* feat: add postgres option Signed-off-by: Amro Misbah <amromisba7@gmail.com> * feat: allow postgres option Signed-off-by: Amro Misbah <amromisba7@gmail.com> --------- Signed-off-by: Amro Misbah <amromisba7@gmail.com>
JanssenProject · Nov 16, 2023 · ed47585 · ed47585
1 parent 1b2fa6f
commit ed47585
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 6 deletions.
diff --git a/automation/startjanssendemo.sh b/automation/startjanssendemo.sh
@@ -14,10 +14,10 @@ if ! [[ $JANS_FQDN == *"."*"."* ]]; then
   exit 1
 fi
 if [[ ! "$JANS_PERSISTENCE" ]]; then
-  read -rp "Enter persistence type [LDAP|MYSQL]:                            " JANS_PERSISTENCE
+  read -rp "Enter persistence type [LDAP|MYSQL|PGSQL]:                            " JANS_PERSISTENCE
 fi
-if [[ $JANS_PERSISTENCE != "LDAP" ]] && [[ $JANS_PERSISTENCE != "MYSQL" ]]; then
-  echo "[E] Incorrect entry. Please enter either LDAP or MYSQL"
+if [[ $JANS_PERSISTENCE != "LDAP" ]] && [[ $JANS_PERSISTENCE != "MYSQL" ]] && [[ $JANS_PERSISTENCE != "PGSQL" ]]; then
+  echo "[E] Incorrect entry. Please enter either LDAP, MYSQL or PGSQL"
   exit 1
 fi
 
@@ -72,9 +72,8 @@ fi
 
 PERSISTENCE_TYPE="sql"
 if [[ $JANS_PERSISTENCE == "MYSQL" ]]; then
-  sudo helm repo add bitnami https://charts.bitnami.com/bitnami
   sudo microk8s.kubectl get po --kubeconfig="$KUBECONFIG"
-  sudo helm install my-release --set auth.rootPassword=Test1234#,auth.database=jans bitnami/mysql -n jans --kubeconfig="$KUBECONFIG"
+  sudo helm install my-release --set auth.rootPassword=Test1234#,auth.database=jans -n jans oci://registry-1.docker.io/bitnamicharts/mysql --kubeconfig="$KUBECONFIG"
   cat << EOF > override.yaml
 config:
   countryCode: US
@@ -92,6 +91,26 @@ config:
 EOF
 fi
 
+if [[ $JANS_PERSISTENCE == "PGSQL" ]]; then
+  sudo microk8s.kubectl get po --kubeconfig="$KUBECONFIG"
+  sudo helm install my-release --set auth.postgresPassword=Test1234#,auth.database=jans -n jans oci://registry-1.docker.io/bitnamicharts/postgresql --kubeconfig="$KUBECONFIG"
+  cat << EOF > override.yaml
+config:
+  countryCode: US
+  email: support@gluu.org
+  orgName: Gluu
+  city: Austin
+  configmap:
+    cnSqlDbName: jans
+    cnSqlDbPort: 5432
+    cnSqlDbDialect: pgsql
+    cnSqlDbHost: my-release-postgresql.jans.svc
+    cnSqlDbUser: postgres
+    cnSqlDbTimezone: UTC
+    cnSqldbUserPassword: Test1234#
+EOF
+fi
+
 ENABLE_LDAP="false"
 if [[ $JANS_PERSISTENCE == "LDAP" ]]; then
   openssl req \

diff --git a/charts/janssen/values.schema.json b/charts/janssen/values.schema.json
@@ -44,7 +44,7 @@
             "cnSqlDbDialect": {
               "description": "SQL dialect",
               "type": "string",
-              "pattern": "^(mysql)$"
+              "pattern": "^(mysql|pgsql)$"
             },
             "cnSqlDbHost": {
               "description": "SQL server address or ip",