move default middleware location to default namespace (#890)

charts/library/common/Chart.yaml

@@ -18,4 +18,4 @@ maintainers:
 name: common
 sources: null
 type: library
-version: 6.13.6
+version: 6.13.7

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 }}
 

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 }}

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

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 }}

charts/stable/traefik/templates/middleware-namespace.yaml

@@ -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 }}

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

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 }}
 ---

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 }}
 

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 }}
 ---

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 }}
 

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 }}