From 5da466c64ebf7ec3d14c26e045beade712fe5594 Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Tue, 4 May 2021 14:44:59 +0200
Subject: [PATCH] use a slightly cleaner way of generating the
 authForwardMiddleware Name.

---
 library/common/Chart.yaml                             | 2 +-
 library/common/templates/classes/ingress/_ingress.tpl | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/library/common/Chart.yaml b/library/common/Chart.yaml
index 7b34e673f42..4cea053ced6 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: 3.5.3
+version: 3.5.4
 # upstream_version:
 appVersion: none
 description: Function library for TrueCharts
diff --git a/library/common/templates/classes/ingress/_ingress.tpl b/library/common/templates/classes/ingress/_ingress.tpl
index 4ec7a533700..497da3a114e 100644
--- a/library/common/templates/classes/ingress/_ingress.tpl
+++ b/library/common/templates/classes/ingress/_ingress.tpl
@@ -27,6 +27,8 @@ within the common library.
   {{- $portProtocol = $.Values.services.main.port.protocol | default "" -}}
 {{ end -}}
 
+{{- $authForwardName := ( printf "%v-%v" $ingressName "auth-forward" ) -}}
+
 {{- $svcName := $values.serviceName | default $ingressName -}}
 
 {{- if $values.dynamicServiceName }}
@@ -53,7 +55,7 @@ metadata:
     traefik.ingress.kubernetes.io/service.serversscheme: https
     {{- end }}
     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 }}
       {{- toYaml . | nindent 4 }}
     {{- end }}
@@ -124,7 +126,7 @@ spec:
 apiVersion: traefik.containo.us/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ $ingressName }}-auth-forward
+  name: {{ $authForwardName }}
 spec:
   forwardAuth:
     address: {{ $values.authForwardURL | quote }}