diff --git a/charts/incubator/traefik/Chart.yaml b/charts/incubator/traefik/Chart.yaml index 2c54749a34b..718d8dd3a54 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.4 +version: 0.0.5 diff --git a/charts/incubator/traefik/templates/middlewares/basic-middleware.yaml b/charts/incubator/traefik/templates/middlewares/basic-middleware.yaml index 652bddd05b8..59f0eaa1c22 100644 --- a/charts/incubator/traefik/templates/middlewares/basic-middleware.yaml +++ b/charts/incubator/traefik/templates/middlewares/basic-middleware.yaml @@ -1,9 +1,11 @@ +{{- $values := $values }} +{{- $namespace := {{ if or ( not $values.ingressClass.enabled ) ( and ( $values.ingressClass.enabled ) ( $values.ingressClass.isDefaultClass ) ) }}traefikmiddlewares{{ else }}ix-{{ .Release.Name }}{{ end }} }} --- apiVersion: traefik.containo.us/v1alpha1 kind: Middleware metadata: name: compress - namespace: {{ if or ( not .Values.ingressClass.enabled ) ( and ( .Values.ingressClass.enabled ) ( .Values.ingressClass.isDefaultClass ) ) }}traefikmiddlewares{{ else }}ix-{{ .Release.Name }}{{ end }} + namespace: {{ $namespace }} spec: compress: {} --- @@ -13,7 +15,7 @@ apiVersion: traefik.containo.us/v1alpha1 kind: Middleware metadata: name: basic-ratelimit - namespace: {{ if or ( not .Values.ingressClass.enabled ) ( and ( .Values.ingressClass.enabled ) ( .Values.ingressClass.isDefaultClass ) ) }}traefikmiddlewares{{ else }}ix-{{ .Release.Name }}{{ end }} + namespace: {{ $namespace }} spec: rateLimit: average: 300 @@ -23,7 +25,7 @@ apiVersion: traefik.containo.us/v1alpha1 kind: Middleware metadata: name: basic-secure-headers - namespace: {{ if or ( not .Values.ingressClass.enabled ) ( and ( .Values.ingressClass.enabled ) ( .Values.ingressClass.isDefaultClass ) ) }}traefikmiddlewares{{ else }}ix-{{ .Release.Name }}{{ end }} + namespace: {{ $namespace }} spec: headers: accessControlAllowMethods: @@ -49,7 +51,7 @@ apiVersion: traefik.containo.us/v1alpha1 kind: Middleware metadata: name: chain-basic - namespace: {{ if or ( not .Values.ingressClass.enabled ) ( and ( .Values.ingressClass.enabled ) ( .Values.ingressClass.isDefaultClass ) ) }}traefikmiddlewares{{ else }}ix-{{ .Release.Name }}{{ end }} + namespace: {{ $namespace }} spec: chain: middlewares: diff --git a/charts/incubator/traefik/templates/middlewares/basicauth.yaml b/charts/incubator/traefik/templates/middlewares/basicauth.yaml index 1d4836eab8e..e4b488e93cc 100644 --- a/charts/incubator/traefik/templates/middlewares/basicauth.yaml +++ b/charts/incubator/traefik/templates/middlewares/basicauth.yaml @@ -1,3 +1,5 @@ +{{- $values := $values }} +{{- $namespace := {{ if or ( not $values.ingressClass.enabled ) ( and ( $values.ingressClass.enabled ) ( $values.ingressClass.isDefaultClass ) ) }}traefikmiddlewares{{ else }}ix-{{ .Release.Name }}{{ end }} }} {{ range $index, $middlewareData := .Values.middlewares.basicAuth }} --- {{- $users := list }} @@ -9,7 +11,7 @@ apiVersion: v1 kind: Secret metadata: name: {{printf "%v-%v" $middlewareData.name "secret" }} - namespace: {{ if or ( not .Values.ingressClass.enabled ) ( and ( .Values.ingressClass.enabled ) ( .Values.ingressClass.isDefaultClass ) ) }}traefikmiddlewares{{ else }}ix-{{ .Release.Name }}{{ end }} + namespace: {{ $namespace }} type: Opaque stringData: users: | @@ -22,7 +24,7 @@ apiVersion: traefik.containo.us/v1alpha1 kind: Middleware metadata: name: {{ $middlewareData.name }} - namespace: {{ if or ( not .Values.ingressClass.enabled ) ( and ( .Values.ingressClass.enabled ) ( .Values.ingressClass.isDefaultClass ) ) }}traefikmiddlewares{{ else }}ix-{{ .Release.Name }}{{ end }} + namespace: {{ $namespace }} spec: basicAuth: secret: {{printf "%v-%v" $middlewareData.name "secret" }} diff --git a/charts/incubator/traefik/templates/middlewares/chain.yaml b/charts/incubator/traefik/templates/middlewares/chain.yaml index 67939a24ebe..2fd427320e8 100644 --- a/charts/incubator/traefik/templates/middlewares/chain.yaml +++ b/charts/incubator/traefik/templates/middlewares/chain.yaml @@ -1,3 +1,5 @@ +{{- $values := $values }} +{{- $namespace := {{ if or ( not $values.ingressClass.enabled ) ( and ( $values.ingressClass.enabled ) ( $values.ingressClass.isDefaultClass ) ) }}traefikmiddlewares{{ else }}ix-{{ .Release.Name }}{{ end }} }} {{ range $index, $middlewareData := .Values.middlewares.chain }} --- @@ -6,11 +8,11 @@ apiVersion: traefik.containo.us/v1alpha1 kind: Middleware metadata: name: {{ $middlewareData.name }} - namespace: {{ if or ( not .Values.ingressClass.enabled ) ( and ( .Values.ingressClass.enabled ) ( .Values.ingressClass.isDefaultClass ) ) }}traefikmiddlewares{{ else }}ix-{{ .Release.Name }}{{ end }} + namespace: {{ $namespace }} spec: chain: middlewares: - {{ range $index, $chainData := .Values.middlewares.chainmiddlewares }} - - name: {{ printf "%v-%v@%v" "traefikmiddlewares" $chainData.name "kubernetescrd" }} + {{ range $index, $chainData := . }} + - name: {{ printf "%v-%v@%v" $namespace $chainData.name "kubernetescrd" }} {{ end }} {{ end }} diff --git a/charts/incubator/traefik/templates/middlewares/forwardauth.yaml b/charts/incubator/traefik/templates/middlewares/forwardauth.yaml index 4cac7cc2cc6..db2d1478c93 100644 --- a/charts/incubator/traefik/templates/middlewares/forwardauth.yaml +++ b/charts/incubator/traefik/templates/middlewares/forwardauth.yaml @@ -1,10 +1,12 @@ +{{- $values := $values }} +{{- $namespace := {{ if or ( not $values.ingressClass.enabled ) ( and ( $values.ingressClass.enabled ) ( $values.ingressClass.isDefaultClass ) ) }}traefikmiddlewares{{ else }}ix-{{ .Release.Name }}{{ end }} }} {{ range $index, $middlewareData := .Values.middlewares.forwardAuth }} --- apiVersion: traefik.containo.us/v1alpha1 kind: Middleware metadata: name: {{ $middlewareData.name }} - namespace: {{ if or ( not .Values.ingressClass.enabled ) ( and ( .Values.ingressClass.enabled ) ( .Values.ingressClass.isDefaultClass ) ) }}traefikmiddlewares{{ else }}ix-{{ .Release.Name }}{{ end }} + namespace: {{ $namespace }} spec: forwardAuth: address: {{ $middlewareData.address }} diff --git a/charts/incubator/traefik/templates/middlewares/ratelimit.yaml b/charts/incubator/traefik/templates/middlewares/ratelimit.yaml index 65d55b909d2..732f6168cc6 100644 --- a/charts/incubator/traefik/templates/middlewares/ratelimit.yaml +++ b/charts/incubator/traefik/templates/middlewares/ratelimit.yaml @@ -1,3 +1,5 @@ +{{- $values := $values }} +{{- $namespace := {{ if or ( not $values.ingressClass.enabled ) ( and ( $values.ingressClass.enabled ) ( $values.ingressClass.isDefaultClass ) ) }}traefikmiddlewares{{ else }}ix-{{ .Release.Name }}{{ end }} }} {{ range $index, $middlewareData := .Values.middlewares.rateLimit }} --- @@ -6,7 +8,7 @@ apiVersion: traefik.containo.us/v1alpha1 kind: Middleware metadata: name: {{ $middlewareData.name }} - namespace: {{ if or ( not .Values.ingressClass.enabled ) ( and ( .Values.ingressClass.enabled ) ( .Values.ingressClass.isDefaultClass ) ) }}traefikmiddlewares{{ else }}ix-{{ .Release.Name }}{{ end }} + namespace: {{ $namespace }} spec: rateLimit: average: {{ $middlewareData.average }} diff --git a/charts/incubator/traefik/templates/middlewares/redirectScheme.yaml b/charts/incubator/traefik/templates/middlewares/redirectScheme.yaml index 715dedf8f1d..13255b12d30 100644 --- a/charts/incubator/traefik/templates/middlewares/redirectScheme.yaml +++ b/charts/incubator/traefik/templates/middlewares/redirectScheme.yaml @@ -1,3 +1,5 @@ +{{- $values := $values }} +{{- $namespace := {{ if or ( not $values.ingressClass.enabled ) ( and ( $values.ingressClass.enabled ) ( $values.ingressClass.isDefaultClass ) ) }}traefikmiddlewares{{ else }}ix-{{ .Release.Name }}{{ end }} }} {{ range $index, $middlewareData := .Values.middlewares.redirectScheme }} --- @@ -6,7 +8,7 @@ apiVersion: traefik.containo.us/v1alpha1 kind: Middleware metadata: name: {{ $middlewareData.name }} - namespace: {{ if or ( not .Values.ingressClass.enabled ) ( and ( .Values.ingressClass.enabled ) ( .Values.ingressClass.isDefaultClass ) ) }}traefikmiddlewares{{ else }}ix-{{ .Release.Name }}{{ end }} + namespace: {{ $namespace }} spec: redirectScheme: scheme: {{ $middlewareData.scheme }} diff --git a/charts/incubator/traefik/values.yaml b/charts/incubator/traefik/values.yaml index 10fada4b153..d02427ca60a 100644 --- a/charts/incubator/traefik/values.yaml +++ b/charts/incubator/traefik/values.yaml @@ -310,6 +310,7 @@ middlewares: # authResponseHeadersRegex: "^X-" # trustForwardHeader: true chain: [] + # name: chainname # middlewares: # - name: compress redirectScheme: []