From 670416a9622aaaf8fe8c6016c2888a4600b60090 Mon Sep 17 00:00:00 2001 From: Shiva Date: Mon, 6 May 2024 19:28:44 +0530 Subject: [PATCH 1/6] Update pixel pass version Signed-off-by: Shiva --- inji-verify/package-lock.json | 2 +- inji-verify/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/inji-verify/package-lock.json b/inji-verify/package-lock.json index dfe87989..19da52b2 100644 --- a/inji-verify/package-lock.json +++ b/inji-verify/package-lock.json @@ -10,7 +10,7 @@ "dependencies": { "@emotion/react": "^11.11.4", "@emotion/styled": "^11.11.5", - "@mosip/pixelpass": "^0.1.4", + "@mosip/pixelpass": "0.1.4", "@mui/icons-material": "^5.15.15", "@mui/material": "^5.15.14", "@mui/styled-engine": "^5.15.14", diff --git a/inji-verify/package.json b/inji-verify/package.json index 0087e086..0e0e5b2f 100644 --- a/inji-verify/package.json +++ b/inji-verify/package.json @@ -5,7 +5,7 @@ "dependencies": { "@emotion/react": "^11.11.4", "@emotion/styled": "^11.11.5", - "@mosip/pixelpass": "^0.1.4", + "@mosip/pixelpass": "0.1.4", "@mui/icons-material": "^5.15.15", "@mui/material": "^5.15.14", "@mui/styled-engine": "^5.15.14", From 09b3ef1a203a72b46ddc4bb728d43313e445cff2 Mon Sep 17 00:00:00 2001 From: abhishek8shankar Date: Tue, 7 May 2024 15:29:23 +0530 Subject: [PATCH 2/6] [DSD-5029] Updated install scripts Signed-off-by: abhishek8shankar --- helm/inji-verify/install.sh | 4 +--- helm/inji-verify/templates/configmap.yaml | 4 ++-- helm/inji-verify/templates/deployment.yaml | 2 +- helm/inji-verify/templates/service.yaml | 2 +- helm/inji-verify/values.yaml | 7 ++++++- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/helm/inji-verify/install.sh b/helm/inji-verify/install.sh index 938013a0..3af47274 100755 --- a/helm/inji-verify/install.sh +++ b/helm/inji-verify/install.sh @@ -37,8 +37,6 @@ echo "MOSIP_INJIVERIFY_HOST is not present in configmap/global of configserver" # 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 @@ -52,7 +50,7 @@ function installing_inji-verify() { echo Copy configmaps ./copy_cm.sh - INJI_HOST=$(kubectl get cm global -o jsonpath={.data.mosip-injiverify-host}) + INJIVERIFY_HOST=$(kubectl get cm global -o jsonpath={.data.mosip-injiverify-host}) echo Installing INJIVERIFY helm -n $NS install inji-verify mosip/inji-verify \ -f values.yaml \ diff --git a/helm/inji-verify/templates/configmap.yaml b/helm/inji-verify/templates/configmap.yaml index d84ac4a9..e2d4f8d1 100644 --- a/helm/inji-verify/templates/configmap.yaml +++ b/helm/inji-verify/templates/configmap.yaml @@ -22,7 +22,7 @@ data: access_log /var/log/nginx/access1.log; error_log /var/log/nginx/error1.log; server { - listen {{ .Values.inji_web.inji_web_port }}; + listen {{ .Values.inji_verify.port }}; server_name localhost; root /usr/share/nginx/html; @@ -35,7 +35,7 @@ data: gzip_types text/plain text/css application/json application/javascript application/x-javascript text/xml application/xml application/xml+rss text/javascript; location /v1/mimoto { - proxy_pass http://{{ .Values.inji_web.inji_web_service_host }}/v1/mimoto; + proxy_pass http://{{ .Values.inji_verify.host }}/v1/mimoto; proxy_redirect off; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; diff --git a/helm/inji-verify/templates/deployment.yaml b/helm/inji-verify/templates/deployment.yaml index c7d729e4..405249f9 100644 --- a/helm/inji-verify/templates/deployment.yaml +++ b/helm/inji-verify/templates/deployment.yaml @@ -113,7 +113,7 @@ spec: subPath: nginx.conf ports: - name: spring-service - containerPort: {{ .Values.inji_web.inji_web_port }} + containerPort: {{ .Values.inji_verify.port }} {{- if .Values.resources }} resources: {{- toYaml .Values.resources | nindent 12 }} {{- end }} diff --git a/helm/inji-verify/templates/service.yaml b/helm/inji-verify/templates/service.yaml index 9caedaa5..b105c0ed 100644 --- a/helm/inji-verify/templates/service.yaml +++ b/helm/inji-verify/templates/service.yaml @@ -24,5 +24,5 @@ spec: - name: http port: {{ .Values.service.port }} protocol: TCP - targetPort: {{ .Values.inji_web.inji_web_port }} + targetPort: {{ .Values.inji_verify.port }} selector: {{- include "common.labels.matchLabels" . | nindent 4 }} diff --git a/helm/inji-verify/values.yaml b/helm/inji-verify/values.yaml index 6e23cc88..c235c7da 100755 --- a/helm/inji-verify/values.yaml +++ b/helm/inji-verify/values.yaml @@ -249,7 +249,7 @@ extraEnvVarsCM: - config-server-share - artifactory-share #- softhsm-esignet-share - - oidc-ui + #- oidc-ui ## Secret with extra environment variables ## @@ -416,6 +416,11 @@ 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_verify: + port: '3004' + host: 'mimoto.mimoto' +esignet_redirect_url: 'esignet.sandbox.xyz.net' istio: enabled: true ingressController: From d1eb4e4055b146ca3bf02f71faa960748617c1e1 Mon Sep 17 00:00:00 2001 From: techno-467 Date: Wed, 8 May 2024 09:45:32 +0530 Subject: [PATCH 3/6] [DSD-DSD-5199] inji-verify 0.8.0 release Signed-off-by: techno-467 --- helm/inji-verify/Chart.yaml | 2 +- helm/inji-verify/install.sh | 2 +- helm/inji-verify/values.yaml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/helm/inji-verify/Chart.yaml b/helm/inji-verify/Chart.yaml index 7ff81a3d..ab9e11bb 100644 --- a/helm/inji-verify/Chart.yaml +++ b/helm/inji-verify/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: injiverify description: A Helm chart for MOSIP injiverify module type: application -version: 0.0.1-develop +version: 0.8.0 appVersion: "" dependencies: - name: common diff --git a/helm/inji-verify/install.sh b/helm/inji-verify/install.sh index 3af47274..61940d2f 100755 --- a/helm/inji-verify/install.sh +++ b/helm/inji-verify/install.sh @@ -7,7 +7,7 @@ if [ $# -ge 1 ] ; then fi NS=injiverify -CHART_VERSION=0.0.1-develop +CHART_VERSION=0.8.0 DEFAULT_MOSIP_INJIVERIFY_HOST=$( kubectl get cm global -n config-server -o jsonpath={.data.mosip-injiverify-host} ) # Check if MOSIP_INJIVERIFY_HOST is present under configmap/global of configserver diff --git a/helm/inji-verify/values.yaml b/helm/inji-verify/values.yaml index c235c7da..906b3540 100755 --- a/helm/inji-verify/values.yaml +++ b/helm/inji-verify/values.yaml @@ -51,8 +51,8 @@ service: image: registry: docker.io - repository: mosipdev/inji-verify - tag: develop + repository: mosipid/inji-verify + tag: 0.8.0 ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' From 8fbd4092bc1391cb5849e9c1c5e21e927c3fbe07 Mon Sep 17 00:00:00 2001 From: Praful Rakhade <99539100+Prafulrakhade@users.noreply.github.com> Date: Wed, 8 May 2024 11:04:27 +0530 Subject: [PATCH 4/6] [DSD-5199] Updated values.yaml Signed-off-by: Praful Rakhade <99539100+Prafulrakhade@users.noreply.github.com> --- helm/inji-verify/values.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/helm/inji-verify/values.yaml b/helm/inji-verify/values.yaml index 906b3540..3a83ce96 100755 --- a/helm/inji-verify/values.yaml +++ b/helm/inji-verify/values.yaml @@ -248,9 +248,8 @@ extraEnvVarsCM: - global - config-server-share - artifactory-share - #- softhsm-esignet-share - #- oidc-ui - +##- softhsm-esignet-share +##- oidc-ui ## Secret with extra environment variables ## extraEnvVarsSecret: From 58c819b499b9848c00c4e3f05a6afcedc32e8ac0 Mon Sep 17 00:00:00 2001 From: Praful Rakhade <99539100+Prafulrakhade@users.noreply.github.com> Date: Wed, 8 May 2024 11:05:47 +0530 Subject: [PATCH 5/6] Update values.yaml Signed-off-by: Praful Rakhade <99539100+Prafulrakhade@users.noreply.github.com> --- helm/inji-verify/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/helm/inji-verify/values.yaml b/helm/inji-verify/values.yaml index 3a83ce96..72b5e016 100755 --- a/helm/inji-verify/values.yaml +++ b/helm/inji-verify/values.yaml @@ -248,8 +248,8 @@ extraEnvVarsCM: - global - config-server-share - artifactory-share -##- softhsm-esignet-share -##- oidc-ui +# - softhsm-esignet-share +# - oidc-ui ## Secret with extra environment variables ## extraEnvVarsSecret: From bc9e4e031555587208c18edf58710d17c962fbb2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 8 May 2024 05:52:04 +0000 Subject: [PATCH 6/6] Bump ejs from 3.1.9 to 3.1.10 in /inji-verify Bumps [ejs](https://github.com/mde/ejs) from 3.1.9 to 3.1.10. - [Release notes](https://github.com/mde/ejs/releases) - [Commits](https://github.com/mde/ejs/compare/v3.1.9...v3.1.10) --- updated-dependencies: - dependency-name: ejs dependency-type: indirect ... Signed-off-by: dependabot[bot] --- inji-verify/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/inji-verify/package-lock.json b/inji-verify/package-lock.json index 19da52b2..6a467837 100644 --- a/inji-verify/package-lock.json +++ b/inji-verify/package-lock.json @@ -8672,9 +8672,9 @@ "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" }, "node_modules/ejs": { - "version": "3.1.9", - "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.9.tgz", - "integrity": "sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ==", + "version": "3.1.10", + "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz", + "integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==", "dependencies": { "jake": "^10.8.5" },