fix(entryPoint): allow scheme to be unset on redirect

Author: bpsoraggi

traefik/templates/_podtemplate.tpl

@@ -625,7 +625,7 @@
                 {{- fail $errorMsg }}
               {{- end }}
               {{- $toPort := index $.Values.ports .to }}
-              {{- if and (($toPort.tls).enabled) (ne .scheme "https") }}
+              {{- if and (($toPort.tls).enabled) .scheme (ne .scheme "https") }}
                 {{- $errorMsg := printf "ERROR: Cannot redirect %s to %s without setting scheme to https" $entrypoint .to }}
                 {{- fail $errorMsg }}
               {{- end }}

traefik/tests/deployment-config_test.yaml

@@ -290,18 +290,58 @@ tests:
     asserts:
       - failedTemplate:
           errorMessage: "ERROR: redirectTo syntax has been removed in v34 of this Chart. See Release notes or EXAMPLES.md for new syntax."
-  - it: should fail when redirect on websecure without https scheme
+  - it: should fail when redirect on websecure with tls enabled and non-https scheme
     set:
       ports:
         web:
           redirections:
             entryPoint:
               to: websecure
+              scheme: http
         websecure:
           exposedPort: 443
+          tls:
+            enabled: true
     asserts:
       - failedTemplate:
           errorMessage: "ERROR: Cannot redirect web to websecure without setting scheme to https"
+  - it: should redirect on websecure with tls enabled and https scheme
+    set:
+      ports:
+        web:
+          redirections:
+            entryPoint:
+              to: websecure
+              scheme: https
+        websecure:
+          exposedPort: 443
+          tls:
+            enabled: true
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: "--entryPoints.web.http.redirections.entryPoint.scheme=https"
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: "--entryPoints.web.http.redirections.entryPoint.to=:443"
+  - it: should not fail when redirect on websecure with unset scheme
+    set:
+      ports:
+        web:
+          redirections:
+            entryPoint:
+              to: websecure
+        websecure:
+          exposedPort: 443
+          tls:
+            enabled: true
+    asserts:
+      - notContains:
+          path: spec.template.spec.containers[0].args
+          content: "--entryPoints.web.http.redirections.entryPoint.scheme="
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: "--entryPoints.web.http.redirections.entryPoint.to=:443"
   - it: should fail when redirect on non-existent entrypoint
     set:
       ports: