Merge pull request #765 from element-hq/bbz/fix-matricrtc-render-config

Bake NODE_IP into the SFU config

Author: benbz

charts/matrix-stack/ci/fragments/matrix-rtc-manual-ip.yaml

@@ -4,4 +4,5 @@
 
 matrixRTC:
   sfu:
+    useStunToDiscoverPublicIP: false
     manualIP: 198.51.100.2

charts/matrix-stack/ci/fragments/matrix-rtc-stun.yaml

@@ -0,0 +1,7 @@
+# Copyright 2025 New Vector Ltd
+#
+# SPDX-License-Identifier: AGPL-3.0-only
+
+matrixRTC:
+  sfu:
+    useStunToDiscoverPublicIP: true

charts/matrix-stack/ci/matrix-rtc-no-stun-manual-ip-values.yaml

@@ -28,6 +28,7 @@ matrixRTC:
         portType: HostPort
     hostNetwork: true
     manualIP: 198.51.100.2
+    useStunToDiscoverPublicIP: false
 synapse:
   enabled: false
 wellKnownDelegation:

charts/matrix-stack/ci/matrix-rtc-stun-values.yaml

@@ -0,0 +1,34 @@
+# Copyright 2024-2025 New Vector Ltd
+#
+# SPDX-License-Identifier: AGPL-3.0-only
+#
+# source_fragments: matrix-rtc-host-mode.yaml matrix-rtc-minimal.yaml matrix-rtc-stun.yaml
+# DO NOT EDIT DIRECTLY. Edit the fragment files to add / modify / remove values
+
+# initSecrets, postgres don't have any required properties to be set and defaults to enabled
+deploymentMarkers:
+  enabled: false
+elementAdmin:
+  enabled: false
+elementWeb:
+  enabled: false
+matrixAuthenticationService:
+  enabled: false
+matrixRTC:
+  ingress:
+    host: mrtc.ess.localhost
+  sfu:
+    exposedServices:
+      rtcMuxedUdp:
+        portType: HostPort
+      rtcTcp:
+        portType: HostPort
+      rtcUdp:
+        enabled: true
+        portType: HostPort
+    hostNetwork: true
+    useStunToDiscoverPublicIP: true
+synapse:
+  enabled: false
+wellKnownDelegation:
+  enabled: false

charts/matrix-stack/configs/matrix-rtc/sfu/config-underrides.yaml.tpl

@@ -10,13 +10,8 @@ SPDX-License-Identifier: AGPL-3.0-only
 {{- /* TODO: Move me to overrides after 25.10 is out. */ -}}
 rtc:
   use_external_ip: {{ .useStunToDiscoverPublicIP }}
-{{ if .manualIP }}
-  # To workaround https://github.com/livekit/livekit/issues/2088
-  # Any IP address is acceptable, it doesn't need to be a correct one,
-  # it just needs to be present to get LiveKit to skip checking all local interfaces
-  # We assign here a TEST-NET IP which is
-  # overridden by the NODE_IP env var at runtime
-  node_ip: 198.51.100.1
+{{ if or .manualIP (not .useStunToDiscoverPublicIP) }}
+  node_ip: ${NODE_IP}
 {{- end }}
 # turn server
 turn:

charts/matrix-stack/templates/matrix-rtc/_sfu_helpers.tpl

@@ -34,11 +34,10 @@ env: []
 {{- $root := .root -}}
 {{- with required "element-io.matrix-rtc-sfu.renderConfigOverrideEnv missing context" .context -}}
 env:
-{{- with $root.Values.matrixRTC.sfu.manualIP }}
+{{- if $root.Values.matrixRTC.sfu.manualIP }}
 - name: NODE_IP
-  value: "{{ . }}"
-{{- end }}
-{{- if and (not $root.Values.matrixRTC.sfu.useStunToDiscoverPublicIP) (not $root.Values.matrixRTC.sfu.manualIP) }}
+  value: "{{ $root.Values.matrixRTC.sfu.manualIP }}"
+{{- else if not $root.Values.matrixRTC.sfu.useStunToDiscoverPublicIP }}
 - name: NODE_IP
   valueFrom:
     fieldRef:

newsfragments/765.fixed.md

@@ -0,0 +1 @@
+Fix Matrix RTC SFU manualIP setting so that it correctly propagates through.

newsfragments/765.internal.md

@@ -0,0 +1 @@
+CI: update Matrix RTC values files to cover STUN, Manual IP, and Node IP cases correctly.