diff --git a/charts/pmp-reactjs-ui/templates/configmap.yaml b/charts/pmp-reactjs-ui/templates/configmap.yaml index b83d2bb52..c9bce5ae4 100644 --- a/charts/pmp-reactjs-ui/templates/configmap.yaml +++ b/charts/pmp-reactjs-ui/templates/configmap.yaml @@ -11,20 +11,49 @@ metadata: annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} {{- end }} data: - REACT_APP_PARTNER_MANAGER_API_BASE_URL: {{ .Values.pmp_new.react_app_partner_manager_api_base_url }}/v1/partnermanager - REACT_APP_POLICY_MANAGER_API_BASE_URL: {{ .Values.pmp_new.react_app_policy_manager_api_base_url }}/v1/policymanager nginx.conf: |- - server { - listen 3000; - server_name localhost; - add_header X-Frame-Options DENY; + worker_processes 1; - #charset koi8-r; - #access_log /var/log/nginx/host.access.log main; - #index index.html index.htm; + events { + worker_connections 1024; + } - location / { - root /usr/share/nginx/html; + http { + access_log /var/log/nginx/access.log; + error_log /var/log/nginx/error.log; + server { + listen 3000; + server_name localhost; + + root /usr/share/nginx/html; + index index.html index.htm; + include /etc/nginx/mime.types; + + gzip on; + gzip_min_length 1000; + gzip_proxied expired no-cache no-store private auth; + gzip_types text/plain text/css application/json application/javascript application/x-javascript text/xml application/xml application/xml+rss text/javascript; + + location /v1/partnermanager { + proxy_pass {{ .Values.pmp_new.pms_partner_manager_internal_service_url }}; + proxy_redirect off; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Host $server_name; + } + location /v1/policymanager { + proxy_pass {{ .Values.pmp_new.pms_policy_manager_internal_service_url }}; + proxy_redirect off; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Host $server_name; + } + + location / { + # alias /usr/share/nginx/html; + try_files $uri $uri/ /index.html; + } } - } diff --git a/charts/pmp-reactjs-ui/templates/deployment.yaml b/charts/pmp-reactjs-ui/templates/deployment.yaml index 966b56bea..44ea1b88d 100644 --- a/charts/pmp-reactjs-ui/templates/deployment.yaml +++ b/charts/pmp-reactjs-ui/templates/deployment.yaml @@ -93,6 +93,10 @@ spec: value: {{ .Values.containerSecurityContext.runAsUser }} - name: JDK_JAVA_OPTIONS value: {{ .Values.additionalResources.javaOpts }} + - name: REACT_APP_PARTNER_MANAGER_API_BASE_URL + value: {{ .Values.pmp_new.react_app_partner_manager_api_base_url }} + - name: REACT_APP_POLICY_MANAGER_API_BASE_URL + value: {{ .Values.pmp_new.react_app_policy_manager_api_base_url }} {{- if .Values.extraEnvVars }} {{- include "common.tplvalues.render" (dict "value" .Values.extraEnvVars "context" $) | nindent 12 }} {{- end }} @@ -107,6 +111,10 @@ spec: - secretRef: name: {{ include "common.tplvalues.render" (dict "value" .Values.extraEnvVarsSecret "context" $) }} {{- end }} + volumeMounts: + - name: nginx-config + mountPath: {{ .Values.nginx.volume_mount_path }} + subPath: {{ .Values.nginx.sub_path }} ports: - name: spring-service containerPort: {{ .Values.springServicePort }} @@ -130,4 +138,11 @@ spec: {{- end }} {{- if .Values.sidecars }} {{- include "common.tplvalues.render" ( dict "value" .Values.sidecars "context" $) | nindent 8 }} - {{- end }} \ No newline at end of file + {{- end }} + volumes: + - name: nginx-config + configMap: + name: {{ template "common.names.fullname" . }} + items: + - key: nginx.conf + path: nginx.conf \ No newline at end of file diff --git a/charts/pmp-reactjs-ui/values.yaml b/charts/pmp-reactjs-ui/values.yaml index e8ed53da0..a96c49819 100644 --- a/charts/pmp-reactjs-ui/values.yaml +++ b/charts/pmp-reactjs-ui/values.yaml @@ -51,7 +51,7 @@ service: image: registry: docker.io - repository: mosipdev/pmp-reactjs-ui + repository: mosipqa/pmp-reactjs-ui tag: develop ## Specify a imagePullPolicy @@ -249,7 +249,6 @@ extraEnvVarsCM: - global - config-server-share - artifactory-share - - pmp-reactjs-ui ## Secret with extra environment variables ## @@ -415,13 +414,19 @@ metrics: rules: [] pmp_new: - react_app_partner_manager_api_base_url: 'https://api-internal.sandbox.xyz.net' - react_app_policy_manager_api_base_url: 'https://api-internal.sandbox.xyz.net' + react_app_partner_manager_api_base_url: 'https://api-internal.sandbox.xyz.net/v1/partnermanager' + react_app_policy_manager_api_base_url: 'https://api-internal.sandbox.xyz.net/v1/policymanager' + pms_partner_manager_internal_service_url: 'http://pms-partner.pms/v1/partnermanager' + pms_policy_manager_internal_service_url: 'http://pms-policy.pms/v1/policymanager' ## The url below is to access pmp API services. -## CAUTION: Domain name to acess pmp UI must be secure/internal/over vpn. +## CAUTION: Domain name to access pmp UI must be secure/internal/over vpn. ## Slash is important! +nginx: + volume_mount_path: /etc/nginx/nginx.conf + sub_path: nginx.conf + ## pmp UI swagger should have only internal access. Hence linked to internal gateway ## We create a gateway for pmp specific URL(s) listed under `hosts` istio: diff --git a/charts/pms-partner/templates/deployment.yaml b/charts/pms-partner/templates/deployment.yaml index 0d14e474a..622320245 100644 --- a/charts/pms-partner/templates/deployment.yaml +++ b/charts/pms-partner/templates/deployment.yaml @@ -93,6 +93,14 @@ spec: value: {{ .Values.containerSecurityContext.runAsUser }} - name: JDK_JAVA_OPTIONS value: {{ .Values.additionalResources.javaOpts }} + {{- if .Values.springConfigNameEnv }} + - name: spring_config_name_env + value: {{ .Values.springConfigNameEnv }} + {{- end }} + {{- if .Values.activeProfileEnv }} + - name: active_profile_env + value: {{ .Values.activeProfileEnv }} + {{- end }} {{- if .Values.extraEnvVars }} {{- include "common.tplvalues.render" (dict "value" .Values.extraEnvVars "context" $) | nindent 12 }} {{- end }} diff --git a/charts/pms-partner/values.yaml b/charts/pms-partner/values.yaml index 20e4a9f68..039c4f767 100644 --- a/charts/pms-partner/values.yaml +++ b/charts/pms-partner/values.yaml @@ -451,3 +451,7 @@ istio: - PATCH - PUT - DELETE + +# Set configuration +# springConfigNameEnv: +# activeProfileEnv: diff --git a/charts/pms-policy/templates/deployment.yaml b/charts/pms-policy/templates/deployment.yaml index 0b0e692cb..41e466e62 100644 --- a/charts/pms-policy/templates/deployment.yaml +++ b/charts/pms-policy/templates/deployment.yaml @@ -93,6 +93,14 @@ spec: value: {{ .Values.containerSecurityContext.runAsUser }} - name: JDK_JAVA_OPTIONS value: {{ .Values.additionalResources.javaOpts }} + {{- if .Values.springConfigNameEnv }} + - name: spring_config_name_env + value: {{ .Values.springConfigNameEnv }} + {{- end }} + {{- if .Values.activeProfileEnv }} + - name: active_profile_env + value: {{ .Values.activeProfileEnv }} + {{- end }} {{- if .Values.extraEnvVars }} {{- include "common.tplvalues.render" (dict "value" .Values.extraEnvVars "context" $) | nindent 12 }} {{- end }} diff --git a/charts/pms-policy/values.yaml b/charts/pms-policy/values.yaml index c4ac1d9b5..b0e23404e 100644 --- a/charts/pms-policy/values.yaml +++ b/charts/pms-policy/values.yaml @@ -451,3 +451,7 @@ istio: - PATCH - PUT - DELETE + +# Set configuration +# springConfigNameEnv: +# activeProfileEnv: