From 2ca4f44bdd3e0c4835d3ba4f72d23aaa6ba52040 Mon Sep 17 00:00:00 2001
From: OMPRAKASH MISHRA <omprakashmishra3978@gmail.com>
Date: Fri, 13 Oct 2023 14:04:29 -0700
Subject: [PATCH] trying out CMAN.

---
 .../charts/metabase/templates/deployment.yaml |  3 +++
 charts/nr-metabase/values.yaml                |  1 +
 metabase/Dockerfile                           |  2 +-
 metabase/run_app.sh                           | 21 +++----------------
 4 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/charts/nr-metabase/charts/metabase/templates/deployment.yaml b/charts/nr-metabase/charts/metabase/templates/deployment.yaml
index 764ee50..6bd8708 100644
--- a/charts/nr-metabase/charts/metabase/templates/deployment.yaml
+++ b/charts/nr-metabase/charts/metabase/templates/deployment.yaml
@@ -63,6 +63,9 @@ spec:
               value: 0.0.0.0
             - name: MB_PASSWORD_COMPLEXITY
               value: strong
+          envFrom:
+            - configMapRef:
+                name: {{ .Release.Name }}-{{ .Values.global.zone }}
           ports:
             - name: http
               containerPort: {{ .Values.service.targetPort }}
diff --git a/charts/nr-metabase/values.yaml b/charts/nr-metabase/values.yaml
index 5ff605e..38d1568 100644
--- a/charts/nr-metabase/values.yaml
+++ b/charts/nr-metabase/values.yaml
@@ -23,6 +23,7 @@ metabase:
     tag: 'v0.47.2'
   containerPort: 3000
   environment: production
+
   service:
     type: ClusterIP
     port: 80
diff --git a/metabase/Dockerfile b/metabase/Dockerfile
index 1c30f74..f52aa04 100644
--- a/metabase/Dockerfile
+++ b/metabase/Dockerfile
@@ -2,7 +2,7 @@
 FROM docker.io/openjdk:21-jdk-slim-bullseye
 WORKDIR /app
 COPY ojdbc8-full /app/plugins/
-ARG METABASE_VERSION
+ARG METABASE_VERSION=v0.47.2
 ENV METABASE_VER=$METABASE_VERSION
 ENV FC_LANG=en-US \
   LC_CTYPE=en_US.UTF-8
diff --git a/metabase/run_app.sh b/metabase/run_app.sh
index 8de45df..c291213 100644
--- a/metabase/run_app.sh
+++ b/metabase/run_app.sh
@@ -1,21 +1,6 @@
 #!/bin/bash
-DB_HOST_PORT_LIST=nrcdb01.bcgov:1543,nrcdb03.bcgov:1543,nrkdb01.bcgov:1543,nrkdb03.bcgov:1543
-echo "Adding certs"
-  IFS=','
-  read -ra DB_HOST_PORT_ARRAY <<< "${DB_HOST_PORT_LIST}"
-  for DB_HOST_PORT in "${DB_HOST_PORT_ARRAY[@]}"; do
-    IFS=':'
-    read -ra strarr <<<"${DB_HOST_PORT}"
-    DB_HOST="${strarr[0]}"
-    echo "DB_HOST is $DB_HOST"
-    DB_PORT="${strarr[1]}"
-    echo "DB_PORT is $DB_PORT"
-    echo "I will try to get the ${DB_HOST}-1 cert"
-    echo "Connecting to ${DB_HOST}:${DB_PORT}"
-    java InstallCert --quiet "${DB_HOST}:${DB_PORT}"
-    keytool -exportcert -alias "$DB_HOST-1" -keystore jssecacerts -storepass changeit -file /opt/"$DB_HOST-1.cer"
-    keytool -importcert -alias "orakey-$DB_HOST-1" -noprompt -keystore "${JAVA_HOME}"/lib/security/cacerts -storepass changeit -file /opt/"$DB_HOST-1.cer"
-  done
-
+echo "$CMAN_CERT"
+echo "$CMAN_CERT" >> /opt/cman.crt
+keytool -import -alias "cman-certs"  -keystore "${JAVA_HOME}"/lib/security/cacerts -file /opt/cman.crt -storepass changeit  -noprompt || exit 1
 echo "Starting Metabase"
 java -jar metabase.jar