X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=ric-aux%2F80-Auxiliary-Functions%2Fhelm%2Fdashboard%2Ftemplates%2F_genurl.tpl;h=1aba1a6d26e590df79b57d37cec8af094bc37c73;hb=8dcae47ad61db4b1d3128f18b8922ab0ee672edf;hp=9f89c39c6dcb93e9e5988d782f96f74b71172d90;hpb=6cacc1f18011ec5a71e32fe09e406ed13c8603b5;p=it%2Fdep.git diff --git a/ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/_genurl.tpl b/ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/_genurl.tpl index 9f89c39c..1aba1a6d 100644 --- a/ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/_genurl.tpl +++ b/ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/_genurl.tpl @@ -20,38 +20,38 @@ Generate the URLS of the endpoints. */}} -{{- define "dashboard.endpoint.a1mediator" -}} +{{- define "dashboard.prefix.a1mediator" -}} {{- $ingress := ( include "common.ingressurl.ricplt" . ) -}} - {{- if .Values.dashboard.properties.a1med.url.override -}} - {{- printf "%s" .Values.dashboard.properties.a1med.url.override -}} + {{- if .Values.dashboard.properties.a1med.url.prefix -}} + {{- printf "%s" .Values.dashboard.properties.a1med.url.prefix -}} {{- else -}} - {{- printf "http://%s/a1mediator%s" $ingress .Values.dashboard.properties.a1med.url.suffix -}} + {{- printf "http://%s/a1mediator" $ingress -}} {{- end -}} {{- end -}} -{{- define "dashboard.endpoint.anrxapp" -}} +{{- define "dashboard.prefix.anrxapp" -}} {{- $ingress := ( include "common.ingressurl.ricxapp" . ) -}} - {{- if .Values.dashboard.properties.anrxapp.url.override -}} - {{- printf "%s" .Values.dashboard.properties.anrxapp.url.override -}} + {{- if .Values.dashboard.properties.anrxapp.url.prefix -}} + {{- printf "%s" .Values.dashboard.properties.anrxapp.url.prefix -}} {{- else -}} - {{- printf "http://%s/anr%s" $ingress .Values.dashboard.properties.anrxapp.url.suffix -}} + {{- printf "http://%s/anr" $ingress -}} {{- end -}} {{- end -}} -{{- define "dashboard.endpoint.e2mgr" -}} +{{- define "dashboard.prefix.e2mgr" -}} {{- $ingress := ( include "common.ingressurl.ricplt" . ) -}} - {{- if .Values.dashboard.properties.e2mgr.url.override -}} - {{- printf "%s" .Values.dashboard.properties.e2mgr.url.override -}} + {{- if .Values.dashboard.properties.e2mgr.url.prefix -}} + {{- printf "%s" .Values.dashboard.properties.e2mgr.url.prefix -}} {{- else -}} - {{- printf "http://%s/e2mgr%s" $ingress .Values.dashboard.properties.e2mgr.url.suffix -}} + {{- printf "http://%s/e2mgr" $ingress -}} {{- end -}} {{- end -}} - -{{- define "dashboard.endpoint.xappmgr" -}} + +{{- define "dashboard.prefix.appmgr" -}} {{- $ingress := ( include "common.ingressurl.ricplt" . ) -}} - {{- if .Values.dashboard.properties.xappmgr.url.override -}} - {{- printf "%s" .Values.dashboard.properties.xappmgr.url.override -}} + {{- if .Values.dashboard.properties.appmgr.url.prefix -}} + {{- printf "%s" .Values.dashboard.properties.appmgr.url.prefix -}} {{- else -}} - {{- printf "http://%s/appmgr%s" $ingress .Values.dashboard.properties.xappmgr.url.suffix -}} + {{- printf "http://%s/appmgr" $ingress -}} {{- end -}} {{- end -}}