patch middleware generation on common

2021-06-30 16:30:17 +02:00
parent 77bad93362
commit a8ea08cdec
2 changed files with 4 additions and 2 deletions
--- 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
--- 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 }}

 ---