diff --git a/charts/incubator/traefik/Chart.yaml b/charts/incubator/traefik/Chart.yaml index 718d8dd3a54..32a9d9d7e80 100644 --- a/charts/incubator/traefik/Chart.yaml +++ b/charts/incubator/traefik/Chart.yaml @@ -22,4 +22,4 @@ sources: - https://github.com/traefik/traefik-helm-chart - https://traefik.io/ type: application -version: 0.0.5 +version: 0.0.6 diff --git a/charts/incubator/traefik/templates/middlewares/basic-middleware.yaml b/charts/incubator/traefik/templates/middlewares/basic-middleware.yaml index 59f0eaa1c22..8551a168535 100644 --- a/charts/incubator/traefik/templates/middlewares/basic-middleware.yaml +++ b/charts/incubator/traefik/templates/middlewares/basic-middleware.yaml @@ -1,5 +1,8 @@ -{{- $values := $values }} -{{- $namespace := {{ if or ( not $values.ingressClass.enabled ) ( and ( $values.ingressClass.enabled ) ( $values.ingressClass.isDefaultClass ) ) }}traefikmiddlewares{{ else }}ix-{{ .Release.Name }}{{ end }} }} +{{- $values := .Values }} +{{- $namespace := "traefikmiddlewares" }} +{{- if or ( not .Values.ingressClass.enabled ) ( and ( .Values.ingressClass.enabled ) ( .Values.ingressClass.isDefaultClass ) ) }} +{{- $namespace = ( printf "ix-%s" .Release.Name ) }} +{{- end }} --- apiVersion: traefik.containo.us/v1alpha1 kind: Middleware diff --git a/charts/incubator/traefik/templates/middlewares/basicauth.yaml b/charts/incubator/traefik/templates/middlewares/basicauth.yaml index e4b488e93cc..8e2429005f9 100644 --- a/charts/incubator/traefik/templates/middlewares/basicauth.yaml +++ b/charts/incubator/traefik/templates/middlewares/basicauth.yaml @@ -1,5 +1,8 @@ -{{- $values := $values }} -{{- $namespace := {{ if or ( not $values.ingressClass.enabled ) ( and ( $values.ingressClass.enabled ) ( $values.ingressClass.isDefaultClass ) ) }}traefikmiddlewares{{ else }}ix-{{ .Release.Name }}{{ end }} }} +{{- $values := .Values }} +{{- $namespace := "traefikmiddlewares" }} +{{- if or ( not .Values.ingressClass.enabled ) ( and ( .Values.ingressClass.enabled ) ( .Values.ingressClass.isDefaultClass ) ) }} +{{- $namespace = ( printf "ix-%s" .Release.Name ) }} +{{- end }} {{ range $index, $middlewareData := .Values.middlewares.basicAuth }} --- {{- $users := list }} diff --git a/charts/incubator/traefik/templates/middlewares/chain.yaml b/charts/incubator/traefik/templates/middlewares/chain.yaml index 2fd427320e8..75a0e9f6a35 100644 --- a/charts/incubator/traefik/templates/middlewares/chain.yaml +++ b/charts/incubator/traefik/templates/middlewares/chain.yaml @@ -1,5 +1,8 @@ -{{- $values := $values }} -{{- $namespace := {{ if or ( not $values.ingressClass.enabled ) ( and ( $values.ingressClass.enabled ) ( $values.ingressClass.isDefaultClass ) ) }}traefikmiddlewares{{ else }}ix-{{ .Release.Name }}{{ end }} }} +{{- $values := .Values }} +{{- $namespace := "traefikmiddlewares" }} +{{- if or ( not .Values.ingressClass.enabled ) ( and ( .Values.ingressClass.enabled ) ( .Values.ingressClass.isDefaultClass ) ) }} +{{- $namespace = ( printf "ix-%s" .Release.Name ) }} +{{- end }} {{ range $index, $middlewareData := .Values.middlewares.chain }} --- diff --git a/charts/incubator/traefik/templates/middlewares/forwardauth.yaml b/charts/incubator/traefik/templates/middlewares/forwardauth.yaml index db2d1478c93..bac2ea025f1 100644 --- a/charts/incubator/traefik/templates/middlewares/forwardauth.yaml +++ b/charts/incubator/traefik/templates/middlewares/forwardauth.yaml @@ -1,5 +1,8 @@ -{{- $values := $values }} -{{- $namespace := {{ if or ( not $values.ingressClass.enabled ) ( and ( $values.ingressClass.enabled ) ( $values.ingressClass.isDefaultClass ) ) }}traefikmiddlewares{{ else }}ix-{{ .Release.Name }}{{ end }} }} +{{- $values := .Values }} +{{- $namespace := "traefikmiddlewares" }} +{{- if or ( not .Values.ingressClass.enabled ) ( and ( .Values.ingressClass.enabled ) ( .Values.ingressClass.isDefaultClass ) ) }} +{{- $namespace = ( printf "ix-%s" .Release.Name ) }} +{{- end }} {{ range $index, $middlewareData := .Values.middlewares.forwardAuth }} --- apiVersion: traefik.containo.us/v1alpha1 diff --git a/charts/incubator/traefik/templates/middlewares/ratelimit.yaml b/charts/incubator/traefik/templates/middlewares/ratelimit.yaml index 732f6168cc6..2984f94ab4e 100644 --- a/charts/incubator/traefik/templates/middlewares/ratelimit.yaml +++ b/charts/incubator/traefik/templates/middlewares/ratelimit.yaml @@ -1,5 +1,8 @@ -{{- $values := $values }} -{{- $namespace := {{ if or ( not $values.ingressClass.enabled ) ( and ( $values.ingressClass.enabled ) ( $values.ingressClass.isDefaultClass ) ) }}traefikmiddlewares{{ else }}ix-{{ .Release.Name }}{{ end }} }} +{{- $values := .Values }} +{{- $namespace := "traefikmiddlewares" }} +{{- if or ( not .Values.ingressClass.enabled ) ( and ( .Values.ingressClass.enabled ) ( .Values.ingressClass.isDefaultClass ) ) }} +{{- $namespace = ( printf "ix-%s" .Release.Name ) }} +{{- end }} {{ range $index, $middlewareData := .Values.middlewares.rateLimit }} --- diff --git a/charts/incubator/traefik/templates/middlewares/redirectScheme.yaml b/charts/incubator/traefik/templates/middlewares/redirectScheme.yaml index 13255b12d30..a7a5e639252 100644 --- a/charts/incubator/traefik/templates/middlewares/redirectScheme.yaml +++ b/charts/incubator/traefik/templates/middlewares/redirectScheme.yaml @@ -1,5 +1,8 @@ -{{- $values := $values }} -{{- $namespace := {{ if or ( not $values.ingressClass.enabled ) ( and ( $values.ingressClass.enabled ) ( $values.ingressClass.isDefaultClass ) ) }}traefikmiddlewares{{ else }}ix-{{ .Release.Name }}{{ end }} }} +{{- $values := .Values }} +{{- $namespace := "traefikmiddlewares" }} +{{- if or ( not .Values.ingressClass.enabled ) ( and ( .Values.ingressClass.enabled ) ( .Values.ingressClass.isDefaultClass ) ) }} +{{- $namespace = ( printf "ix-%s" .Release.Name ) }} +{{- end }} {{ range $index, $middlewareData := .Values.middlewares.redirectScheme }} ---