From 6d1319c2af5b914fdb02141ff495de3f7e1babde Mon Sep 17 00:00:00 2001 From: Om Mishra <32200996+mishraomp@users.noreply.github.com> Date: Wed, 6 Dec 2023 11:28:24 -0800 Subject: [PATCH] Add more DB (#20) and update metabase version --- charts/nr-metabase/Chart.yaml | 4 ++-- charts/nr-metabase/values.yaml | 4 ++-- metabase/run_app.sh | 9 +++++++-- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/charts/nr-metabase/Chart.yaml b/charts/nr-metabase/Chart.yaml index e8d1953..2e2f0d9 100644 --- a/charts/nr-metabase/Chart.yaml +++ b/charts/nr-metabase/Chart.yaml @@ -13,12 +13,12 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.47.4 +version: 0.47.9 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "v0.47.4" # aligned with metabase version. +appVersion: "v0.47.9" # aligned with metabase version. dependencies: - name: metabase condition: metabase.enabled diff --git a/charts/nr-metabase/values.yaml b/charts/nr-metabase/values.yaml index 5ff605e..f575e2c 100644 --- a/charts/nr-metabase/values.yaml +++ b/charts/nr-metabase/values.yaml @@ -49,10 +49,10 @@ database: nameOverride: "" fullnameOverride: "" image: - repository: ghcr.io/bcgov/quickstart-openshift/database + repository: ghcr.io/bcgov/nr-containers/postgres pullPolicy: Always # Overrides the image tag whose default is the chart appVersion. - tag: 'prod' + tag: '15.5' podAnnotations: {} podSecurityContext: {} securityContext: {} diff --git a/metabase/run_app.sh b/metabase/run_app.sh index 8de45df..3eb4909 100644 --- a/metabase/run_app.sh +++ b/metabase/run_app.sh @@ -1,8 +1,13 @@ #!/bin/bash -DB_HOST_PORT_LIST=nrcdb01.bcgov:1543,nrcdb03.bcgov:1543,nrkdb01.bcgov:1543,nrkdb03.bcgov:1543 +DB_HOST_PORT_ENV=${DB_HOST_PORT_ENV} +echo "DB_HOST_PORT_ENV is $DB_HOST_PORT_ENV" +if [ -z "$DB_HOST_PORT_ENV" ]; then + DB_HOST_PORT_ENV=nrcdb01.bcgov:1543,nrcdb03.bcgov:1543,nrkdb01.bcgov:1543,nrkdb03.bcgov:1543,nrcdb02.bcgov:1543,nrkdb02.bcgov:1543 +fi +echo "DB_HOST_PORT_ENV is $DB_HOST_PORT_ENV" echo "Adding certs" IFS=',' - read -ra DB_HOST_PORT_ARRAY <<< "${DB_HOST_PORT_LIST}" + read -ra DB_HOST_PORT_ARRAY <<< "${DB_HOST_PORT_ENV}" for DB_HOST_PORT in "${DB_HOST_PORT_ARRAY[@]}"; do IFS=':' read -ra strarr <<<"${DB_HOST_PORT}"