DevOps/truecharts
2
0
Fork 0
Code Issues Pull Requests Actions 29 Packages Projects Releases 1 Wiki Activity

Fix traefik ingressclass and middlewares

Browse Source
This commit is contained in:
kjeld Schouten-Lebbing
2021-09-03 20:33:31 +02:00
parent 6f542a9dcd
commit a5530f8d2b
8 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
charts/incubator/traefik/Chart.yaml
+1 -1
View File
@@ -22,4 +22,4 @@ sources:
- https://github.com/traefik/traefik-helm-chart - https://github.com/traefik/traefik-helm-chart
- https://traefik.io/ - https://traefik.io/
type: application type: application
version: 0.0.6 version: 0.0.7
charts/incubator/traefik/templates/_ingressclass.tpl
+9
View File
@@ -1,6 +1,15 @@
{{/* Define the ingressClass */}} {{/* Define the ingressClass */}}
{{- define "traefik.ingressClass" -}} {{- define "traefik.ingressClass" -}}
{{- if .Values.ingressClass.enabled }} {{- 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 kind: IngressClass
metadata: metadata:
charts/incubator/traefik/templates/middlewares/basic-middleware.yaml
+2 -2
View File
@@ -1,7 +1,7 @@
{{- $values := .Values }} {{- $values := .Values }}
{{- $namespace := "traefikmiddlewares" }} {{- $namespace := ( printf "ix-%s" .Release.Name ) }}
{{- if or ( not .Values.ingressClass.enabled ) ( and ( .Values.ingressClass.enabled ) ( .Values.ingressClass.isDefaultClass ) ) }} {{- if or ( not .Values.ingressClass.enabled ) ( and ( .Values.ingressClass.enabled ) ( .Values.ingressClass.isDefaultClass ) ) }}
{{- $namespace = ( printf "ix-%s" .Release.Name ) }} {{- $namespace = "traefikmiddlewares" }}
{{- end }} {{- end }}
--- ---
apiVersion: traefik.containo.us/v1alpha1 apiVersion: traefik.containo.us/v1alpha1
charts/incubator/traefik/templates/middlewares/basicauth.yaml
+2 -2
View File
@@ -1,7 +1,7 @@
{{- $values := .Values }} {{- $values := .Values }}
{{- $namespace := "traefikmiddlewares" }} {{- $namespace := ( printf "ix-%s" .Release.Name ) }}
{{- if or ( not .Values.ingressClass.enabled ) ( and ( .Values.ingressClass.enabled ) ( .Values.ingressClass.isDefaultClass ) ) }} {{- if or ( not .Values.ingressClass.enabled ) ( and ( .Values.ingressClass.enabled ) ( .Values.ingressClass.isDefaultClass ) ) }}
{{- $namespace = ( printf "ix-%s" .Release.Name ) }} {{- $namespace = "traefikmiddlewares" }}
{{- end }} {{- end }}
{{ range $index, $middlewareData := .Values.middlewares.basicAuth }} {{ range $index, $middlewareData := .Values.middlewares.basicAuth }}
--- ---
charts/incubator/traefik/templates/middlewares/chain.yaml
+2 -2
View File
@@ -1,7 +1,7 @@
{{- $values := .Values }} {{- $values := .Values }}
{{- $namespace := "traefikmiddlewares" }} {{- $namespace := ( printf "ix-%s" .Release.Name ) }}
{{- if or ( not .Values.ingressClass.enabled ) ( and ( .Values.ingressClass.enabled ) ( .Values.ingressClass.isDefaultClass ) ) }} {{- if or ( not .Values.ingressClass.enabled ) ( and ( .Values.ingressClass.enabled ) ( .Values.ingressClass.isDefaultClass ) ) }}
{{- $namespace = ( printf "ix-%s" .Release.Name ) }} {{- $namespace = "traefikmiddlewares" }}
{{- end }} {{- end }}
{{ range $index, $middlewareData := .Values.middlewares.chain }} {{ range $index, $middlewareData := .Values.middlewares.chain }}
charts/incubator/traefik/templates/middlewares/forwardauth.yaml
+2 -2
View File
@@ -1,7 +1,7 @@
{{- $values := .Values }} {{- $values := .Values }}
{{- $namespace := "traefikmiddlewares" }} {{- $namespace := ( printf "ix-%s" .Release.Name ) }}
{{- if or ( not .Values.ingressClass.enabled ) ( and ( .Values.ingressClass.enabled ) ( .Values.ingressClass.isDefaultClass ) ) }} {{- if or ( not .Values.ingressClass.enabled ) ( and ( .Values.ingressClass.enabled ) ( .Values.ingressClass.isDefaultClass ) ) }}
{{- $namespace = ( printf "ix-%s" .Release.Name ) }} {{- $namespace = "traefikmiddlewares" }}
{{- end }} {{- end }}
{{ range $index, $middlewareData := .Values.middlewares.forwardAuth }} {{ range $index, $middlewareData := .Values.middlewares.forwardAuth }}
--- ---
charts/incubator/traefik/templates/middlewares/ratelimit.yaml
+2 -2
View File
@@ -1,7 +1,7 @@
{{- $values := .Values }} {{- $values := .Values }}
{{- $namespace := "traefikmiddlewares" }} {{- $namespace := ( printf "ix-%s" .Release.Name ) }}
{{- if or ( not .Values.ingressClass.enabled ) ( and ( .Values.ingressClass.enabled ) ( .Values.ingressClass.isDefaultClass ) ) }} {{- if or ( not .Values.ingressClass.enabled ) ( and ( .Values.ingressClass.enabled ) ( .Values.ingressClass.isDefaultClass ) ) }}
{{- $namespace = ( printf "ix-%s" .Release.Name ) }} {{- $namespace = "traefikmiddlewares" }}
{{- end }} {{- end }}
{{ range $index, $middlewareData := .Values.middlewares.rateLimit }} {{ range $index, $middlewareData := .Values.middlewares.rateLimit }}
charts/incubator/traefik/templates/middlewares/redirectScheme.yaml
+2 -2
View File
@@ -1,7 +1,7 @@
{{- $values := .Values }} {{- $values := .Values }}
{{- $namespace := "traefikmiddlewares" }} {{- $namespace := ( printf "ix-%s" .Release.Name ) }}
{{- if or ( not .Values.ingressClass.enabled ) ( and ( .Values.ingressClass.enabled ) ( .Values.ingressClass.isDefaultClass ) ) }} {{- if or ( not .Values.ingressClass.enabled ) ( and ( .Values.ingressClass.enabled ) ( .Values.ingressClass.isDefaultClass ) ) }}
{{- $namespace = ( printf "ix-%s" .Release.Name ) }} {{- $namespace = "traefikmiddlewares" }}
{{- end }} {{- end }}
{{ range $index, $middlewareData := .Values.middlewares.redirectScheme }} {{ range $index, $middlewareData := .Values.middlewares.redirectScheme }}