Merge pull request #400 from wireapp/release/2020-12-21

Release 2020/12/21
wireapp · Dec 22, 2020 · 61c8bd5 · 61c8bd5
2 parents 0b8c817 + f786033
commit 61c8bd5
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# 2020-12-21
+
+* brig: Add setExpiredUserCleanupTimeout to configmap (#399) see also: https://github.com/wireapp/wire-server/pull/1264
+* [helm] Remove duplicate fields from brig section in the example value files (#398)
+* Add spar to the integration tests for brig (#397)
+
 # 2020-12-17
 
 ## Update instructions

diff --git a/charts/brig/templates/configmap.yaml b/charts/brig/templates/configmap.yaml
@@ -167,6 +167,9 @@ data:
     optSettings:
       setActivationTimeout: {{ .setActivationTimeout }}
       setTeamInvitationTimeout: {{ .setTeamInvitationTimeout }}
+      {{- if .setExpiredUserCleanupTimeout }}
+      setExpiredUserCleanupTimeout: {{ .setExpiredUserCleanupTimeout }}
+      {{- end }}
       setTwilio: /etc/wire/brig/secrets/twilio-credentials.yaml
       setNexmo: /etc/wire/brig/secrets/nexmo-credentials.yaml
       setUserMaxConnections: {{ .setUserMaxConnections }}

diff --git a/charts/brig/templates/tests/configmap.yaml b/charts/brig/templates/tests/configmap.yaml
@@ -22,6 +22,10 @@ data:
       host: cargohold
       port: 8080
 
+    spar:
+      host: spar
+      port: 8080
+
     nginz:
       # Full URL is set so that there can be a common cookiedomain between nginz and brig
       # needed by some integration tests

diff --git a/values/wire-server/demo-values.example.yaml b/values/wire-server/demo-values.example.yaml
@@ -41,14 +41,13 @@ brig:
       teamMemberWelcome: https://wire.example.com/download # change this
     optSettings:
       setFederationDomain: example.com # change this
+      # Sync the domain with the 'host' variable in the sftd chart
+      # uncomment this section if conference calling is not used
+      setSftStaticUrl: "https://sftd.example.om:443"
     emailSMS:
       general:
         emailSender: [email protected] # change this
         smsSender: "insert-sms-sender-for-twilio" # change this if SMS support is desired
-    optSettings:
-      # Sync the domain with the 'host' variable in the sftd chart
-      # uncomment this section if conference calling is not used
-      setSftStaticUrl: "https://sftd.example.om:443"
     smtp:
       host: demo-smtp # change this if you want to use your own SMTP server
       port: 25        # change this

diff --git a/values/wire-server/prod-values.example.yaml b/values/wire-server/prod-values.example.yaml
@@ -42,6 +42,9 @@ brig:
       teamMemberWelcome: https://wire.example.com/download # change this
     optSettings:
       setFederationDomain: example.com # change this
+      # Sync the domain with the 'host' variable in the sftd chart
+      # uncomment this section if conference calling is not used
+      setSftStaticUrl: "https://sftd.example.om:443"
     emailSMS:
       general:
         emailSender: [email protected] # change this
@@ -74,10 +77,6 @@ brig:
 #      noProxyList:
 #        - "local.example.com"
 #        - "10.23.0.0/16"
-    optSettings:
-      # Sync the domain with the 'host' variable in the sftd chart
-      # uncomment this section if conference calling is not used
-      setSftStaticUrl: "https://sftd.example.om:443"
   turnStatic:
     v1:
       - "turn:turn01.example.com:80"