Merge branch 'master' into fix/tracing-hub

traefik · Jan 28, 2025 · 60f6d88 · 60f6d88
2 parents 42e1bc1 + 3c204ea
commit 60f6d88
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/traefik/templates/_podtemplate.tpl b/traefik/templates/_podtemplate.tpl
@@ -618,8 +618,8 @@
               {{- with .priority }}
           - "--entryPoints.{{ $entrypoint }}.http.redirections.entryPoint.priority={{ . }}"
               {{- end }}
-              {{- with .permanent }}
-          - "--entryPoints.{{ $entrypoint }}.http.redirections.entryPoint.permanent={{ . }}"
+              {{- if hasKey . "permanent" }}
+          - "--entryPoints.{{ $entrypoint }}.http.redirections.entryPoint.permanent={{ .permanent }}"
               {{- end }}
              {{- end }}
             {{- end }}

diff --git a/traefik/tests/deployment-config_test.yaml b/traefik/tests/deployment-config_test.yaml
@@ -293,3 +293,18 @@ tests:
       - contains:
           path: spec.template.spec.containers[0].args
           content: "--entryPoints.web.http.redirections.entryPoint.permanent=true"
+  - it: should have permanent http redirections disabled, when enabled with redirectTo and permanent set to false
+    set:
+      ports:
+        web:
+          redirections:
+            entryPoint:
+              to: websecure
+              scheme: https
+              permanent: false
+        websecure:
+          exposedPort: 443
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: "--entryPoints.web.http.redirections.entryPoint.permanent=false"