From 8adc54aa616b8155e56a0df711f9f15c0a6c8375 Mon Sep 17 00:00:00 2001 From: Sven Tennie Date: Thu, 29 Sep 2022 15:30:25 +0200 Subject: [PATCH] Ensure federator container images are bundled --- offline/ci.sh | 9 ++++++--- values/wire-server/prod-values.example.yaml | 5 +++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/offline/ci.sh b/offline/ci.sh index e93d08b88..db423397a 100755 --- a/offline/ci.sh +++ b/offline/ci.sh @@ -119,9 +119,9 @@ 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 @@ -129,6 +129,9 @@ 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 diff --git a/values/wire-server/prod-values.example.yaml b/values/wire-server/prod-values.example.yaml index 0cd2d61b0..9d35f215b 100644 --- a/values/wire-server/prod-values.example.yaml +++ b/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