Skip to content

Commit

Permalink
Merge pull request #104 from Prafulrakhade/release-0.9.x
Browse files Browse the repository at this point in the history
[DSD-5615] & [MOSIP-34144] updated release changes and inji-config changes
  • Loading branch information
ckm007 authored Jun 28, 2024
2 parents d652f52 + 118f3aa commit 512de5e
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion helm/inji-web/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: injiweb
description: A Helm chart for MOSIP injiweb UI module
type: application
version: 0.0.1-develop
version: 0.9.0
appVersion: ""
dependencies:
- name: common
Expand Down
2 changes: 1 addition & 1 deletion helm/inji-web/copy_cm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ function copying_cm() {

$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 inji-config-server-share config-server $DST_NS
#$COPY_UTIL configmap softhsm-esignet-share softhsm $DST_NS
return 0
}
Expand Down
4 changes: 2 additions & 2 deletions helm/inji-web/delete.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ if [ $# -ge 1 ] ; then
export KUBECONFIG=$1
fi

function Deleting_injiweb-ui() {
function Deleting_injiweb() {
NS=injiweb
while true; do
read -p "Are you sure you want to delete all esignet helm charts?(Y/n) " yn
Expand All @@ -27,4 +27,4 @@ set -o errexit ## set -e : exit the script if any statement returns a non-true
set -o nounset ## set -u : exit the script if you try to use an uninitialised variable
set -o errtrace # trace ERR through 'time command' and other functions
set -o pipefail # trace ERR through pipes
Deleting_injiweb-ui # calling function
Deleting_injiweb # calling function
6 changes: 3 additions & 3 deletions helm/inji-web/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ if [ $# -ge 1 ] ; then
fi

NS=injiweb
CHART_VERSION=0.0.1-develop
CHART_VERSION=0.9.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
Expand All @@ -34,9 +34,9 @@ echo "MOSIP_INJIWEB_HOST is not present in configmap/global of configserver"
kubectl patch configmap global -n config-server --type merge -p "{\"data\": {\"mosip-injiweb-host\": \"$MOSIP_INJIWEBB_HOST\"}}"
kubectl patch configmap global -n default --type merge -p "{\"data\": {\"mosip-injiweb-host\": \"$MOSIP_INJIWEBB_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
kubectl set env deployment/inji-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 status
kubectl -n config-server get deploy -o name | xargs -n1 -t kubectl -n config-server rollout status

sleep 400s

Expand Down
8 changes: 4 additions & 4 deletions helm/inji-web/restart.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 Restarting_oidc-ui() {
function Restarting_injiweb() {
NS=injiweb
kubectl -n $NS rollout restart deploy oidc-ui
kubectl -n $NS rollout restart deploy injiweb

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

echo Retarted esignet services
echo Retarted injiweb services
return 0
}

Expand All @@ -22,4 +22,4 @@ set -o errexit ## set -e : exit the script if any statement returns a non-true
set -o nounset ## set -u : exit the script if you try to use an uninitialised variable
set -o errtrace # trace ERR through 'time command' and other functions
set -o pipefail # trace ERR through pipes
Restarting_oidc-ui # calling function
Restarting_injiweb # calling function
8 changes: 4 additions & 4 deletions helm/inji-web/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ service:

image:
registry: docker.io
repository: mosipdev/inji-web
tag: develop
repository: mosipid/inji-web
tag: 0.9.0

## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
Expand Down Expand Up @@ -246,10 +246,10 @@ extraEnvVars: []
##
extraEnvVarsCM:
- global
- config-server-share
- inji-config-server-share
- artifactory-share
- injiweb-ui
#- softhsm-esignet-share
# - softhsm-esignet-share

## Secret with extra environment variables
##
Expand Down

0 comments on commit 512de5e

Please sign in to comment.