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=6bc1a696ca4dd2c537ef3da40bf37d0e28b11094;hb=refs%2Fchanges%2F68%2F868%2F2;hp=2106fa4d6de4ac3f4516356c51d7ea4e9f42f4fa;hpb=cf28a83dfa8e7803391c76347f24081bbf91b63b;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 2106fa4d..6bc1a696 100644 --- a/ric-common/Common-Template/helm/ric-common/templates/_ingresscontroller.tpl +++ b/ric-common/Common-Template/helm/ric-common/templates/_ingresscontroller.tpl @@ -54,46 +54,17 @@ {{- end -}} -{{- define "common.ingressurl.helm" -}} - {{- if .Values.global -}} - {{- if .Values.global.ingressurl -}} - {{- if .Values.global.ingressurl.helm -}} - {{- printf "%s" .Values.global.ingressurl.helm -}} - {{- else -}} - {{- printf "helm-entry" -}} - {{- end -}} - {{- else -}} - {{- printf "helm-entry" -}} - {{- end -}} - {{- else -}} - {{- printf "helm-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.ric" -}} - {{- printf "31080" -}} -{{- end -}} - -{{- define "common.ingresshttpsport.ric" -}} - {{- printf "31443" -}} -{{- end -}} - - -{{- define "common.ingresshttpport.aux" -}} +{{- define "common.ingresshttpport" -}} {{- printf "32080" -}} {{- end -}} -{{- define "common.ingresshttpsport.aux" -}} +{{- define "common.ingresshttpsport" -}} {{- printf "32443" -}} {{- end -}}