From 489e31d7f0efd943f0ede3434f2067a538dfb597 Mon Sep 17 00:00:00 2001
From: ties <ties@noreply.git.ties.one>
Date: Thu, 29 Aug 2024 09:35:33 +0000
Subject: [PATCH] Update templates/traefik.yaml

---
 templates/traefik.yaml | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/templates/traefik.yaml b/templates/traefik.yaml
index f1e090b..4b7ff02 100644
--- a/templates/traefik.yaml
+++ b/templates/traefik.yaml
@@ -15,7 +15,14 @@ spec:
         - name: {{ .Values.expose.service.name }}
           port: {{ .Values.expose.service.port }}
           namespace: {{ .Values.namespace }}
-{{ if has "authentik" .Values.expose.middlewares }}
+
+{{- $authentikMiddleware := false }}
+{{- range .Values.expose.middlewares }}
+  {{- if eq .name "authentik" }}
+    {{- $authentikMiddleware = true }}
+  {{- end }}
+{{- end }}
+{{- if $authentikMiddleware }}
 ---
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
@@ -26,7 +33,7 @@ spec:
   forwardAuth:
 {{- $regexArray := mustRegexFindAll "Host[(]`[^`]+`[)]" .Values.expose.match -1 }}
 {{- $firstHost := index $regexArray 0 }}
-{{- $hostname := regexReplaceAll ".+`([^`]+)`.+" $firstHost "$1"}}
+{{- $hostname := regexReplaceAll ".+`([^`]+)`.?" $firstHost "$1"}}
     address: https://{{ $hostname }}/outpost.goauthentik.io/auth/traefik
     authResponseHeaders:
       - X-authentik-username
@@ -41,4 +48,4 @@ spec:
       - X-authentik-meta-app
       - X-authentik-meta-version
     trustForwardHeader: true
-{{ end }}
\ No newline at end of file
+{{- end }}
\ No newline at end of file