X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=ric-common%2FCommon-Template%2Fhelm%2Fric-common%2Ftemplates%2F_ingresscontroller.tpl;h=2d75ee725c565b76be9f74ae5f070784d5e3f9af;hb=refs%2Fchanges%2F34%2F1234%2F9;hp=5602418ef1eed30acbfce15adbafceaa41717e23;hpb=f63773cf637d9cfa516459cc9a0f951542811aaa;p=it%2Fdep.git

diff --git a/ric-common/Common-Template/helm/ric-common/templates/_ingresscontroller.tpl b/ric-common/Common-Template/helm/ric-common/templates/_ingresscontroller.tpl
index 5602418e..2d75ee72 100644
--- a/ric-common/Common-Template/helm/ric-common/templates/_ingresscontroller.tpl
+++ b/ric-common/Common-Template/helm/ric-common/templates/_ingresscontroller.tpl
@@ -20,164 +20,66 @@
 */}}
 
 ####################### Service URL #####################################
-{{- define "common.ingressurl.ricplt" -}}
+{{- define "common.ingressurl.ric" -}}
   {{- if .Values.global -}}
     {{- if .Values.global.ingressurl -}}
-      {{- if .Values.global.ingressurl.platform -}}
-        {{- printf "%s" .Values.global.ingressurl.platform -}}
+      {{- if .Values.global.ingressurl.ric -}}
+        {{- printf "%s" .Values.global.ingressurl.ric -}}
       {{- else -}}
-        {{- printf "ricplt-entry" -}}
+        {{- printf "ric-entry" -}}
       {{- end -}}
     {{- else -}}
-      {{- printf "ricplt-entry" -}}
+      {{- printf "ric-entry" -}}
     {{- end -}}
   {{- else -}}
-    {{- printf "ricplt-entry" -}}
+    {{- printf "ric-entry" -}}
   {{- end -}}
 {{- end -}}
 
-{{- define "common.ingressurl.ricxapp" -}}
-  {{- if .Values.global -}}
-    {{- if .Values.global.ingressurl -}}
-      {{- if .Values.global.ingressurl.xapp -}}
-        {{- printf "%s" .Values.global.ingressurl.xapp -}}
-      {{- else -}}
-        {{- printf "ricxapp-entry" -}}
-      {{- end -}}
-    {{- else -}}
-      {{- printf "ricxapp-entry" -}}
-    {{- end -}}
-  {{- else -}}
-    {{- printf "ricxapp-entry" -}}
-  {{- end -}}
-{{- end -}}
 
-{{- define "common.ingressurl.ricaux" -}}
+{{- define "common.ingressurl.aux" -}}
   {{- if .Values.global -}}
     {{- if .Values.global.ingressurl -}}
       {{- if .Values.global.ingressurl.aux -}}
         {{- printf "%s" .Values.global.ingressurl.aux -}}
       {{- else -}}
-        {{- printf "ricaux-entry" -}}
-      {{- end -}}
-    {{- else -}}
-      {{- printf "ricaux-entry" -}}
-    {{- end -}}
-  {{- else -}}
-    {{- printf "ricaux-entry" -}}
-  {{- end -}}
-{{- end -}}
-
-{{- define "common.ingressurl.ricinfra" -}}
-  {{- if .Values.global -}}
-    {{- if .Values.global.ingressurl -}}
-      {{- if .Values.global.ingressurl.infra -}}
-        {{- printf "%s" .Values.global.ingressurl.infra -}}
-      {{- else -}}
-        {{- printf "ricinfra-entry" -}}
-      {{- end -}}
-    {{- else -}}
-      {{- printf "ricinfra-entry" -}}
-    {{- end -}}
-  {{- else -}}
-    {{- printf "ricinfra-entry" -}}
-  {{- end -}}
-{{- end -}}
-
-{{- define "common.ingressurl.localdocker" -}}
-  {{- if .Values.global -}}
-    {{- if .Values.global.ingressurl -}}
-      {{- if .Values.global.ingressurl.localdocker -}}
-        {{- printf "%s" .Values.global.ingressurl.localdocker -}}
-      {{- else -}}
-        {{- printf "docker-entry" -}}
-      {{- end -}}
-    {{- else -}}
-      {{- printf "docker-entry" -}}
-    {{- end -}}
-  {{- else -}}
-    {{- printf "docker-entry" -}}
-  {{- end -}}
-{{- end -}}
-
-{{- define "common.ingressurl.localhelm" -}}
-  {{- if .Values.global -}}
-    {{- if .Values.global.ingressurl -}}
-      {{- if .Values.global.ingressurl.localhelm -}}
-        {{- printf "%s" .Values.global.ingressurl.localhelm -}}
-      {{- else -}}
-        {{- printf "helm-entry" -}}
+        {{- printf "aux-entry" -}}
       {{- end -}}
     {{- else -}}
-      {{- printf "helm-entry" -}}
+      {{- printf "aux-entry" -}}
     {{- end -}}
   {{- else -}}
-    {{- printf "helm-entry" -}}
+    {{- printf "aux-entry" -}}
   {{- end -}}
 {{- end -}}
 
-
-{{- define "common.ingressurl.localnexus" -}}
+{{- define "common.ingressurl.dashboard" -}}
   {{- if .Values.global -}}
     {{- if .Values.global.ingressurl -}}
-      {{- if .Values.global.ingressurl.localnexus -}}
-        {{- printf "%s" .Values.global.ingressurl.localnexus -}}
+      {{- if .Values.global.ingressurl.dashboard -}}
+        {{- printf "%s" .Values.global.ingressurl.dashboard -}}
       {{- else -}}
-        {{- printf "nexus-entry" -}}
+        {{- printf "dashboard-entry" -}}
       {{- end -}}
     {{- else -}}
-      {{- printf "nexus-entry" -}}
+      {{- printf "dashboard-entry" -}}
     {{- end -}}
   {{- else -}}
-    {{- printf "nexus-entry" -}}
+    {{- printf "dashboard-entry" -}}
   {{- end -}}
 {{- end -}}
 
 
-
-
-
-
 ####################### Ingress Controller Ports ###########################################
 ## Currently the below values are hard-coded due to the fact that kong ingress controller  #
 ## helm charts are not using this common template. We need to make sure that these values  #
 ## agree with the values in the kong helm charts values.yaml files.                        #
 ############################################################################################  
-{{- define "common.ingresshttpport.ricplt" -}}
-  {{- printf "30080" -}}
-{{- end -}}
-
-{{- define "common.ingresshttpsport.ricplt" -}}
-  {{- printf "30443" -}}
-{{- end -}}
-
-
-{{- define "common.ingresshttpport.ricxapp" -}}
-  {{- printf "31080" -}}
-{{- end -}}
-
-
-{{- define "common.ingresshttpsport.ricxapp" -}}
-  {{- printf "31443" -}}
-{{- end -}}
-
-
-{{- define "common.ingresshttpport.ricaux" -}}
+{{- define "common.ingresshttpport" -}}
   {{- printf "32080" -}}
 {{- end -}}
 
-{{- define "common.ingresshttpsport.ricaux" -}}
+{{- define "common.ingresshttpsport" -}}
   {{- printf "32443" -}}
 {{- end -}}
 
-
-{{- define "common.ingresshttpport.ricinfra" -}}
-  {{- printf "33080" -}}
-{{- end -}}
-
-
-
-{{- define "common.ingresshttpsport.ricinfra" -}}
-  {{- printf "33443" -}}
-{{- end -}}
-