[DSD-6445] (#974)

* [DSD-6445 updated the readme n install script] Signed-off-by: techno-376 <[email protected]> * [DSD-6445] Signed-off-by: techno-376 <[email protected]> * [DSD-6445] Signed-off-by: techno-376 <[email protected]> * Update install-prereq.sh Signed-off-by: Rakshitha650 <[email protected]> * Update install.sh Signed-off-by: Rakshitha650 <[email protected]> --------- Signed-off-by: techno-376 <[email protected]> Signed-off-by: Rakshitha650 <[email protected]> Co-authored-by: techno-376 <[email protected]> Co-authored-by: Rakshitha650 <[email protected]>
mosip · Oct 23, 2024 · dbeb9d7 · dbeb9d7
1 parent 0c670bf
commit dbeb9d7
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 3 deletions.
diff --git a/deploy/README.md b/deploy/README.md
@@ -33,6 +33,7 @@
   ```
 ### Initialise pre-requisites
 * Update values file for postgres init [here](postgres/init_values.yaml).
+* Create a google recaptcha v2 ("I am not a Robot") from Google with required domain name ex:[sandbox.mosip.net] [Recaptcha Admin](https://www.google.com/recaptcha/about/).
 * Execute `initialise-prereq.sh` script to initialise postgres and keycloak and set esignet captcha.
   ```
   ./initialise-prereq.sh

diff --git a/deploy/captcha/install.sh b/deploy/captcha/install.sh
@@ -50,6 +50,19 @@ function installing_captcha() {
   helm -n $NS install captcha mosip/captcha --version $CHART_VERSION --set metrics.serviceMonitor.enabled=$servicemonitorflag --wait
 
   echo Installed captcha service
+      # Check if the second environment variable exists
+  ENV_VAR_EXISTS=$(kubectl -n captcha get deployment captcha -o jsonpath="{.spec.template.spec.containers[0].env[?(@.name=='MOSIP_CAPTCHA_SECRET_ESIGNET')].name}")
+
+  if [[ -z "$ENV_VAR_EXISTS" ]]; then
+      # If the environment variable does not exist, add it
+      echo "Environment variable 'MOSIP_CAPTCHA_SECRET_ESIGNET' does not exist. Adding it..."
+      kubectl patch deployment -n captcha captcha --type='json' -p='[{"op": "add", "path": "/spec/template/spec/containers/0/env/-", "value": {"name": "MOSIP_CAPTCHA_SECRET_ESIGNET", "valueFrom": {"secretKeyRef": {"name": "esignet-captcha", "key": "esignet-captcha-secret-key"}}}}]'
+  else
+      # If the environment variable exists, update it
+      echo "Environment variable 'MOSIP_CAPTCHA_SECRET_ESIGNET' exists. Updating it..."
+      kubectl patch deployment -n captcha captcha --type='json' -p='[{"op": "replace", "path": "/spec/template/spec/containers/0/env[?(@.name==\"MOSIP_CAPTCHA_SECRET_ESIGNET\")]", "value": {"name": "MOSIP_CAPTCHA_SECRET_ESIGNET", "valueFrom": {"secretKeyRef": {"name": "esignet-captcha", "key": "esignet-captcha-secret-key"}}}}]'
+  fi
+
   return 0
 }
 

diff --git a/deploy/initialise-prereq.sh b/deploy/initialise-prereq.sh
@@ -57,6 +57,8 @@ while true; do
       kubectl -n $NS create secret generic esignet-captcha --from-literal=esignet-captcha-site-key=$ESITE_KEY --from-literal=esignet-captcha-secret-key=$ESECRET_KEY --dry-run=client -o yaml | kubectl apply -f -
       echo "Captcha secrets for esignet configured sucessfully"
 
+      kubectl create ns captcha || true
+
       ./copy_cm_func.sh secret esignet-captcha $NS captcha
 
       # Check if the second environment variable exists

diff --git a/deploy/install-prereq.sh b/deploy/install-prereq.sh
@@ -8,6 +8,7 @@ if [ $# -ge 1 ]; then
 fi
 
 ROOT_DIR=$(pwd)
+kubectl create ns esignet || true
 
 function prompt_for_deployment() {
   local module_name=$1

diff --git a/deploy/keycloak/install.sh b/deploy/keycloak/install.sh
@@ -17,6 +17,7 @@ function installing_keycloak() {
   ## TODO: enable istio injection after testing well.
   kubectl label ns $NS istio-injection=disabled --overwrite
   helm repo add bitnami https://charts.bitnami.com/bitnami
+  helm repo add mosip https://mosip.github.io/mosip-helm
   helm repo update
 
   echo Installing

diff --git a/deploy/oidc-ui/install.sh b/deploy/oidc-ui/install.sh
@@ -23,7 +23,7 @@ function installing_oidc-ui() {
   CHART_VERSION=1.5.0-develop
 
   echo Create $NS namespace
-  kubectl create ns $NS
+  kubectl create ns $NS || true
 
   echo Istio label
   kubectl label ns $NS istio-injection=enabled --overwrite

diff --git a/deploy/softhsm/install.sh b/deploy/softhsm/install.sh
@@ -6,8 +6,8 @@ if [ $# -ge 1 ] ; then
   export KUBECONFIG=$1
 fi
 
-NS=softhsm
-CHART_VERSION=12.0.1
+SOFTHSM_NS=softhsm
+SOFTHSM_CHART_VERSION=12.0.1
 
 function installing_softhsm() {
   echo Create $NS namespaces