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

[master] allow users to handle properly baseUrl in portal next for multi tenant installations #10458

Merged
merged 1 commit into from
Jan 17, 2025
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
6 changes: 5 additions & 1 deletion helm/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,8 @@ annotations:
###########
artifacthub.io/changes: |
- "Improve HPA by allowing custom annotation, custom metrics and define the behavior spec (APIM-8186)"
- kind: fixed
description: 'allow users to handle properly baseUrl in portal next for multi tenant installations'
links:
- name: Github Issue
url: https://github.com/gravitee-io/issues/issues/10204
11 changes: 11 additions & 0 deletions helm/templates/portal/portal-configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,15 @@ data:
}
}
}
config-next.json: |
{
{{- if .Values.portal.enforceEnvironmentId }}
"environmentId": "{{ .Values.portal.enforceEnvironmentId }}",
{{- end }}
{{- if .Values.portal.baseURL }}
"baseURL": "{{ .Values.portal.baseURL }}"
{{- else }}
"baseURL": "{{ .Values.api.ingress.portal.scheme }}://{{ index .Values.api.ingress.portal.hosts 0 }}{{ .Values.api.ingress.portal.path }}"
{{- end }}
}
{{- end -}}
3 changes: 3 additions & 0 deletions helm/templates/portal/portal-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,9 @@ spec:
- name: config
mountPath: /usr/share/nginx/html/assets/config.json
subPath: config.json
- name: config
mountPath: /usr/share/nginx/html/next/browser/assets/config.json
subPath: config-next.json
{{- with .Values.portal.extraVolumeMounts }}
{{- tpl . $ | nindent 12 }}
{{- end }}
Expand Down