fix(traefik): we were trying to access namespace but its an optional field.

This commit is contained in:
Stavros kois
2023-12-21 10:11:51 +02:00
parent a7bb6499a1
commit 04f43403a0
2 changed files with 7 additions and 13 deletions

View File

@@ -371,7 +371,7 @@ tests:
hosts: *hosts
asserts:
- failedTemplate:
errorMessage: Ingress - Combined traefik middlewares contain duplicates [test-release-namespace-chain-basic, test-release-namespace-chain-basic]
errorMessage: Ingress - Combined traefik middlewares contain duplicates [test-release-namespace-chain-basic@kubernetescrd, test-release-namespace-chain-basic@kubernetescrd]
- it: should fail with duplicate entrypoints
set:

View File

@@ -50,18 +50,6 @@
{{- end -}}
{{/* Make sure we dont have dupes */}}
{{- if $middlewares -}}
{{/* Only used for better error */}}
{{- $middlewareNameList := list -}}
{{- range $mid := $middlewares -}}
{{- $middlewareNameList = mustAppend $middlewareNameList (printf "%s-%s" $mid.namespace $mid.name ) -}}
{{- end -}}
{{- if not (deepEqual (mustUniq $middlewares) $middlewares) -}}
{{- fail (printf "Ingress - Combined traefik middlewares contain duplicates [%s]" (join ", " $middlewareNameList)) -}}
{{- end -}}
{{- end -}}
{{- if not (deepEqual (mustUniq $entrypoints) $entrypoints) -}}
{{- fail (printf "Ingress - Combined traefik entrypoints contain duplicates [%s]" (join ", " $entrypoints)) -}}
{{- end -}}
@@ -119,6 +107,12 @@
{{- $formattedMiddlewares = mustAppend $formattedMiddlewares (printf "%s-%s@kubernetescrd" $midNamespace $mid.name ) -}}
{{- end -}}
{{- if $formattedMiddlewares -}}
{{/* Make sure we dont have dupes */}}
{{- if not (deepEqual (mustUniq $formattedMiddlewares) $formattedMiddlewares) -}}
{{- fail (printf "Ingress - Combined traefik middlewares contain duplicates [%s]" (join ", " $formattedMiddlewares)) -}}
{{- end -}}
{{- end -}}
{{- $_ := set $objectData.annotations "traefik.ingress.kubernetes.io/router.entrypoints" (join "," $entrypoints) -}}
{{- if $formattedMiddlewares -}}