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

use a slightly cleaner way of generating the authForwardMiddleware Name.

Browse Source
This commit is contained in:
kjeld Schouten-Lebbing
2021-05-04 14:44:59 +02:00
parent 1b9ea26983
commit 5da466c64e
2 changed files with 5 additions and 3 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: 3.5.3 version: 3.5.4
# upstream_version: # upstream_version:
appVersion: none appVersion: none
description: Function library for TrueCharts description: Function library for TrueCharts
library/common/templates/classes/ingress/_ingress.tpl
+4 -2
View File
@@ -27,6 +27,8 @@ within the common library.
{{- $portProtocol = $.Values.services.main.port.protocol | default "" -}} {{- $portProtocol = $.Values.services.main.port.protocol | default "" -}}
{{ end -}} {{ end -}}
{{- $authForwardName := ( printf "%v-%v" $ingressName "auth-forward" ) -}}
{{- $svcName := $values.serviceName | default $ingressName -}} {{- $svcName := $values.serviceName | default $ingressName -}}
{{- if $values.dynamicServiceName }} {{- if $values.dynamicServiceName }}
@@ -53,7 +55,7 @@ metadata:
traefik.ingress.kubernetes.io/service.serversscheme: https traefik.ingress.kubernetes.io/service.serversscheme: https
{{- end }} {{- end }}
traefik.ingress.kubernetes.io/router.entrypoints: {{ $values.entrypoint | default "websecure" }} traefik.ingress.kubernetes.io/router.entrypoints: {{ $values.entrypoint | default "websecure" }}
traefik.ingress.kubernetes.io/router.middlewares: traefik-middlewares-chain-public@kubernetescrd{{ if $values.authForwardURL }},{{ $ingressName }}-auth-forward@kubernetescrd{{ end }} traefik.ingress.kubernetes.io/router.middlewares: traefik-middlewares-chain-public@kubernetescrd{{ if $values.authForwardURL }},{{ printf "%v@%v" $authForwardName "@kubernetescrd" }}{{ end }}
{{- with $values.annotations }} {{- with $values.annotations }}
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
@@ -124,7 +126,7 @@ spec:
apiVersion: traefik.containo.us/v1alpha1 apiVersion: traefik.containo.us/v1alpha1
kind: Middleware kind: Middleware
metadata: metadata:
name: {{ $ingressName }}-auth-forward name: {{ $authForwardName }}
spec: spec:
forwardAuth: forwardAuth:
address: {{ $values.authForwardURL | quote }} address: {{ $values.authForwardURL | quote }}