Cloned2Preserve
/
TrueChartsClone
mirror of https://github.com/truecharts/charts.git
1
0
Fork 0
Code

Revert 202 Fix

This commit is contained in:
kjeld Schouten-Lebbing 2021-03-02 19:16:20 +01:00
parent 45555df5c2
commit 15c5d92a53
No known key found for this signature in database
GPG Key ID: 4CDAD4A532BC1EDB
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/common/Chart.yaml
View File

@ -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

16
library/common/templates/lib/resources/_appingress.tpl
View File

@ -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 }}