diff --git a/charts/incubator/traefik/Chart.yaml b/charts/incubator/traefik/Chart.yaml index 32a9d9d7e80..67e509cc22f 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.6 +version: 0.0.7 diff --git a/charts/incubator/traefik/templates/_ingressclass.tpl b/charts/incubator/traefik/templates/_ingressclass.tpl index f558e2ce8ae..27f8467fc9e 100644 --- a/charts/incubator/traefik/templates/_ingressclass.tpl +++ b/charts/incubator/traefik/templates/_ingressclass.tpl @@ -1,6 +1,15 @@ {{/* Define the ingressClass */}} {{- define "traefik.ingressClass" -}} {{- if .Values.ingressClass.enabled }} + {{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1/IngressClass" }} +apiVersion: networking.k8s.io/v1 + {{- else if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1/IngressClass" }} +apiVersion: networking.k8s.io/v1beta1 + {{- else if or (eq .Values.ingressClass.fallbackApiVersion "v1beta1") (eq .Values.ingressClass.fallbackApiVersion "v1") }} +apiVersion: {{ printf "networking.k8s.io/%s" .Values.ingressClass.fallbackApiVersion }} + {{- else }} + {{- fail "\n\n ERROR: You must have at least networking.k8s.io/v1beta1 to use ingressClass" }} + {{- end }} --- kind: IngressClass metadata: diff --git a/charts/incubator/traefik/templates/middlewares/basic-middleware.yaml b/charts/incubator/traefik/templates/middlewares/basic-middleware.yaml index 8551a168535..e50f00c98d8 100644 --- a/charts/incubator/traefik/templates/middlewares/basic-middleware.yaml +++ b/charts/incubator/traefik/templates/middlewares/basic-middleware.yaml @@ -1,7 +1,7 @@ {{- $values := .Values }} -{{- $namespace := "traefikmiddlewares" }} +{{- $namespace := ( printf "ix-%s" .Release.Name ) }} {{- if or ( not .Values.ingressClass.enabled ) ( and ( .Values.ingressClass.enabled ) ( .Values.ingressClass.isDefaultClass ) ) }} -{{- $namespace = ( printf "ix-%s" .Release.Name ) }} +{{- $namespace = "traefikmiddlewares" }} {{- end }} --- apiVersion: traefik.containo.us/v1alpha1 diff --git a/charts/incubator/traefik/templates/middlewares/basicauth.yaml b/charts/incubator/traefik/templates/middlewares/basicauth.yaml index 8e2429005f9..54dacb824ff 100644 --- a/charts/incubator/traefik/templates/middlewares/basicauth.yaml +++ b/charts/incubator/traefik/templates/middlewares/basicauth.yaml @@ -1,7 +1,7 @@ {{- $values := .Values }} -{{- $namespace := "traefikmiddlewares" }} +{{- $namespace := ( printf "ix-%s" .Release.Name ) }} {{- if or ( not .Values.ingressClass.enabled ) ( and ( .Values.ingressClass.enabled ) ( .Values.ingressClass.isDefaultClass ) ) }} -{{- $namespace = ( printf "ix-%s" .Release.Name ) }} +{{- $namespace = "traefikmiddlewares" }} {{- end }} {{ range $index, $middlewareData := .Values.middlewares.basicAuth }} --- diff --git a/charts/incubator/traefik/templates/middlewares/chain.yaml b/charts/incubator/traefik/templates/middlewares/chain.yaml index 75a0e9f6a35..49dfd9610ef 100644 --- a/charts/incubator/traefik/templates/middlewares/chain.yaml +++ b/charts/incubator/traefik/templates/middlewares/chain.yaml @@ -1,7 +1,7 @@ {{- $values := .Values }} -{{- $namespace := "traefikmiddlewares" }} +{{- $namespace := ( printf "ix-%s" .Release.Name ) }} {{- if or ( not .Values.ingressClass.enabled ) ( and ( .Values.ingressClass.enabled ) ( .Values.ingressClass.isDefaultClass ) ) }} -{{- $namespace = ( printf "ix-%s" .Release.Name ) }} +{{- $namespace = "traefikmiddlewares" }} {{- 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 bac2ea025f1..654eb8a6cb9 100644 --- a/charts/incubator/traefik/templates/middlewares/forwardauth.yaml +++ b/charts/incubator/traefik/templates/middlewares/forwardauth.yaml @@ -1,7 +1,7 @@ {{- $values := .Values }} -{{- $namespace := "traefikmiddlewares" }} +{{- $namespace := ( printf "ix-%s" .Release.Name ) }} {{- if or ( not .Values.ingressClass.enabled ) ( and ( .Values.ingressClass.enabled ) ( .Values.ingressClass.isDefaultClass ) ) }} -{{- $namespace = ( printf "ix-%s" .Release.Name ) }} +{{- $namespace = "traefikmiddlewares" }} {{- end }} {{ range $index, $middlewareData := .Values.middlewares.forwardAuth }} --- diff --git a/charts/incubator/traefik/templates/middlewares/ratelimit.yaml b/charts/incubator/traefik/templates/middlewares/ratelimit.yaml index 2984f94ab4e..624e7ff0d34 100644 --- a/charts/incubator/traefik/templates/middlewares/ratelimit.yaml +++ b/charts/incubator/traefik/templates/middlewares/ratelimit.yaml @@ -1,7 +1,7 @@ {{- $values := .Values }} -{{- $namespace := "traefikmiddlewares" }} +{{- $namespace := ( printf "ix-%s" .Release.Name ) }} {{- if or ( not .Values.ingressClass.enabled ) ( and ( .Values.ingressClass.enabled ) ( .Values.ingressClass.isDefaultClass ) ) }} -{{- $namespace = ( printf "ix-%s" .Release.Name ) }} +{{- $namespace = "traefikmiddlewares" }} {{- 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 a7a5e639252..9ff49d76186 100644 --- a/charts/incubator/traefik/templates/middlewares/redirectScheme.yaml +++ b/charts/incubator/traefik/templates/middlewares/redirectScheme.yaml @@ -1,7 +1,7 @@ {{- $values := .Values }} -{{- $namespace := "traefikmiddlewares" }} +{{- $namespace := ( printf "ix-%s" .Release.Name ) }} {{- if or ( not .Values.ingressClass.enabled ) ( and ( .Values.ingressClass.enabled ) ( .Values.ingressClass.isDefaultClass ) ) }} -{{- $namespace = ( printf "ix-%s" .Release.Name ) }} +{{- $namespace = "traefikmiddlewares" }} {{- end }} {{ range $index, $middlewareData := .Values.middlewares.redirectScheme }}