diff --git a/library/common/Chart.yaml b/library/common/Chart.yaml index b8e443fe7..7fd4ce978 100644 --- a/library/common/Chart.yaml +++ b/library/common/Chart.yaml @@ -15,4 +15,4 @@ maintainers: name: common sources: null type: library -version: 16.2.18 +version: 16.2.19 diff --git a/library/common/templates/lib/ingress/integrations/_homepage.tpl b/library/common/templates/lib/ingress/integrations/_homepage.tpl index 5331801f4..0b5a25a36 100644 --- a/library/common/templates/lib/ingress/integrations/_homepage.tpl +++ b/library/common/templates/lib/ingress/integrations/_homepage.tpl @@ -14,7 +14,8 @@ {{- $name := $homepage.name | default ($rootCtx.Chart.Name | camelcase) -}} {{- $desc := $homepage.description | default $rootCtx.Chart.Description -}} {{- $icon := $homepage.icon | default $rootCtx.Chart.Icon -}} - {{- $type := $homepage.widget.type | default $rootCtx.Chart.Name -}} + {{- $type := ( $homepage.widget.type | default $rootCtx.Chart.Name ) | lower -}} + {{- $type = regexReplaceAll "\\W+" $type "" -}} {{- $url := $homepage.widget.url -}} {{- $href := $homepage.href -}} @@ -30,7 +31,7 @@ {{- if not $url -}} {{- $svc := $svcData.name -}} {{- $port := $svcData.port -}} - {{- $ns := printf "%s" (include "tc.v1.common.lib.metadata.namespace" (dict "rootCtx" $rootCtx "objectData" $objectData "caller" "Ingress") -}} + {{- $ns := printf "%s" (include "tc.v1.common.lib.metadata.namespace" (dict "rootCtx" $rootCtx "objectData" $objectData "caller" "Ingress")) -}} {{- $url = printf "http://%s.$ns.svc:%s" $svc $ns $port -}} {{- end -}}