fix: http3 support broken when advertisedPort set

traefik · Aug 7, 2023 · 5015a4d · 5015a4d
1 parent 571b36a
commit 5015a4d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/traefik/templates/_podtemplate.tpl b/traefik/templates/_podtemplate.tpl
@@ -595,14 +595,13 @@
           - "--experimental.http3=true"
                     {{- end }}
                     {{- if semverCompare ">=2.6.0-0" (default $.Chart.AppVersion $.Values.image.tag)}}
-                      {{- if $config.http3.advertisedPort }}
-          - "--entrypoints.{{ $entrypoint }}.http3.advertisedPort={{ $config.http3.advertisedPort }}"
-                      {{- else }}
           - "--entrypoints.{{ $entrypoint }}.http3"
-                      {{- end }}
                     {{- else }}
           - "--entrypoints.{{ $entrypoint }}.enableHTTP3=true"
                     {{- end }}
+                    {{- if $config.http3.advertisedPort }}
+          - "--entrypoints.{{ $entrypoint }}.http3.advertisedPort={{ $config.http3.advertisedPort }}"
+                    {{- end }}
                   {{- end }}
                 {{- end }}
               {{- end }}

diff --git a/traefik/tests/deployment-config_test.yaml b/traefik/tests/deployment-config_test.yaml
@@ -150,3 +150,17 @@ tests:
       - equal:
           path: metadata.namespace
           value: "traefik-ns-override"
+  - it: should have http3 enabled, when enabled with advertisedPort
+    set:
+      ports:
+        websecure:
+          http3:
+            advertisedPort: 443
+            enabled: true
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: "--entrypoints.websecure.http3"
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: "--entrypoints.websecure.http3.advertisedPort=443"