From 353a4337fee6a90092aa6fa07ca0b87c9310b071 Mon Sep 17 00:00:00 2001
From: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Sat, 4 Sep 2021 11:07:09 +0200
Subject: [PATCH] move default middleware location to default namespace (#890)

---
 charts/library/common/Chart.yaml                    |  2 +-
 .../library/common/templates/classes/_ingress.tpl   | 13 +++++++++----
 .../library/common/templates/configmaps/_portal.tpl |  3 +--
 charts/stable/traefik/Chart.yaml                    |  2 +-
 charts/stable/traefik/templates/_portalhook.tpl     |  3 +--
 .../traefik/templates/middleware-namespace.yaml     |  7 -------
 .../templates/middlewares/basic-middleware.yaml     |  2 +-
 .../traefik/templates/middlewares/basicauth.yaml    |  2 +-
 .../stable/traefik/templates/middlewares/chain.yaml |  2 +-
 .../traefik/templates/middlewares/forwardauth.yaml  |  2 +-
 .../traefik/templates/middlewares/ratelimit.yaml    |  2 +-
 .../templates/middlewares/redirectScheme.yaml       |  2 +-
 12 files changed, 19 insertions(+), 23 deletions(-)
 delete mode 100644 charts/stable/traefik/templates/middleware-namespace.yaml

diff --git a/charts/library/common/Chart.yaml b/charts/library/common/Chart.yaml
index 74b44dccd04..0b917ebf1fc 100644
--- a/charts/library/common/Chart.yaml
+++ b/charts/library/common/Chart.yaml
@@ -18,4 +18,4 @@ maintainers:
 name: common
 sources: null
 type: library
-version: 6.13.6
+version: 6.13.7
diff --git a/charts/library/common/templates/classes/_ingress.tpl b/charts/library/common/templates/classes/_ingress.tpl
index 000156e5d89..f82a62a36de 100644
--- a/charts/library/common/templates/classes/_ingress.tpl
+++ b/charts/library/common/templates/classes/_ingress.tpl
@@ -26,21 +26,26 @@ within the common library.
 
   {{- $isStable := include "common.capabilities.ingress.isStable" . }}
 
+  {{- $mddwrNamespace := "default" }}
+  {{- if $values.ingressClassName }}
+  {{- $mddwrNamespace := ( printf "ix-%s" $values.ingressClassName ) }}
+  {{- end }}
+
   {{- $fixedMiddlewares := "" }}
   {{ range $index, $fixedMiddleware := $values.fixedMiddlewares }}
       {{- if $index }}
-      {{ $fixedMiddlewares = ( printf "%v, %v-%v@%v" $fixedMiddlewares "traefikmiddlewares" $fixedMiddleware "kubernetescrd" ) }}
+      {{ $fixedMiddlewares = ( printf "%v, %v-%v@%v" $fixedMiddlewares $mddwrNamespace $fixedMiddleware "kubernetescrd" ) }}
       {{- else }}
-      {{ $fixedMiddlewares = ( printf "%v-%v@%v" "traefikmiddlewares" $fixedMiddleware "kubernetescrd" ) }}
+      {{ $fixedMiddlewares = ( printf "%v-%v@%v" $mddwrNamespace $fixedMiddleware "kubernetescrd" ) }}
       {{- end }}
   {{ end }}
 
   {{- $middlewares := "" }}
   {{ range $index, $middleware := $values.middlewares }}
       {{- if $index }}
-      {{ $middlewares = ( printf "%v, %v-%v@%v" $middlewares "traefikmiddlewares" $middleware "kubernetescrd" ) }}
+      {{ $middlewares = ( printf "%v, %v-%v@%v" $middlewares $mddwrNamespace $middleware "kubernetescrd" ) }}
       {{- else }}
-      {{ $middlewares = ( printf "%v-%v@%v" "traefikmiddlewares" $middleware "kubernetescrd" ) }}
+      {{ $middlewares = ( printf "%v-%v@%v" $mddwrNamespace $middleware "kubernetescrd" ) }}
       {{- end }}
   {{ end }}
 
diff --git a/charts/library/common/templates/configmaps/_portal.tpl b/charts/library/common/templates/configmaps/_portal.tpl
index 9889ddb62ed..d05f214b496 100644
--- a/charts/library/common/templates/configmaps/_portal.tpl
+++ b/charts/library/common/templates/configmaps/_portal.tpl
@@ -28,8 +28,7 @@
   {{- end }}
 {{- end }}
 
-{{- $namespace := "traefikmiddlewares" }}
-
+{{- $namespace := "default" }}
 {{- if $ingr.ingressClassName }}
 {{- $namespace := ( printf "ix-%s" $ingr.ingressClassName ) }}
 {{- end }}
diff --git a/charts/stable/traefik/Chart.yaml b/charts/stable/traefik/Chart.yaml
index 29fbb6fc615..19612d10d38 100644
--- a/charts/stable/traefik/Chart.yaml
+++ b/charts/stable/traefik/Chart.yaml
@@ -22,4 +22,4 @@ sources:
 - https://github.com/traefik/traefik-helm-chart
 - https://traefik.io/
 type: application
-version: 7.0.2
+version: 7.0.3
diff --git a/charts/stable/traefik/templates/_portalhook.tpl b/charts/stable/traefik/templates/_portalhook.tpl
index 6d12bc39776..e3586c5d4e9 100644
--- a/charts/stable/traefik/templates/_portalhook.tpl
+++ b/charts/stable/traefik/templates/_portalhook.tpl
@@ -3,7 +3,7 @@
 {{- if .Values.portalhook.enabled }}
 {{- $namespace := ( printf "ix-%s" .Release.Name ) }}
 {{- if or ( not .Values.ingressClass.enabled ) ( and ( .Values.ingressClass.enabled ) ( .Values.ingressClass.isDefaultClass ) ) }}
-{{- $namespace = "traefikmiddlewares" }}
+{{- $namespace = "default" }}
 {{- end }}
 ---
 
@@ -19,7 +19,6 @@ data:
   {{- $_ := set $ports $name $value }}
   {{- end }}
   {{- end }}
-  websecureport: {{ $ports.websecure.exposedPort | quote }}
   {{- range $name, $value := $ports }}
   {{ $name }}: {{ $value.port | quote }}
   {{- end }}
diff --git a/charts/stable/traefik/templates/middleware-namespace.yaml b/charts/stable/traefik/templates/middleware-namespace.yaml
deleted file mode 100644
index 43d2728446f..00000000000
--- a/charts/stable/traefik/templates/middleware-namespace.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-{{- if or ( not .Values.ingressClass.enabled ) ( and ( .Values.ingressClass.enabled ) ( .Values.ingressClass.isDefaultClass ) ) }}
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: traefikmiddlewares
-  namespace: traefikmiddlewares
-{{- end }}
diff --git a/charts/stable/traefik/templates/middlewares/basic-middleware.yaml b/charts/stable/traefik/templates/middlewares/basic-middleware.yaml
index e50f00c98d8..145f5c9a594 100644
--- a/charts/stable/traefik/templates/middlewares/basic-middleware.yaml
+++ b/charts/stable/traefik/templates/middlewares/basic-middleware.yaml
@@ -1,7 +1,7 @@
 {{- $values := .Values }}
 {{- $namespace := ( printf "ix-%s" .Release.Name ) }}
 {{- if or ( not .Values.ingressClass.enabled ) ( and ( .Values.ingressClass.enabled ) ( .Values.ingressClass.isDefaultClass ) ) }}
-{{- $namespace = "traefikmiddlewares" }}
+{{- $namespace = "default" }}
 {{- end }}
 ---
 apiVersion: traefik.containo.us/v1alpha1
diff --git a/charts/stable/traefik/templates/middlewares/basicauth.yaml b/charts/stable/traefik/templates/middlewares/basicauth.yaml
index 54dacb824ff..ccb541742f0 100644
--- a/charts/stable/traefik/templates/middlewares/basicauth.yaml
+++ b/charts/stable/traefik/templates/middlewares/basicauth.yaml
@@ -1,7 +1,7 @@
 {{- $values := .Values }}
 {{- $namespace := ( printf "ix-%s" .Release.Name ) }}
 {{- if or ( not .Values.ingressClass.enabled ) ( and ( .Values.ingressClass.enabled ) ( .Values.ingressClass.isDefaultClass ) ) }}
-{{- $namespace = "traefikmiddlewares" }}
+{{- $namespace = "default" }}
 {{- end }}
 {{ range $index, $middlewareData := .Values.middlewares.basicAuth }}
 ---
diff --git a/charts/stable/traefik/templates/middlewares/chain.yaml b/charts/stable/traefik/templates/middlewares/chain.yaml
index 49dfd9610ef..e22eb312207 100644
--- a/charts/stable/traefik/templates/middlewares/chain.yaml
+++ b/charts/stable/traefik/templates/middlewares/chain.yaml
@@ -1,7 +1,7 @@
 {{- $values := .Values }}
 {{- $namespace := ( printf "ix-%s" .Release.Name ) }}
 {{- if or ( not .Values.ingressClass.enabled ) ( and ( .Values.ingressClass.enabled ) ( .Values.ingressClass.isDefaultClass ) ) }}
-{{- $namespace = "traefikmiddlewares" }}
+{{- $namespace = "default" }}
 {{- end }}
 {{ range $index, $middlewareData := .Values.middlewares.chain }}
 
diff --git a/charts/stable/traefik/templates/middlewares/forwardauth.yaml b/charts/stable/traefik/templates/middlewares/forwardauth.yaml
index 654eb8a6cb9..53f4ef5cc18 100644
--- a/charts/stable/traefik/templates/middlewares/forwardauth.yaml
+++ b/charts/stable/traefik/templates/middlewares/forwardauth.yaml
@@ -1,7 +1,7 @@
 {{- $values := .Values }}
 {{- $namespace := ( printf "ix-%s" .Release.Name ) }}
 {{- if or ( not .Values.ingressClass.enabled ) ( and ( .Values.ingressClass.enabled ) ( .Values.ingressClass.isDefaultClass ) ) }}
-{{- $namespace = "traefikmiddlewares" }}
+{{- $namespace = "default" }}
 {{- end }}
 {{ range $index, $middlewareData := .Values.middlewares.forwardAuth }}
 ---
diff --git a/charts/stable/traefik/templates/middlewares/ratelimit.yaml b/charts/stable/traefik/templates/middlewares/ratelimit.yaml
index 624e7ff0d34..144b9d8bf38 100644
--- a/charts/stable/traefik/templates/middlewares/ratelimit.yaml
+++ b/charts/stable/traefik/templates/middlewares/ratelimit.yaml
@@ -1,7 +1,7 @@
 {{- $values := .Values }}
 {{- $namespace := ( printf "ix-%s" .Release.Name ) }}
 {{- if or ( not .Values.ingressClass.enabled ) ( and ( .Values.ingressClass.enabled ) ( .Values.ingressClass.isDefaultClass ) ) }}
-{{- $namespace = "traefikmiddlewares" }}
+{{- $namespace = "default" }}
 {{- end }}
 {{ range $index, $middlewareData := .Values.middlewares.rateLimit }}
 
diff --git a/charts/stable/traefik/templates/middlewares/redirectScheme.yaml b/charts/stable/traefik/templates/middlewares/redirectScheme.yaml
index 9ff49d76186..f2413f84e19 100644
--- a/charts/stable/traefik/templates/middlewares/redirectScheme.yaml
+++ b/charts/stable/traefik/templates/middlewares/redirectScheme.yaml
@@ -1,7 +1,7 @@
 {{- $values := .Values }}
 {{- $namespace := ( printf "ix-%s" .Release.Name ) }}
 {{- if or ( not .Values.ingressClass.enabled ) ( and ( .Values.ingressClass.enabled ) ( .Values.ingressClass.isDefaultClass ) ) }}
-{{- $namespace = "traefikmiddlewares" }}
+{{- $namespace = "default" }}
 {{- end }}
 {{ range $index, $middlewareData := .Values.middlewares.redirectScheme }}