DevOps/truecharts
2
0
Fork 0
Code Issues Pull Requests Actions 32 Packages Projects Releases 1 Wiki Activity

Fix issues when running multiple Ingresses (#204)

Browse Source 
Fixes: 202
This commit is contained in:
Kjeld Schouten-Lebbing
2021-03-01 18:47:55 +01:00
committed by kjeld Schouten-Lebbing
parent 3cda910be6
commit 571b417dbe
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
library/common/Chart.yaml
+1 -1
View File
@@ -1,7 +1,7 @@
apiVersion: v2 apiVersion: v2
kubeVersion: ">=1.16.0-0" kubeVersion: ">=1.16.0-0"
name: common name: common
version: 1.6.0 version: 1.6.1
# upstream_version: 3.0.1 # upstream_version: 3.0.1
# appVersion: # appVersion:
description: Function library for TrueCharts description: Function library for TrueCharts
library/common/templates/lib/resources/_appingress.tpl
+9 -8
View File
@@ -2,7 +2,6 @@
Renders the additional ingress objects from appIngress Renders the additional ingress objects from appIngress
*/}} */}}
{{- define "common.appIngress" -}} {{- define "common.appIngress" -}}
{{- /* Generate TrueNAS SCALE app services as required v1 */ -}}
{{- if .Values.appIngress -}} {{- if .Values.appIngress -}}
{{- range $name, $ingr := .Values.appIngress }} {{- range $name, $ingr := .Values.appIngress }}
{{- if $ingr.enabled -}} {{- if $ingr.enabled -}}
@@ -14,24 +13,26 @@ Renders the additional ingress objects from appIngress
{{- $_ := set $ "ObjectValues" (dict "appIngress" $ingressValues) -}} {{- $_ := set $ "ObjectValues" (dict "appIngress" $ingressValues) -}}
{{- if $ingressValues.type -}} {{- if $ingressValues.type -}}
{{- if eq $ingressValues.type "UDP" -}} {{- if eq $ingressValues.type "UDP" -}}
{{- include "common.classes.appIngressUDP" $ }} {{- include "common.classes.appIngressUDP" $ | nindent 0 -}}
{{- else if eq $ingressValues.type "TCP" -}} {{- else if eq $ingressValues.type "TCP" -}}
{{- include "common.classes.appIngressTCP" $ }} {{- include "common.classes.appIngressTCP" $ | nindent 0 -}}
{{- else }} {{- else }}
{{- include "common.classes.appIngressHTTP" $ }} {{- include "common.classes.appIngressHTTP" $ | nindent 0 -}}
{{- if $ingressValues.authForwardURL }} {{- if $ingressValues.authForwardURL }}
{{- include "common.classes.appAuthForward" $ }} {{- include "common.classes.appAuthForward" $ | nindent 0 -}}
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- else }} {{- else }}
{{- include "common.classes.appIngressHTTP" $ }} {{- include "common.classes.appIngressHTTP" $ | nindent 0 -}}
{{- if $ingressValues.authForwardURL }} {{- if $ingressValues.authForwardURL }}
{{- include "common.classes.appAuthForward" $ }} {{- include "common.classes.appAuthForward" $ | nindent 0 -}}
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- $_ := set $ "ObjectValues" (dict "certHolder" $ingressValues) -}} {{- $_ := set $ "ObjectValues" (dict "certHolder" $ingressValues) -}}
{- if eq $ingressValues.certType "ixcert" -}}
{{- print ("---") | nindent 0 -}} {{- print ("---") | nindent 0 -}}
{{- include "common.resources.cert.secret" $ }} {{- include "common.resources.cert.secret" $ | nindent 0 -}}
{{- else }}
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- end }} {{- end }}