Skip to content

Commit 467cd3e

Browse files
committed
fix: WPB-25755 bring changes from #876 for release-5.27 and rebased from master
1 parent 2dd562a commit 467cd3e

5 files changed

Lines changed: 37 additions & 14 deletions

File tree

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Added: update prod and demo example values/secrets for wire-server 5.27, aligning PostgreSQL config, postgresMigration (conversation, teamFeatures), rabbitmq, and mlsPrivateKeys across all services

offline/tasks/proc_pull_charts.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,5 +84,5 @@ pull_charts() {
8484

8585
}
8686

87-
wire_build="https://raw.githubusercontent.com/wireapp/wire-builds/f941851bee7666441a23ba782766cd8d7de5043e/build.json"
87+
wire_build="https://raw.githubusercontent.com/wireapp/wire-builds/ecd204f07540e79fc1febe2483a42111129a5d0d/build.json"
8888
wire_build_chart_release "$wire_build" | pull_charts

values/wire-server/demo-secrets.example.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ nginz:
121121
basicAuth: "<username>:<htpasswd-hashed-password>"
122122

123123

124-
# RabbitMQ credentials for background-worker.
124+
# RabbitMQ and PostgreSQL credentials for background-worker.
125125
background-worker:
126126
secrets:
127127
pgPassword: verysecurepassword

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

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ brig:
3636
port: "5432"
3737
user: wire-server
3838
dbname: wire-server
39+
# See pool size calculation guide: https://docs.wire.com/latest/how-to/administrate/postgresql.html
40+
postgresqlPool:
41+
size: 10 # adjust pool size as needed based on expected load and available resources
3942
useSES: false
4043
# Set to false if you want to hand out DynamoDB to store prekeys
4144
randomPrekeys: true
@@ -183,10 +186,15 @@ galley:
183186
port: "5432"
184187
user: wire-server
185188
dbname: wire-server
189+
# See pool size calculation guide: https://docs.wire.com/latest/how-to/administrate/postgresql.html
190+
postgresqlPool:
191+
size: 10 # adjust pool size as needed based on expected load and available resources
186192
# Explicitly set postgresMigration to cassandra for fresh deployments.
187-
# This controls whether galley reads conversations from Cassandra or PostgreSQL.
193+
# This controls whether galley reads conversations/teamFeatures from Cassandra or PostgreSQL.
188194
postgresMigration:
189195
conversation: cassandra
196+
conversationCodes: cassandra
197+
teamFeatures: cassandra
190198
enableFederation: false # Enable to use federation
191199
settings:
192200
# prefix URI used when inviting users to a conversation by link
@@ -366,13 +374,16 @@ background-worker:
366374
port: "5432"
367375
user: wire-server
368376
dbname: wire-server
369-
# IMPORTANT: At Chart 5.25.0, the background-worker Helm chart incorrectly defaults
370-
# postgresMigration.conversation to "postgresql" instead of "cassandra".
371-
# This MUST be explicitly set to "cassandra" unless you have already migrated
372-
# conversations to PostgreSQL. Without this override, User Group to Channel sync
373-
# jobs will silently skip member synchronization.
377+
# See pool size calculation guide: https://docs.wire.com/latest/how-to/administrate/postgresql.html
378+
postgresqlPool:
379+
size: 5 # Background worker has fewer connections to DB, so smaller pool size is fine
374380
postgresMigration:
375381
conversation: cassandra
382+
conversationCodes: cassandra
383+
teamFeatures: cassandra
384+
migrateConversations: false
385+
migrateConversationCodes: false
386+
migrateTeamFeatures: false
376387
# Enable for federation
377388
enableFederation: false
378389
metrics:

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

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ brig:
3636
port: "5432"
3737
user: wire-server
3838
dbname: wire-server
39+
# See pool size calculation guide: https://docs.wire.com/latest/how-to/administrate/postgresql.html
40+
postgresqlPool:
41+
size: 10 # adjust pool size as needed based on expected load and available resources
3942
useSES: false
4043
# Set to false if you want to hand out DynamoDB to store prekeys
4144
randomPrekeys: true
@@ -183,10 +186,15 @@ galley:
183186
port: "5432"
184187
user: wire-server
185188
dbname: wire-server
189+
# See pool size calculation guide: https://docs.wire.com/latest/how-to/administrate/postgresql.html
190+
postgresqlPool:
191+
size: 10 # adjust pool size as needed based on expected load and available resources
186192
# Explicitly set postgresMigration to cassandra for fresh deployments.
187-
# This controls whether galley reads conversations from Cassandra or PostgreSQL.
193+
# This controls whether galley reads conversations/teamFeatures from Cassandra or PostgreSQL.
188194
postgresMigration:
189195
conversation: cassandra
196+
conversationCodes: cassandra
197+
teamFeatures: cassandra
190198
enableFederation: false # Enable to use federation
191199
settings:
192200
# prefix URI used when inviting users to a conversation by link
@@ -366,13 +374,16 @@ background-worker:
366374
port: "5432"
367375
user: wire-server
368376
dbname: wire-server
369-
# IMPORTANT: At Chart 5.25.0, the background-worker Helm chart incorrectly defaults
370-
# postgresMigration.conversation to "postgresql" instead of "cassandra".
371-
# This MUST be explicitly set to "cassandra" unless you have already migrated
372-
# conversations to PostgreSQL. Without this override, User Group to Channel sync
373-
# jobs will silently skip member synchronization.
377+
# See pool size calculation guide: https://docs.wire.com/latest/how-to/administrate/postgresql.html
378+
postgresqlPool:
379+
size: 5 # Background worker has fewer connections to DB, so smaller pool size is fine
374380
postgresMigration:
375381
conversation: cassandra
382+
conversationCodes: cassandra
383+
teamFeatures: cassandra
384+
migrateConversations: false
385+
migrateConversationCodes: false
386+
migrateTeamFeatures: false
376387
# Enable for federation
377388
enableFederation: false
378389
metrics:

0 commit comments

Comments
 (0)