Skip to content

Commit

Permalink
Merge pull request #13 from abhishek8shankar/develop
Browse files Browse the repository at this point in the history
[DSD-5029] Updated install scripts
  • Loading branch information
challabeehyv authored Apr 19, 2024
2 parents 4328463 + 4add7dc commit 5a0b915
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 26 deletions.
6 changes: 3 additions & 3 deletions helm/inji-verify/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: v2
name: inji-verify
description: A Helm chart for MOSIP injiweb UI module
name: injiverify
description: A Helm chart for MOSIP injiverify module
type: application
version: 1.0.0
version: 0.0.1-develop
appVersion: ""
dependencies:
- name: common
Expand Down
2 changes: 1 addition & 1 deletion helm/inji-verify/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# injiweb ui
# injiverify

## Overview
Refer [Commons](https://docs.mosip.io/1.2.0/modules/commons).
Expand Down
2 changes: 1 addition & 1 deletion helm/inji-verify/copy_cm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

function copying_cm() {
COPY_UTIL=./copy_cm_func.sh
DST_NS=esignet
DST_NS=injiverify

$COPY_UTIL configmap global default $DST_NS
$COPY_UTIL configmap artifactory-share artifactory $DST_NS
Expand Down
6 changes: 3 additions & 3 deletions helm/inji-verify/delete.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ if [ $# -ge 1 ] ; then
export KUBECONFIG=$1
fi

function Deleting_injiverify-ui() {
NS=esignet
function Deleting_injiverify() {
NS=injiverify
while true; do
read -p "Are you sure you want to delete all esignet helm charts?(Y/n) " yn
if [ $yn = "Y" ]
then
helm -n $NS delete injiverify-ui
helm -n $NS delete injiverify
break
else
break
Expand Down
13 changes: 6 additions & 7 deletions helm/inji-verify/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ if [ $# -ge 1 ] ; then
export KUBECONFIG=$1
fi

NS=esignet
CHART_VERSION=1.0.0
NS=injiverify
CHART_VERSION=0.0.1-develop

echo Create $NS namespace
kubectl create ns $NS
Expand All @@ -20,18 +20,17 @@ function installing_inji-verify() {
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})
INJI_HOST=$(kubectl get cm global -o jsonpath={.data.mosip-injiverify-host})
echo Installing INJIWEB
helm -n $NS install inji-verify mosip/inji-verify \
-f values.yaml \
--set esignet_redirect_url=$ESIGNET_HOST \
--set istio.hosts\[0\]=$INJI_HOST \
--set istio.hosts\[0\]=$INJIVERIFY_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-verify
return 0
Expand Down
5 changes: 2 additions & 3 deletions helm/inji-verify/restart.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,11 @@ if [ $# -ge 1 ] ; then
fi

function Restarting_oidc-ui() {
NS=esignet
kubectl -n $NS rollout restart deploy oidc-ui
NS=injiverify

kubectl -n $NS get deploy -o name | xargs -n1 -t kubectl -n $NS rollout status

echo Retarted esignet services
echo Retarted injiverify services
return 0
}

Expand Down
9 changes: 1 addition & 8 deletions helm/inji-verify/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -416,13 +416,6 @@ metrics:

## The url below is to access esignet API services.
## CAUTION: Domain name to access injiweb UI must be secure/internal/over vpn.
## Slash is important!
inji_web:
inji_web_port: '3004'
inji_web_service_host: 'mimoto.mimoto'
esignet_redirect_url: 'esignet.sandbox.xyz.net'
## injiweb UI swagger should have only internal access. Hence linked to internal gateway
## We create a gateway for esignet specific URL(s) listed under `hosts`
istio:
enabled: true
ingressController:
Expand All @@ -433,5 +426,5 @@ istio:
portName: http
port: 80
hosts:
- inji.sandbox.xyz.net
- injiverify.sandbox.xyz.net
prefix: /

0 comments on commit 5a0b915

Please sign in to comment.