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

[MOSIP-38169] Updated deployment scripts for pmp-revamp-ui #1052

Merged
merged 2 commits into from
Dec 20, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
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 deploy/pmp-revamp-ui/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ set -o errexit ## set -e : exit the script if any statement returns a non-true
set -o nounset ## set -u : exit the script if you try to use an uninitialised variable
set -o errtrace # trace ERR through 'time command' and other functions
set -o pipefail # trace ERR through pipes
installing_pmp_ui # calling function
installing_pmp_revamp_ui # calling function
41 changes: 27 additions & 14 deletions helm/pmp-revamp-ui/templates/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,56 +3,69 @@ kind: ConfigMap
metadata:
name: {{ template "common.names.fullname" . }}
namespace: {{ .Release.Namespace }}
labels: {{- include "common.labels.standard" . | nindent 4 }}
{{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- end }}
labels:
{{- include "common.labels.standard" . | nindent 4 }}
{{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- end }}
{{- if .Values.commonAnnotations }}
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
annotations:
{{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
{{- end }}
data:
REACT_APP_PARTNER_MANAGER_API_BASE_URL: {{ .Values.pmp_revamp.pms_partner_manager_internal_service_url }}
REACT_APP_POLICY_MANAGER_API_BASE_URL: {{ .Values.pmp_revamp.pms_policy_manager_internal_service_url }}
default.conf: |
server {
listen 3000;
server_name localhost;
add_header X-Frame-Options DENY;

location / {
root /usr/share/nginx/html;
}
}
nginx.conf: |-
worker_processes 1;

events {
worker_connections 1024;
}

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_pass {{ .Values.pmp_revamp.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_pass {{ .Values.pmp_revamp.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;
}
}
Expand Down
4 changes: 2 additions & 2 deletions helm/pmp-revamp-ui/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,9 @@ spec:
- 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 }}
value: {{ .Values.pmp_revamp.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 }}
value: {{ .Values.pmp_revamp.react_app_policy_manager_api_base_url }}
{{- if .Values.extraEnvVars }}
{{- include "common.tplvalues.render" (dict "value" .Values.extraEnvVars "context" $) | nindent 12 }}
{{- end }}
Expand Down
2 changes: 1 addition & 1 deletion helm/pmp-revamp-ui/values.yaml
abhishek8shankar marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@ metrics:
# severity: error
rules: []

pmp_new:
pmp_revamp:
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'
Expand Down
Loading