Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump undici from 5.28.3 to 5.28.4 in /inji-verify #41

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
2 changes: 1 addition & 1 deletion helm/inji-verify/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 2 additions & 4 deletions helm/inji-verify/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand All @@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions helm/inji-verify/templates/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion helm/inji-verify/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion helm/inji-verify/templates/service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
14 changes: 9 additions & 5 deletions helm/inji-verify/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-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'
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -416,6 +415,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:
Expand Down
8 changes: 4 additions & 4 deletions inji-verify/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion inji-verify/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading