Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(HTTP3): split udp and tcp Service when service.single is false #1168

Merged
merged 1 commit into from
Aug 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions EXAMPLES.md
Original file line number Diff line number Diff line change
Expand Up @@ -416,6 +416,17 @@ ports:
enabled: true
```

You can also create two `Service`, one for TCP and one for UDP:

```yaml
ports:
websecure:
http3:
enabled: true
service:
single: false
```

# Use PROXY protocol on Digital Ocean

PROXY protocol is a protocol for sending client connection information, such as origin IP addresses and port numbers, to the final backend server, rather than discarding it at the load balancer.
Expand Down
4 changes: 2 additions & 2 deletions traefik/templates/_service.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,11 @@
{{- if $config.appProtocol }}
appProtocol: {{ $config.appProtocol }}
{{- end }}
{{- if ($config.http3).enabled }}
{{- if and ($config.http3).enabled ($config.single) }}
{{- $http3Port := default $config.exposedPort $config.http3.advertisedPort }}
- port: {{ $http3Port }}
name: "{{ $name }}-http3"
targetPort: {{ $name }}-http3
targetPort: "{{ $name }}-http3"
protocol: UDP
{{- if $config.nodePort }}
nodePort: {{ $config.nodePort }}
Expand Down
8 changes: 8 additions & 0 deletions traefik/templates/service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,14 @@
{{- if (not $config.tls.enabled) -}}
{{- fail "ERROR: You cannot enable http3 without enabling tls" -}}
{{- end -}}
{{ $udpConfig := deepCopy $config -}}
{{ $_ := set $udpConfig "protocol" "UDP" -}}
{{ $_ := set $udpConfig "exposedPort" (default $config.exposedPort $config.http3.advertisedPort) -}}
{{- if (not $service.single) }}
{{ $_ := set $udpPorts (printf "%s-http3" $portName) $udpConfig -}}
{{- else }}
{{ $_ := set $tcpPorts (printf "%s-http3" $portName) $udpConfig -}}
{{- end }}
{{- end -}}
{{- if eq (toString $config.protocol) "UDP" -}}
{{ $_ := set $udpPorts $portName $config -}}
Expand Down
94 changes: 70 additions & 24 deletions traefik/tests/service-config_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -238,18 +238,13 @@ tests:
enabled: true
documentIndex: 0
asserts:
- equal:
path: spec.ports[2].name
value: "websecure-http3"
- equal:
path: spec.ports[2].port
value: 443
- equal:
path: spec.ports[2].targetPort
value: websecure-http3
- equal:
path: spec.ports[2].protocol
value: UDP
- contains:
path: spec.ports
content:
port: 443
name: "websecure-http3"
targetPort: websecure-http3
protocol: UDP
- it: should be possible to advertise a different http3 UDP port
set:
ports:
Expand All @@ -261,18 +256,69 @@ tests:
enabled: true
documentIndex: 0
asserts:
- equal:
path: spec.ports[2].name
value: "websecure-http3"
- equal:
path: spec.ports[2].port
value: 4443
- equal:
path: spec.ports[2].targetPort
value: websecure-http3
- equal:
path: spec.ports[2].protocol
value: UDP
- contains:
path: spec.ports
content:
port: 4443
name: "websecure-http3"
targetPort: websecure-http3
protocol: UDP
- it: should split TCP and UDP Service on http3 when single is false
set:
ports:
websecure:
http3:
enabled: true
service:
single: false
asserts:
- hasDocuments:
count: 2
- contains:
path: spec.ports
content:
port: 443
name: "websecure"
targetPort: websecure
protocol: TCP
documentIndex: 0
- contains:
path: spec.ports
content:
port: 443
name: "websecure-http3"
targetPort: websecure-http3
protocol: UDP
documentIndex: 1
- it: should use advertisedPort with splitted TCP and UDP Service on http3 when single is false
set:
ports:
websecure:
http3:
enabled: true
advertisedPort: 4443
service:
single: false
asserts:
- hasDocuments:
count: 2
- contains:
path: spec.ports
content:
port: 443
name: "websecure"
targetPort: websecure
protocol: TCP
documentIndex: 0
- contains:
path: spec.ports
content:
port: 4443
name: "websecure-http3"
targetPort: websecure-http3
protocol: UDP
documentIndex: 1

- it: should not be possible to use http3 without enabling tls
set:
ports:
Expand Down