Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion api-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<name>apitest-mimoto</name>
<description>Parent project of apitest-mimoto</description>
<url>https://github.com/mosip/mimoto</url>
<version>0.19.0</version>
<version>0.19.1</version>

<licenses>
<license>
Expand Down
2 changes: 1 addition & 1 deletion db_scripts/init_values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ databases:
name: postgres-postgresql
key: postgres-password
dml: 1
branch: v0.19.0
branch: v0.19.1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

7 changes: 5 additions & 2 deletions deploy/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions deploy/mimoto-apitestrig/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ modules:
enabled: true
image:
repository: mosipid/apitest-mimoto
tag: 0.19.0
pullPolicy: Always
tag: 0.19.1
pullPolicy: Always
13 changes: 13 additions & 0 deletions deploy/mimoto/datashare-values.yaml
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions deploy/mimoto/delete.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
20 changes: 19 additions & 1 deletion deploy/mimoto/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down
3 changes: 2 additions & 1 deletion deploy/redis/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions docker-compose/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -90,4 +90,4 @@ services:

volumes:
postgres-data:
redis-data:
redis-data:
2 changes: 1 addition & 1 deletion helm/mimoto/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions helm/mimoto/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>io.mosip</groupId>
<artifactId>mimoto</artifactId>
<version>0.19.0</version>
<version>0.19.1</version>
<name>mimoto</name>
<url>https://github.com/mosip/mimoto</url>
<description>Mobile server backend supporting Inji.</description>
Expand Down