Bump ejs from 3.1.9 to 3.1.10 in /inji-web

README.md

@@ -52,4 +52,3 @@ $ docker run -it -d -p 3000:3000 <dockerImageName>:<tag>
 ```
 
 - Open URL http://localhost:3000
-

helm/inji-web/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v2
-name: inji-web
+name: injiweb
 description: A Helm chart for MOSIP injiweb UI module
 type: application
-version: 1.0.0
+version: 0.8.0
 appVersion: ""
 dependencies:
   - name: common

helm/inji-web/copy_cm.sh

@@ -4,12 +4,12 @@
 
 function copying_cm() {
   COPY_UTIL=./copy_cm_func.sh
-  DST_NS=esignet
+  DST_NS=inijiweb
 
   $COPY_UTIL configmap global default $DST_NS
   $COPY_UTIL configmap artifactory-share artifactory $DST_NS
   $COPY_UTIL configmap config-server-share config-server $DST_NS
-  $COPY_UTIL configmap softhsm-esignet-share softhsm $DST_NS
+ # $COPY_UTIL configmap softhsm-esignet-share softhsm $DST_NS
   return 0
 }
 

helm/inji-web/delete.sh

@@ -1,18 +1,18 @@
 #!/bin/bash
-# Uninstalls injiweb-ui helm charts
+# Uninstalls injiweb helm charts
 ## Usage: ./delete.sh [kubeconfig]
 
 if [ $# -ge 1 ] ; then
   export KUBECONFIG=$1
 fi
 
 function Deleting_injiweb-ui() {
-  NS=esignet
+  NS=injiweb
   while true; do
-      read -p "Are you sure you want to delete all esignet helm charts?(Y/n) " yn
+      read -p "Are you sure you want to delete all injiweb helm charts?(Y/n) " yn
       if [ $yn = "Y" ]
         then
-          helm -n $NS delete injiweb-ui
+          helm -n $NS delete injiweb
           break
         else
           break

helm/inji-web/install.sh

@@ -6,8 +6,38 @@ if [ $# -ge 1 ] ; then
   export KUBECONFIG=$1
 fi
 
-NS=esignet
-CHART_VERSION=1.0.0
+NS=injiweb
+CHART_VERSION=0.8.0
+
+DEFAULT_MOSIP_INJIWEB_HOST=$( kubectl get cm global -n config-server -o jsonpath={.data.mosip-injiweb-host} )
+# Check if MOSIP_INJIWEB_HOST is present under configmap/global of configserver
+if echo "$DEFAULT_MOSIP_INJIWEB_HOST" | grep -q "MOSIP_INJIWEB_HOST"; then
+    echo "MOSIP_INJIWEB_HOST is already present in configmap/global of configserver"
+    MOSIP_INJIWEB_HOST=DEFAULT_MOSIP_INJIWEB_HOST
+else
+    read -p "Please provide injiwebhost (eg: injiweb.sandbox.xyz.net ) : " MOSIP_INJIWEB_HOST
+
+    if [ -z "MOSIP_INJIWEB_HOST" ]; then
+    echo "INJIWEB Host not provided; EXITING;"
+    exit 0;
+    fi
+fi
+
+CHK_MOSIP_INJIWEB_HOST=$( nslookup "$MOSIP_INJIWEB_HOST" )
+if [ $? -gt 0 ]; then
+    echo "Injiweb Host does not exists; EXITING;"
+    exit 0;
+fi
+
+echo "MOSIP_INJIWEB_HOST is not present in configmap/global of configserver"
+    # Add injiweb host to global
+    kubectl patch configmap global -n config-server --type merge -p "{\"data\": {\"mosip-injiweb-host\": \"$MOSIP_INIEB_HOST\"}}"
+    # Add the host
+    kubectl set env deployment/config-server SPRING_CLOUD_CONFIG_SERVER_OVERRIDES_MOSIP_ESIGNET_INJIWEB_HOST=$MOSIP_INJIWEB_HOST -n config-server
+    # Restart the configserver deployment
+    kubectl -n config-server get deploy -o name | xargs -n1 -t kubectl -n config-server rollout restart
+
+sleep 400s
 
 echo Create $NS namespace
 kubectl create ns $NS
@@ -20,18 +50,16 @@ function installing_inji-web() {
   helm repo update
 
   echo Copy configmaps
- # ./copy_cm.sh
+  ./copy_cm.sh
 
-  ESIGNET_HOST=$(kubectl get cm global -o jsonpath={.data.mosip-esignet-host})
   INJI_HOST=$(kubectl get cm global -o jsonpath={.data.mosip-injiweb-host})
   echo Installing INJIWEB
-  helm -n $NS install inji-web mosip/inji-web \
+  helm -n $NS install injiweb mosip/inji-web \
   -f values.yaml \
-  --set esignet_redirect_url=$ESIGNET_HOST \
   --set istio.hosts\[0\]=$INJI_HOST \
   --version $CHART_VERSION
 
-#  kubectl -n $NS  get deploy -o name |  xargs -n1 -t  kubectl -n $NS rollout status
+  kubectl -n $NS  get deploy -o name |  xargs -n1 -t  kubectl -n $NS rollout status
 
   echo Installed inji-web
   return 0

helm/inji-web/restart.sh

@@ -7,7 +7,7 @@ if [ $# -ge 1 ] ; then
 fi
 
 function Restarting_oidc-ui() {
-  NS=esignet
+  NS=injiweb
   kubectl -n $NS rollout restart deploy oidc-ui
 
   kubectl -n $NS  get deploy -o name |  xargs -n1 -t  kubectl -n $NS rollout status

helm/inji-web/values.yaml

@@ -51,8 +51,8 @@ service:
 
 image:
   registry: docker.io
-  repository: mosipdev/inji-web
-  tag: develop
+  repository: mosipid/inji-web
+  tag: 0.8.0
 
   ## Specify a imagePullPolicy
   ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
@@ -248,8 +248,8 @@ extraEnvVarsCM:
   - global
   - config-server-share
   - artifactory-share
-  - softhsm-esignet-share
-  - oidc-ui
+ # - softhsm-esignet-share
+
 
 ## Secret with extra environment variables
 ##
@@ -433,5 +433,5 @@ istio:
       portName: http
       port: 80
   hosts:
-    - inji.sandbox.xyz.net
+    - injiweb.sandbox.xyz.net
   prefix: /