diff --git a/README.md b/README.md index 0ac10814b..5c91d23d1 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Maven Package upon a push](https://github.com/mosip/mimoto/actions/workflows/push-trigger.yml/badge.svg?branch=master)](https://github.com/mosip/mimoto/actions/workflows/push-trigger.yml) +[![Maven Package upon a push](https://github.com/mosip/mimoto/actions/workflows/push-trigger.yml/badge.svg?branch=release-0.19.x)](https://github.com/mosip/mimoto/actions/workflows/push-trigger.yml) [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=mosip_mimoto&id=mosip_mimoto&metric=alert_status)](https://sonarcloud.io/project/overview?id=mosip_mimoto) # mimoto diff --git a/api-test/pom.xml b/api-test/pom.xml index 22bb731ba..fa8a6bdac 100644 --- a/api-test/pom.xml +++ b/api-test/pom.xml @@ -8,7 +8,7 @@ apitest-mimoto Parent project of apitest-mimoto https://github.com/mosip/mimoto - 0.19.0 + 0.19.1 diff --git a/db_scripts/init_values.yaml b/db_scripts/init_values.yaml index 89ba365d1..04eaf79c3 100644 --- a/db_scripts/init_values.yaml +++ b/db_scripts/init_values.yaml @@ -12,4 +12,4 @@ databases: name: postgres-postgresql key: postgres-password dml: 1 - branch: v0.19.0 \ No newline at end of file + branch: v0.19.1 diff --git a/db_upgrade_script/inji_mimoto/sql/0.19.0_to_0.19.1_rollback.sql b/db_upgrade_script/inji_mimoto/sql/0.19.0_to_0.19.1_rollback.sql new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/db_upgrade_script/inji_mimoto/sql/0.19.0_to_0.19.1_rollback.sql @@ -0,0 +1 @@ + diff --git a/db_upgrade_script/inji_mimoto/sql/0.19.0_to_0.19.1_upgrade.sql b/db_upgrade_script/inji_mimoto/sql/0.19.0_to_0.19.1_upgrade.sql new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/db_upgrade_script/inji_mimoto/sql/0.19.0_to_0.19.1_upgrade.sql @@ -0,0 +1 @@ + diff --git a/deploy/README.md b/deploy/README.md index 60162b945..2e37f85c7 100644 --- a/deploy/README.md +++ b/deploy/README.md @@ -38,9 +38,12 @@ cd ../partner-onboarder * Once the job is completed, log in to S3 / NFS and check the reports. There should not be any failures. * Note: If you are running the Onboarder in a separate INJI cluster, update the extraEnvVars section accordingly in [values.yaml](../partner-onboarder/values.yaml). -## Install mimoto -* Execute mimoto install script +## Install Mimoto and Datashare +* Execute the Mimoto install script. * Before installing Mimoto, please ensure that the database host and port are correctly configured in the [values.yaml](mimoto/values.yaml) file. +* Datashare will be deployed as part of the Mimoto installation. +* Note: During the installation of Mimoto and Datashare, ensure that the active_profile_env parameter in the ConfigMap of the config-server-share (in the injiweb namespace) is set to: default,inji-default,standalone + ``` cd ../deploy/mimoto ./install.sh diff --git a/deploy/mimoto-apitestrig/values.yaml b/deploy/mimoto-apitestrig/values.yaml index 35d620a63..7f276fe4e 100644 --- a/deploy/mimoto-apitestrig/values.yaml +++ b/deploy/mimoto-apitestrig/values.yaml @@ -3,5 +3,5 @@ modules: enabled: true image: repository: mosipid/apitest-mimoto - tag: 0.19.0 - pullPolicy: Always \ No newline at end of file + tag: 0.19.1 + pullPolicy: Always diff --git a/deploy/mimoto/datashare-values.yaml b/deploy/mimoto/datashare-values.yaml new file mode 100644 index 000000000..adee53e86 --- /dev/null +++ b/deploy/mimoto/datashare-values.yaml @@ -0,0 +1,13 @@ +# Override the envFrom field to exclude 'artifactory-share' +extraEnvVarsCM: + - inji-stack-config + - config-server-share + +istio: + enabled: false # Disables VirtualService creation if Istio is used + +virtualService: + enabled: false # Explicitly disable VirtualService if applicable + +service: + enabled: true # Ensure service is still enabled, if needed \ No newline at end of file diff --git a/deploy/mimoto/delete.sh b/deploy/mimoto/delete.sh index c4f326e54..94375da5c 100755 --- a/deploy/mimoto/delete.sh +++ b/deploy/mimoto/delete.sh @@ -7,6 +7,7 @@ function deleting_mimoto() { if [ $yn = "Y" ] then helm -n $NS delete mimoto + helm -n $NS delete datashare-inji break else break diff --git a/deploy/mimoto/install.sh b/deploy/mimoto/install.sh index 8837d4f3b..eb3ac11d9 100755 --- a/deploy/mimoto/install.sh +++ b/deploy/mimoto/install.sh @@ -7,10 +7,22 @@ if [ $# -ge 1 ] ; then fi NS=injiweb -CHART_VERSION=0.19.0 +CHART_VERSION=0.19.1 KEYGEN_CHART_VERSION=1.3.0-beta.2 SOFTHSM_NS=softhsm SOFTHSM_CHART_VERSION=1.3.0-beta.2 +DATASHARE_CHART_VERSION=1.3.0-beta.2 +##The value of INJI_DATASHARE_HOST is set to a fixed value: "datashare-inji.injiweb". +INJI_DATASHARE_HOST="datashare-inji.injiweb" + +DEFAULT_INJI_DATASHARE_HOST=$(kubectl get cm inji-stack-config -n config-server -o jsonpath={.data.inji-datashare-host}) +if [ -z "$DEFAULT_INJI_DATASHARE_HOST" ]; then + echo "Adding INJI_DATASHARE_HOST to config-server deployment" + kubectl patch configmap inji-stack-config -n config-server --type merge -p "{\"data\": {\"inji-datashare-host\": \"$INJI_DATASHARE_HOST\"}}" + kubectl patch configmap inji-stack-config -n default --type merge -p "{\"data\": {\"inji-datashare-host\": \"$INJI_DATASHARE_HOST\"}}" + kubectl -n config-server set env --keys=inji-datashare-host --from configmap/inji-stack-config deployment/config-server --prefix=SPRING_CLOUD_CONFIG_SERVER_OVERRIDES_ + kubectl -n config-server get deploy -o name | xargs -n1 -t kubectl -n config-server rollout status +fi echo Create $NS namespace kubectl create ns $NS @@ -46,6 +58,12 @@ function installing_mimoto() { ENABLE_INSECURE='--set enable_insecure=true'; fi + INJI_DATASHARE_HOST=$(kubectl get cm inji-stack-config -o jsonpath={.data.inji-datashare-host}) + echo "Installing datashare" + helm -n $NS install datashare-inji mosip/datashare \ + -f datashare-values.yaml \ + --version $DATASHARE_CHART_VERSION + echo "Do you want to use SoftHSM or .p12 keystore for key management?" echo "1) SoftHSM" echo "2) .p12 keystore" diff --git a/deploy/redis/install.sh b/deploy/redis/install.sh index 9bf297b73..d20007c3d 100755 --- a/deploy/redis/install.sh +++ b/deploy/redis/install.sh @@ -45,7 +45,8 @@ function installing_redis() { helm repo update echo Installing redis - helm -n $NS install redis bitnami/redis --wait --version $CHART_VERSION + helm -n $NS install redis bitnami/redis --wait --version $CHART_VERSION \ + --set image.repository=mosipint/redis --set image.tag=7.0.5-debian-11-r25 echo Installed redis service diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index a813abcea..f08536f26 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -4,7 +4,7 @@ services: minio: container_name: 'minio-service' - image: bitnami/minio:2022.2.7-debian-10-r0 + image: mosipint/minio:2022.2.7-debian-10-r0 ports: - "9001:9001" - "9000:9000" @@ -59,7 +59,7 @@ services: mimoto-service: container_name: 'mimoto-service' - image: 'mosipid/mimoto:0.19.0' + image: 'mosipid/mimoto:0.19.1' user: root ports: - '8099:8099' @@ -90,4 +90,4 @@ services: volumes: postgres-data: - redis-data: \ No newline at end of file + redis-data: diff --git a/helm/mimoto/Chart.yaml b/helm/mimoto/Chart.yaml index 0c1791cec..e61ec465d 100644 --- a/helm/mimoto/Chart.yaml +++ b/helm/mimoto/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: mimoto description: A Helm chart for MOSIP mimoto Application type: application -version: 0.19.0 +version: 0.19.1 appVersion: "" dependencies: - name: common diff --git a/helm/mimoto/values.yaml b/helm/mimoto/values.yaml index 9ee8f2317..1edfacde1 100644 --- a/helm/mimoto/values.yaml +++ b/helm/mimoto/values.yaml @@ -54,7 +54,7 @@ service: image: registry: docker.io repository: mosipid/mimoto - tag: 0.19.0 + tag: 0.19.1 ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images @@ -377,8 +377,8 @@ volumePermissions: enabled: true image: registry: docker.io - repository: bitnami/os-shell - tag: "12-debian-12-r47" + repository: mosipint/os-shell + tag: "12-debian-12-r46" pullPolicy: Always ## Optionally specify an array of imagePullSecrets. ## Secrets must be manually created in the namespace. diff --git a/pom.xml b/pom.xml index a0cd92e05..dfc5b5a1a 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 io.mosip mimoto - 0.19.0 + 0.19.1 mimoto https://github.com/mosip/mimoto Mobile server backend supporting Inji.