diff --git a/library/common/Chart.yaml b/library/common/Chart.yaml index 7d3e31d96ca..e88e924ccf8 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.0 +version: 1.6.1 # 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 aa95eb48972..e77c77f2e99 100644 --- a/library/common/templates/lib/resources/_appingress.tpl +++ b/library/common/templates/lib/resources/_appingress.tpl @@ -2,7 +2,6 @@ Renders the additional ingress objects from appIngress */}} {{- define "common.appIngress" -}} - {{- /* Generate TrueNAS SCALE app services as required v1 */ -}} {{- if .Values.appIngress -}} {{- range $name, $ingr := .Values.appIngress }} {{- if $ingr.enabled -}} @@ -14,24 +13,26 @@ Renders the additional ingress objects from appIngress {{- $_ := set $ "ObjectValues" (dict "appIngress" $ingressValues) -}} {{- if $ingressValues.type -}} {{- if eq $ingressValues.type "UDP" -}} - {{- include "common.classes.appIngressUDP" $ }} + {{- include "common.classes.appIngressUDP" $ | nindent 0 -}} {{- else if eq $ingressValues.type "TCP" -}} - {{- include "common.classes.appIngressTCP" $ }} + {{- include "common.classes.appIngressTCP" $ | nindent 0 -}} {{- else }} - {{- include "common.classes.appIngressHTTP" $ }} + {{- include "common.classes.appIngressHTTP" $ | nindent 0 -}} {{- if $ingressValues.authForwardURL }} - {{- include "common.classes.appAuthForward" $ }} + {{- include "common.classes.appAuthForward" $ | nindent 0 -}} {{- end }} {{- end }} {{- else }} - {{- include "common.classes.appIngressHTTP" $ }} + {{- include "common.classes.appIngressHTTP" $ | nindent 0 -}} {{- if $ingressValues.authForwardURL }} - {{- include "common.classes.appAuthForward" $ }} + {{- include "common.classes.appAuthForward" $ | nindent 0 -}} {{- end }} {{- end }} {{- $_ := set $ "ObjectValues" (dict "certHolder" $ingressValues) -}} + {- if eq $ingressValues.certType "ixcert" -}} {{- print ("---") | nindent 0 -}} - {{- include "common.resources.cert.secret" $ }} + {{- include "common.resources.cert.secret" $ | nindent 0 -}} + {{- else }} {{- end }} {{- end }} {{- end }}