Ensure federator container images are bundled

Author: supersven

offline/ci.sh

@@ -119,16 +119,19 @@ done
 sed -i -Ee 's/v0\.6\.0-rc\.1/v0.6.0-rc.2/' "$(pwd)"/charts/restund/Chart.yaml
 sed -i -Ee 's/2\.1\.19/3.1.3/' "$(pwd)"/charts/sftd/Chart.yaml
 
-#echo "Patching wire-server to include federator"
-sed -i -Ee 's/federator: false/federator: true/' "$(pwd)"/charts/wire-server/values.yaml
-sed -i -Ee 's/useSharedFederatorSecret: false/useSharedFederatorSecret: true/' "$(pwd)"/charts/wire-server/charts/federator/values.yaml
+# Patch wire-server values.yaml to include federator
+# This is needed to bundle it's image.
+sed -i -Ee 's/federator: false/federator: true/' "$(pwd)"/values/wire-server/prod-values.example.yaml
 
 cat  "$(pwd)"/charts/wire-server/values.yaml
 
 for chartPath in "$(pwd)"/charts/*; do
   echo "$chartPath"
 done | list-helm-containers | create-container-dump containers-helm
 
+# Undo changes on wire-server values.yaml
+sed -i -Ee 's/federator: true/federator: false/' "$(pwd)"/values/wire-server/prod-values.example.yaml
+
 tar cf containers-helm.tar containers-helm
 [[ "$INCREMENTAL" -eq 0 ]] && rm -r containers-helm
 

values/wire-server/prod-values.example.yaml

@@ -340,3 +340,8 @@ account-pages:
 legalhold:
   host: "legalhold.example.com"
   wireApiHost: "https://nginz-https.example.com"
+
+# Only needed when federation is enabled
+federator:
+  tls:
+    useSharedFederatorSecret: true