Allow setting TLS options on dashboard IngressRoute

terrych0u · Oct 2, 2023 · 18f4056 · 18f4056
1 parent f77c771
commit 18f4056
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 4 deletions.
diff --git a/traefik/templates/dashboard-ingressroute.yaml b/traefik/templates/dashboard-ingressroute.yaml
@@ -24,10 +24,13 @@ spec:
     services:
     - name: api@internal
       kind: TraefikService
-    {{- if .Values.ingressRoute.dashboard.middlewares }}
+    {{- with .Values.ingressRoute.dashboard.middlewares }}
     middlewares:
-      {{- with .Values.ingressRoute.dashboard.middlewares }}
       {{- toYaml . | nindent 6 }}
-      {{- end }}
     {{- end -}}
+
+  {{- with .Values.ingressRoute.dashboard.tls }}
+  tls:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 {{- end -}}
diff --git a/traefik/tests/dashboard-ingressroute_test.yaml b/traefik/tests/dashboard-ingressroute_test.yaml
@@ -33,7 +33,7 @@ tests:
     set:
       ingressRoute:
         dashboard:
-          entryPoints: ["websecure"]      
+          entryPoints: ["websecure"]
     asserts:
       - equal:
           path: spec.entryPoints
@@ -48,6 +48,10 @@ tests:
       - equal:
           path: metadata.labels.foo
           value: bar
+  - it: should not have middlewares by default
+    asserts:
+    - isEmpty:
+        path: spec.routes[0].middlewares
   - it: should support adding middlewares
     set:
       ingressRoute:
@@ -61,3 +65,24 @@ tests:
           value:
             - name: traefik-dashboard-auth
               namespace: default
+  - it: should not have tls options by default
+    asserts:
+    - isEmpty:
+        path: spec.tls
+  - it: should support adding tls options
+    set:
+      ingressRoute:
+        dashboard:
+          tls:
+            secretName: traefik-dashboard-auth
+            options:
+              name: tls-options
+              namespace: default
+    asserts:
+      - equal:
+          path: spec.tls
+          value:
+            secretName: traefik-dashboard-auth
+            options:
+              name: tls-options
+              namespace: default
diff --git a/traefik/values.yaml b/traefik/values.yaml
@@ -142,6 +142,8 @@ ingressRoute:
     entryPoints: ["traefik"]
     # Additional ingressRoute middlewares (e.g. for authentication)
     middlewares: []
+    # TLS options (e.g. secret containing certificate)
+    tls: {}
 
 # Customize updateStrategy of traefik pods
 updateStrategy: