fix(tilt): drop faf-ws-bridge reference

Tiltfile

@@ -423,10 +423,6 @@ unitdb_labels = ["unitdb"]
 unitdb_links = [link("http://unitdb.{}".format(base_domain), "Rackover UnitDB")]
 proxy_local_service_if_set(service_name="faf-unitdb", service_chart="apps/faf-unitdb", service_namespace="faf-apps", service_labels=unitdb_labels, service_links=unitdb_links)
 
-ws_bridge_deps = ["faf-lobby-server"]
-ws_bridge_labels = ["lobby"]
-proxy_local_service_if_set(service_name="faf-ws-bridge", service_chart="apps/faf-ws-bridge", service_namespace="faf-apps", service_deps=ws_bridge_deps, service_labels=ws_bridge_labels)
-
 icebreaker_deps = ["faf-db-migrations", "ory-hydra"] + rabbitmq_setup_resources
 icebreaker_labels = ["api"]
 icebreaker_patch = {"HYDRA_URL": "http://ory-hydra:4444", "XIRSYS_ENABLED": "false", "XIRSYS_TURN_ENABLED": "false", "CLOUDFLARE_ENABLED": "false"}

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

@@ -1,11 +1,10 @@
 CONFIGURATION_REFRESH_TIME: 60
 LOG_LEVEL: "INFO"
 
-LISTEN:
-  - ADDRESS:
-    PORT: 8003
-    PROTOCOL: SimpleJsonProtocol
-    PROXY: true
+# The server speaks WebSocket natively on 8003/ws (the defaults). Traefik
+# terminates TLS and forwards directly to this pod, so trust the
+# CF-Connecting-IP header that Cloudflare sets to get the real client IP.
+WS_FORWARDED_IP_HEADER: "CF-Connecting-IP"
 
 DB_SERVER: "mariadb"
 DB_LOGIN: "faf-python-server"

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

@@ -21,7 +21,7 @@ spec:
     spec:
       terminationGracePeriodSeconds: 3600
       containers:
-        - image: faforever/faf-python-server:v1.17.0
+        - image: faforever/faf-python-server:feature-websocket
           imagePullPolicy: Always
           name: faf-lobby-server
           envFrom:

apps/faf-ws-bridge/templates/ingress.yaml → apps/faf-lobby-server/templates/ingress.yaml

@@ -1,13 +1,13 @@
 apiVersion: traefik.io/v1alpha1
 kind: IngressRoute
 metadata:
-  name: faf-ws-bridge
+  name: faf-lobby-server
 spec:
   entryPoints:
     - websecure
   routes:
-    - match: Host(`ws.{{.Values.baseDomain}}`)
+    - match: Host(`lobby.{{.Values.baseDomain}}`) || Host(`ws.{{.Values.baseDomain}}`)
       kind: Rule
       services:
-        - name: faf-ws-bridge
+        - name: faf-lobby-server
           port: 8003