From a8ea08cdeccf249120152bdcf75066f03ced1f74 Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Wed, 30 Jun 2021 16:30:17 +0200
Subject: [PATCH] patch middleware generation on common

---
 charts/library/common/Chart.yaml                     | 2 +-
 charts/library/common/templates/classes/_ingress.tpl | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/charts/library/common/Chart.yaml b/charts/library/common/Chart.yaml
index 15c8c6edb27..30fe10436cf 100644
--- a/charts/library/common/Chart.yaml
+++ b/charts/library/common/Chart.yaml
@@ -18,4 +18,4 @@ maintainers:
 name: common
 sources:
 type: library
-version: 6.4.1
+version: 6.4.2
diff --git a/charts/library/common/templates/classes/_ingress.tpl b/charts/library/common/templates/classes/_ingress.tpl
index 743894b1ebb..7afa32182c9 100644
--- a/charts/library/common/templates/classes/_ingress.tpl
+++ b/charts/library/common/templates/classes/_ingress.tpl
@@ -44,8 +44,10 @@ within the common library.
       {{- end }}
   {{ end }}
 
-  {{- if $fixedMiddlewares }}
+  {{- if and ( $fixedMiddlewares ) ( $middlewares ) }}
     {{ $middlewares = ( printf "%v, %v" $fixedMiddlewares $middlewares ) }}
+  {{- else if $fixedMiddlewares }}
+      {{ $middlewares = ( printf "%s" $fixedMiddlewares ) }}
   {{ end }}
 
 ---