From 4e9a75557fefebfaaf02270fa671f7d47043766e Mon Sep 17 00:00:00 2001
From: Kjeld Schouten <info@kjeldschouten.nl>
Date: Sun, 2 Feb 2025 13:19:04 +0100
Subject: [PATCH] fix more bugs

---
 .../templates/lib/ingress/integrations/_traefik.tpl    | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/charts/library/common/templates/lib/ingress/integrations/_traefik.tpl b/charts/library/common/templates/lib/ingress/integrations/_traefik.tpl
index 774eb62f661..810435ca73e 100644
--- a/charts/library/common/templates/lib/ingress/integrations/_traefik.tpl
+++ b/charts/library/common/templates/lib/ingress/integrations/_traefik.tpl
@@ -23,8 +23,16 @@
     {{- $middlewares := list -}}
 
     {{/* Add the user, common and chart middlewares */}}
+    {{- if $rootCtx.Values.global.traefik.commonMiddlewares -}}
+      {{- $middlewares = concat $middlewares $rootCtx.Values.global.traefik.commonMiddlewares -}}
+    {{- end -}}
+
+    {{- if $traefik.chartMiddlewares -}}
+      {{- $middlewares = concat $middlewares $traefik.chartMiddlewares -}}
+    {{- end -}}
+
     {{- if $traefik.middlewares -}}
-      {{- $middlewares = concat $rootCtx.Values.global.traefik.commonMiddlewares $traefik.chartMiddlewares $traefik.middlewares -}}
+      {{- $middlewares = concat $middlewares $traefik.middlewares -}}
     {{- end -}}
 
     {{/* Make sure we dont have dupes */}}