From 15c5d92a539833ce8847b6e548ef04b3e2b5cc3b Mon Sep 17 00:00:00 2001 From: kjeld Schouten-Lebbing Date: Tue, 2 Mar 2021 19:16:20 +0100 Subject: [PATCH] Revert 202 Fix --- library/common/Chart.yaml | 2 +- .../templates/lib/resources/_appingress.tpl | 16 +++++++--------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/library/common/Chart.yaml b/library/common/Chart.yaml index e88e924ccf8..227c058ce10 100644 --- a/library/common/Chart.yaml +++ b/library/common/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: common -version: 1.6.1 +version: 1.6.2 # upstream_version: 3.0.1 # appVersion: description: Function library for TrueCharts diff --git a/library/common/templates/lib/resources/_appingress.tpl b/library/common/templates/lib/resources/_appingress.tpl index e77c77f2e99..98328f91cf4 100644 --- a/library/common/templates/lib/resources/_appingress.tpl +++ b/library/common/templates/lib/resources/_appingress.tpl @@ -13,26 +13,24 @@ Renders the additional ingress objects from appIngress {{- $_ := set $ "ObjectValues" (dict "appIngress" $ingressValues) -}} {{- if $ingressValues.type -}} {{- if eq $ingressValues.type "UDP" -}} - {{- include "common.classes.appIngressUDP" $ | nindent 0 -}} + {{- include "common.classes.appIngressUDP" $ }} {{- else if eq $ingressValues.type "TCP" -}} - {{- include "common.classes.appIngressTCP" $ | nindent 0 -}} + {{- include "common.classes.appIngressTCP" $ }} {{- else }} - {{- include "common.classes.appIngressHTTP" $ | nindent 0 -}} + {{- include "common.classes.appIngressHTTP" $ }} {{- if $ingressValues.authForwardURL }} - {{- include "common.classes.appAuthForward" $ | nindent 0 -}} + {{- include "common.classes.appAuthForward" $ }} {{- end }} {{- end }} {{- else }} - {{- include "common.classes.appIngressHTTP" $ | nindent 0 -}} + {{- include "common.classes.appIngressHTTP" $ }} {{- if $ingressValues.authForwardURL }} - {{- include "common.classes.appAuthForward" $ | nindent 0 -}} + {{- include "common.classes.appAuthForward" $ }} {{- end }} {{- end }} {{- $_ := set $ "ObjectValues" (dict "certHolder" $ingressValues) -}} - {- if eq $ingressValues.certType "ixcert" -}} {{- print ("---") | nindent 0 -}} - {{- include "common.resources.cert.secret" $ | nindent 0 -}} - {{- else }} + {{- include "common.resources.cert.secret" $ }} {{- end }} {{- end }} {{- end }}