From ed8e83871869d1ea139b38e6c39ef21a715ae81b Mon Sep 17 00:00:00 2001
From: Stefan Berthold <stefan.berthold@wire.com>
Date: Fri, 19 Apr 2024 18:46:04 +0200
Subject: [PATCH] improve release notes/make brig's multiSFT optional (#4010)

---
 changelog.d/0-release-notes/WPB-227  | 15 ++++++++++-----
 charts/brig/templates/configmap.yaml |  2 ++
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/changelog.d/0-release-notes/WPB-227 b/changelog.d/0-release-notes/WPB-227
index 4d5c5989a39..25b0999d32d 100644
--- a/changelog.d/0-release-notes/WPB-227
+++ b/changelog.d/0-release-notes/WPB-227
@@ -1,12 +1,17 @@
-There is a new optional Boolean option, `multiSFT.enabled`, in `brig.yaml`,
-allowing calls between federated SFT servers. If provided, the field
-`is_federating` in the response of `/calls/config/v2` will reflect
-`multiSFT.enabled`'s value.
+There is a new optional Boolean in Brig's Helm chart, `config.multiSFT.enabled`,
+signalling whether calls between federated SFT servers are allowed.
+
+IMPORTANT: The value of this new option needs be set to the value of
+`multiSFT.enabled` in SFT's Helm chart. Otherwise federated SFT servers won't
+work.
+
+If provided, the field `is_federating` in the response of `/calls/config/v2`
+will reflect `multiSFT.enabled`'s value.
 
 Example:
 
 ```
-# [brig.yaml]
+# [brig/values.yaml]
 multiSFT:
   enabled: true
 ```
diff --git a/charts/brig/templates/configmap.yaml b/charts/brig/templates/configmap.yaml
index 171ae2373d4..839b7d6cbf5 100644
--- a/charts/brig/templates/configmap.yaml
+++ b/charts/brig/templates/configmap.yaml
@@ -57,7 +57,9 @@ data:
       host: gundeck
       port: 8080
 
+    {{- if .multiSFT }}
     multiSFT: {{ .multiSFT.enabled }}
+    {{- end }}
     {{- if .enableFederation }}
     # TODO remove this
     federator: