From ffbc4e4dea30acc1a425dcdb12a8b02fe488a9d8 Mon Sep 17 00:00:00 2001
From: Mohan E <mohanraj1715@gmail.com>
Date: Wed, 27 Dec 2023 12:49:35 +0530
Subject: [PATCH] [ DSD-3698 ] Removed esignet-softhsm from install-all.sh...
 (#522)

* [ DSD-3698 ] Removed esignet-softhsm from install-all.sh...

Signed-off-by: Mohanraj209 <mohanraj1715@gmail.com>

* [ MOSIP-29961 ] Removed path from db-test.yaml file..

Signed-off-by: Mohan E <mohanraj1715@gmail.com>

---------

Signed-off-by: Mohanraj209 <mohanraj1715@gmail.com>
Signed-off-by: Mohan E <mohanraj1715@gmail.com>
Signed-off-by: ase-101 <sunkadaeanusha@gmail.com>
---
 .github/workflows/db-test.yml |  2 --
 helm/esignet/install.sh       | 25 +++++++++++++++++++++++++
 helm/install-all.sh           | 25 +------------------------
 3 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/db-test.yml b/.github/workflows/db-test.yml
index 42f24166e..3636fe489 100644
--- a/.github/workflows/db-test.yml
+++ b/.github/workflows/db-test.yml
@@ -5,8 +5,6 @@ on:
     types: [published]
   pull_request:
     types: [opened, reopened, synchronize]
-    paths:
-      - 'db_scripts/**'
   workflow_dispatch:
     inputs:
       message:
diff --git a/helm/esignet/install.sh b/helm/esignet/install.sh
index 39815c9e4..7766c11c2 100755
--- a/helm/esignet/install.sh
+++ b/helm/esignet/install.sh
@@ -6,6 +6,12 @@ if [ $# -ge 1 ] ; then
   export KUBECONFIG=$1
 fi
 
+SOFTHSM_NS=softhsm
+SOFTHSM_CHART_VERSION=12.0.2
+
+echo Create $SOFTHSM_NS namespace
+kubectl create ns $SOFTHSM_NS
+
 NS=esignet
 CHART_VERSION=1.2.0
 
@@ -15,8 +21,27 @@ echo Create $NS namespace
 kubectl create ns $NS
 
 function installing_esignet() {
+
+  echo Istio label
+  kubectl label ns $SOFTHSM_NS istio-injection=enabled --overwrite
+  helm repo add mosip https://mosip.github.io/mosip-helm
   helm repo update
 
+  echo Installing Softhsm for esignet
+  helm -n $SOFTHSM_NS install softhsm-esignet mosip/softhsm -f softhsm-values.yaml --version $SOFTHSM_CHART_VERSION --wait
+  echo Installed Softhsm for esignet
+
+  echo Copy configmaps
+  ./copy_cm_func.sh configmap global default config-server
+
+  echo Copy secrets
+  ./copy_cm_func.sh secret softhsm-esignet softhsm config-server
+
+  kubectl -n config-server set env --keys=mosip-esignet-host --from configmap/global deployment/config-server --prefix=SPRING_CLOUD_CONFIG_SERVER_OVERRIDES_
+  kubectl -n config-server set env --keys=security-pin --from secret/softhsm-esignet deployment/config-server --prefix=SPRING_CLOUD_CONFIG_SERVER_OVERRIDES_SOFTHSM_ESIGNET_
+  kubectl -n config-server rollout restart deploy config-server
+  kubectl -n config-server get deploy -o name |  xargs -n1 -t  kubectl -n config-server rollout status
+
   ./keycloak-init.sh
 
   echo Please enter the recaptcha admin site key for domain $ESIGNET_HOST
diff --git a/helm/install-all.sh b/helm/install-all.sh
index 17937a226..53e662005 100755
--- a/helm/install-all.sh
+++ b/helm/install-all.sh
@@ -9,34 +9,11 @@ fi
 
 ROOT_DIR=`pwd`
 
-SOFTHSM_NS=softhsm
-SOFTHSM_CHART_VERSION=12.0.2
-
-echo Create $SOFTHSM_NS namespace
-kubectl create ns $SOFTHSM_NS
-
 function installing_All() {
-  echo Istio label
-  kubectl label ns $SOFTHSM_NS istio-injection=enabled --overwrite
+
   helm repo add mosip https://mosip.github.io/mosip-helm
   helm repo update
 
-  echo Installing Softhsm for esignet
-  helm -n $SOFTHSM_NS install softhsm-esignet mosip/softhsm -f softhsm-values.yaml --version $SOFTHSM_CHART_VERSION --wait
-  echo Installed Softhsm for esignet
-
-  echo Copy configmaps
-  ./copy_cm_func.sh configmap global default config-server
-
-  echo Copy secrets
-  ./copy_cm_func.sh secret softhsm-esignet softhsm config-server
-
-  kubectl -n config-server set env --keys=mosip-esignet-host --from configmap/global deployment/config-server --prefix=SPRING_CLOUD_CONFIG_SERVER_OVERRIDES_
-  kubectl -n config-server set env --keys=security-pin --from secret/softhsm-esignet deployment/config-server --prefix=SPRING_CLOUD_CONFIG_SERVER_OVERRIDES_SOFTHSM_ESIGNET_
-  kubectl -n config-server rollout restart deploy config-server
-  kubectl -n config-server get deploy -o name |  xargs -n1 -t  kubectl -n config-server rollout status
-
-
   declare -a module=("redis"
                      "esignet"
                  "oidc-ui"