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

Revert 202 Fix

Browse Source
This commit is contained in:
kjeld Schouten-Lebbing
2021-03-02 19:16:20 +01:00
parent 45555df5c2
commit 15c5d92a53
2 changed files with 8 additions and 10 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.1 version: 1.6.2
# 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
+7 -9
View File
@@ -13,26 +13,24 @@ 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" $ | nindent 0 -}} {{- include "common.classes.appIngressUDP" $ }}
{{- else if eq $ingressValues.type "TCP" -}} {{- else if eq $ingressValues.type "TCP" -}}
{{- include "common.classes.appIngressTCP" $ | nindent 0 -}} {{- include "common.classes.appIngressTCP" $ }}
{{- else }} {{- else }}
{{- include "common.classes.appIngressHTTP" $ | nindent 0 -}} {{- include "common.classes.appIngressHTTP" $ }}
{{- if $ingressValues.authForwardURL }} {{- if $ingressValues.authForwardURL }}
{{- include "common.classes.appAuthForward" $ | nindent 0 -}} {{- include "common.classes.appAuthForward" $ }}
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- else }} {{- else }}
{{- include "common.classes.appIngressHTTP" $ | nindent 0 -}} {{- include "common.classes.appIngressHTTP" $ }}
{{- if $ingressValues.authForwardURL }} {{- if $ingressValues.authForwardURL }}
{{- include "common.classes.appAuthForward" $ | nindent 0 -}} {{- include "common.classes.appAuthForward" $ }}
{{- 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" $ | nindent 0 -}} {{- include "common.resources.cert.secret" $ }}
{{- else }}
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- end }} {{- end }}