From b195961923740627587fc11c4fcdc29ffaab0ca5 Mon Sep 17 00:00:00 2001 From: Stavros kois Date: Wed, 7 Dec 2022 18:04:30 +0200 Subject: [PATCH] comment --- .../common/1.0.0/templates/class/_portal.tpl | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/library/common/1.0.0/templates/class/_portal.tpl b/library/common/1.0.0/templates/class/_portal.tpl index d89ae66e..c1747ea3 100644 --- a/library/common/1.0.0/templates/class/_portal.tpl +++ b/library/common/1.0.0/templates/class/_portal.tpl @@ -2,7 +2,7 @@ {{- $root := .root -}} --- -apiVersion: {{- include "ix.v1.common.capabilities.configMap.apiVersion" . -}} +apiVersion: {{ include "ix.v1.common.capabilities.configMap.apiVersion" . }} kind: ConfigMap metadata: name: portal @@ -17,22 +17,28 @@ metadata: {{- . | nindent 4 }} {{- end }} data: + placeholder: for_non_empty_configmap {{- range $svcName, $svc := $root.Values.service }} {{- if $svc.enabled -}} {{- $svcValues := $svc -}} {{- range $portName, $port := $svc.ports }} - {{- if (mustHas $port.protocol (list "HTTP" "HTTPS")) -}} - {{- $portalProtocol := include "ix.v1.common.portal.protocol" (dict "svcType" $svc.type "svcName" $svcName "portName" $portName "port" $port "root" $root) | trim }} - {{- $portalHost := include "ix.v1.common.portal.host" (dict "svcType" $svc.type "svcName" $svcName "portName" $portName "port" $port "root" $root) | trim }} - {{- $portalPort := include "ix.v1.common.portal.port" (dict "svcType" $svc.type "svcName" $svcName "portName" $portName "port" $port "root" $root) | trim }} - {{- $portalPath := include "ix.v1.common.portal.path" (dict "svcType" $svc.type "svcName" $svcName "portName" $portName "port" $port "root" $root) | trim }} + {{- $portalProtocol := include "ix.v1.common.portal.protocol" (dict "svcType" $svc.type "svcName" $svcName "portName" $portName "port" $port "root" $root) | trim }} + {{- $portalHost := include "ix.v1.common.portal.host" (dict "svcType" $svc.type "svcName" $svcName "portName" $portName "port" $port "root" $root) | trim }} + {{- $portalPort := include "ix.v1.common.portal.port" (dict "svcType" $svc.type "svcName" $svcName "portName" $portName "port" $port "root" $root) | trim }} + {{- $portalPath := include "ix.v1.common.portal.path" (dict "svcType" $svc.type "svcName" $svcName "portName" $portName "port" $port "root" $root) | trim }} {{ printf "protocol-%v-%v" $svcName $portName }}: {{ $portalProtocol }} {{ printf "host-%v-%v" $svcName $portName }}: {{ $portalHost }} {{ printf "path-%v-%v" $svcName $portName }}: {{ $portalPath }} {{ printf "port-%v-%v" $svcName $portName }}: {{ $portalPort }} {{ printf "url-%v-%v" $svcName $portName }}: {{ printf "%v://%v:%v%v" $portalProtocol $portalHost $portalPort $portalPath }} - {{- end -}} {{- end -}} {{- end -}} {{- end -}} {{- end -}} +{{/* +Current "bugs", you can't disable per app portal, +if port protocol is not HTTP or HTTPS, +it will still create an HTTP portal. +For this reason a placeholder is added, +so we don't result in an empty configmap +*/}}