Skip to content

Commit 4d90342

Browse files
Brutus5000claude
andcommitted
feat(lobby): use native WebSocket, drop faf-ws-bridge
faf-python-server now speaks WebSocket directly on 8003/ws, so the ws_bridge_rs sidecar is no longer needed. - Point the IngressRoute for ws.{baseDomain} at faf-lobby-server:8003 instead of faf-ws-bridge:8003 (and rename the resource). - Remove the LISTEN block from the lobby config; the new server reads WS_HOST/WS_PORT/WS_PATH and the defaults already produce :8003/ws. - Set WS_FORWARDED_IP_HEADER=CF-Connecting-IP so the real client IP from Cloudflare is preserved. - Bump image to faforever/faf-python-server:feature-websocket for the test deploy. - Delete apps/faf-ws-bridge entirely. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
1 parent 91d4c67 commit 4d90342

6 files changed

Lines changed: 7 additions & 55 deletions

File tree

apps/faf-lobby-server/config/config.yaml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
CONFIGURATION_REFRESH_TIME: 60
22
LOG_LEVEL: "INFO"
33

4-
LISTEN:
5-
- ADDRESS:
6-
PORT: 8003
7-
PROTOCOL: SimpleJsonProtocol
8-
PROXY: true
4+
# The server speaks WebSocket natively on 8003/ws (the defaults). Traefik
5+
# terminates TLS and forwards directly to this pod, so trust the
6+
# CF-Connecting-IP header that Cloudflare sets to get the real client IP.
7+
WS_FORWARDED_IP_HEADER: "CF-Connecting-IP"
98

109
DB_SERVER: "mariadb"
1110
DB_LOGIN: "faf-python-server"

apps/faf-lobby-server/templates/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ spec:
2121
spec:
2222
terminationGracePeriodSeconds: 3600
2323
containers:
24-
- image: faforever/faf-python-server:v1.17.0
24+
- image: faforever/faf-python-server:feature-websocket
2525
imagePullPolicy: Always
2626
name: faf-lobby-server
2727
envFrom:
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
apiVersion: traefik.io/v1alpha1
22
kind: IngressRoute
33
metadata:
4-
name: faf-ws-bridge
4+
name: faf-lobby-server
55
spec:
66
entryPoints:
77
- websecure
88
routes:
99
- match: Host(`ws.{{.Values.baseDomain}}`)
1010
kind: Rule
1111
services:
12-
- name: faf-ws-bridge
12+
- name: faf-lobby-server
1313
port: 8003

apps/faf-ws-bridge/Chart.yaml

Lines changed: 0 additions & 3 deletions
This file was deleted.

apps/faf-ws-bridge/templates/deployment.yaml

Lines changed: 0 additions & 32 deletions
This file was deleted.

apps/faf-ws-bridge/templates/service.yaml

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)