fix(IngressClass): provides annotation on IngressRoutes when it's ena…

…bled
traefik · May 28, 2024 · f5de0c3 · f5de0c3
1 parent 1435fdd
commit f5de0c3
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 4 deletions.
diff --git a/traefik/templates/dashboard-ingressroute.yaml b/traefik/templates/dashboard-ingressroute.yaml
@@ -4,10 +4,13 @@ kind: IngressRoute
 metadata:
   name: {{ template "traefik.fullname" . }}-dashboard
   namespace: {{ template "traefik.namespace" . }}
-{{- with .Values.ingressRoute.dashboard.annotations }}
   annotations:
+    {{- if and .Values.ingressClass.enabled (or .Values.providers.kubernetesCRD.enabled .Values.providers.kubernetesIngress.enabled) }}
+    kubernetes.io/ingress.class: {{ .Values.ingressClass.name | default (include "traefik.fullname" .) }}
+    {{- end }}
+    {{- with .Values.ingressRoute.dashboard.annotations }}
     {{- toYaml . | nindent 4 }}
-{{- end }}
+    {{- end }}
   labels:
     {{- include "traefik.labels" . | nindent 4 }}
     {{- with .Values.ingressRoute.dashboard.labels }}

diff --git a/traefik/templates/healthcheck-ingressroute.yaml b/traefik/templates/healthcheck-ingressroute.yaml
@@ -5,6 +5,9 @@ metadata:
   name: {{ template "traefik.fullname" . }}-healthcheck
   namespace: {{ template "traefik.namespace" . }}
   annotations:
+    {{- if and .Values.ingressClass.enabled (or .Values.providers.kubernetesCRD.enabled .Values.providers.kubernetesIngress.enabled) }}
+    kubernetes.io/ingress.class: {{ .Values.ingressClass.name | default (include "traefik.fullname" .) }}
+    {{- end }}
     {{- with .Values.ingressRoute.healthcheck.annotations }}
     {{- toYaml . | nindent 4 }}
     {{- end }}

diff --git a/traefik/tests/dashboard-ingressroute_test.yaml b/traefik/tests/dashboard-ingressroute_test.yaml
@@ -86,14 +86,28 @@ tests:
         options:
           name: tls-options
           namespace: default
-- it: should not allow to create null annotations
+- it: should use the release name as the default ingress class annotation
   set:
     ingressRoute:
       dashboard:
         enabled: true
   asserts:
-  - isNull:
+  - equal:
       path: metadata.annotations
+      value:
+        kubernetes.io/ingress.class: RELEASE-NAME-traefik
+- it: should use the ingress class name for the annotation
+  set:
+    ingressRoute:
+      dashboard:
+        enabled: true
+    ingressClass:
+      name: test-class
+  asserts:
+  - equal:
+      path: metadata.annotations
+      value:
+        kubernetes.io/ingress.class: test-class
 - it: should insert annotations correctly
   set:
     ingressRoute:
@@ -106,5 +120,6 @@ tests:
   - equal:
       path: metadata.annotations
       value:
+        kubernetes.io/ingress.class: RELEASE-NAME-traefik
         foo: bar
         fis: fas