diff --git a/.envrc b/.envrc index 43e35e689..2f5aadaaf 100644 --- a/.envrc +++ b/.envrc @@ -21,9 +21,9 @@ if [[ "$NO_GIT_HOOKS" == "TRUE" ]]; then echo "" echo " Git Hooks has been configured in your current environment." echo " Read more about them here: https://github.com/wireapp/wire-server-deploy?tab=readme-ov-file#optional-git-commit-message-verification" - echo " If you don't want to use it, then set NO_GIT_HOOKS=FALSE in file .envrc.local and re-laod the envionment by running:" + echo " If you don't want to use it, then set NO_GIT_HOOKS=FALSE in file .envrc.local and re-load the envionment by running:" echo " direnv reload" echo "" -else +else git config --unset core.hooksPath fi diff --git a/.git-hooks/commit-msg b/.git-hooks/commit-msg index 11e307f09..7cec2bf83 100755 --- a/.git-hooks/commit-msg +++ b/.git-hooks/commit-msg @@ -17,7 +17,7 @@ if ! echo "$commit_message" | grep -E "$pattern" | grep -E "$pattern2"; then echo " test: add unit tests wpb-1234" echo " chore!: WPB-1234 drop support for k8s 1.16 - add a 'BREAKING CHANGE:' statement" echo " Read more about it here: https://www.conventionalcommits.org/en/v1.0.0/" - echo " If you don't want to use it, then set NO_GIT_HOOKS=FALSE in file .envrc.local and re-laod the envionment by running:" + echo " If you don't want to use it, then set NO_GIT_HOOKS=FALSE in file .envrc.local and re-load the envionment by running:" echo " direnv reload" exit 1 fi diff --git a/changelog.d/3-deploy-builds/wire-server-5.27 b/changelog.d/3-deploy-builds/wire-server-5.27 new file mode 100644 index 000000000..eef103064 --- /dev/null +++ b/changelog.d/3-deploy-builds/wire-server-5.27 @@ -0,0 +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 diff --git a/offline/tasks/proc_pull_charts.sh b/offline/tasks/proc_pull_charts.sh index c069320c2..204bcd589 100755 --- a/offline/tasks/proc_pull_charts.sh +++ b/offline/tasks/proc_pull_charts.sh @@ -94,5 +94,5 @@ pull_charts() { #fi } -wire_build="https://raw.githubusercontent.com/wireapp/wire-builds/pinned-offline-multi-20260224-142104/build.json" +wire_build="https://raw.githubusercontent.com/wireapp/wire-builds/ecd204f07540e79fc1febe2483a42111129a5d0d/build.json" wire_build_chart_release "$wire_build" | pull_charts diff --git a/values/wire-server/demo-secrets.example.yaml b/values/wire-server/demo-secrets.example.yaml index 0780cc146..f0945c18d 100644 --- a/values/wire-server/demo-secrets.example.yaml +++ b/values/wire-server/demo-secrets.example.yaml @@ -71,7 +71,7 @@ galley: # mls_ed25519_key="$(generate_mls_key -algorithm ed25519)" # mls_ecdsa_p256_key="$(generate_mls_key -algorithm ec -pkeyopt ec_paramgen_curve:P-256)" # mls_ecdsa_p384_key="$(generate_mls_key -algorithm ec -pkeyopt ec_paramgen_curve:P-384)" - # mls_ecdsa_p521_key="$(generate_mls_key -algorithm ec -pkeyopt ec_paramgen_curve:P-521)" + # mls_ecdsa_p521_key="$(generate_mls_key -algorithm ec -pkeyopt ec_paramgen_curve:P-521)" # this will get initialized from wire_secrets.yml playbook or can be generated using above logic # mlsPrivateKeys: @@ -121,7 +121,7 @@ nginz: basicAuth: ":" -# RabbitMQ credentials for background-worker. +# RabbitMQ and PostgreSQL credentials for background-worker. background-worker: secrets: pgPassword: verysecurepassword diff --git a/values/wire-server/demo-values.example.yaml b/values/wire-server/demo-values.example.yaml index 230fd6d7d..23d95d5f2 100644 --- a/values/wire-server/demo-values.example.yaml +++ b/values/wire-server/demo-values.example.yaml @@ -36,6 +36,9 @@ brig: port: "5432" user: wire-server dbname: wire-server + # See pool size calculation guide: https://docs.wire.com/latest/how-to/administrate/postgresql.html + postgresqlPool: + size: 10 # adjust pool size as needed based on expected load and available resources useSES: false # Set to false if you want to hand out DynamoDB to store prekeys randomPrekeys: true @@ -183,10 +186,15 @@ galley: port: "5432" user: wire-server dbname: wire-server + # See pool size calculation guide: https://docs.wire.com/latest/how-to/administrate/postgresql.html + postgresqlPool: + size: 10 # adjust pool size as needed based on expected load and available resources # Explicitly set postgresMigration to cassandra for fresh deployments. - # This controls whether galley reads conversations from Cassandra or PostgreSQL. + # This controls whether galley reads conversations/teamFeatures from Cassandra or PostgreSQL. postgresMigration: conversation: cassandra + conversationCodes: cassandra + teamFeatures: cassandra enableFederation: false # Enable to use federation settings: # prefix URI used when inviting users to a conversation by link @@ -366,13 +374,16 @@ background-worker: port: "5432" user: wire-server dbname: wire-server - # IMPORTANT: At Chart 5.25.0, the background-worker Helm chart incorrectly defaults - # postgresMigration.conversation to "postgresql" instead of "cassandra". - # This MUST be explicitly set to "cassandra" unless you have already migrated - # conversations to PostgreSQL. Without this override, User Group to Channel sync - # jobs will silently skip member synchronization. + # See pool size calculation guide: https://docs.wire.com/latest/how-to/administrate/postgresql.html + postgresqlPool: + size: 5 # Background worker has fewer connections to DB, so smaller pool size is fine postgresMigration: conversation: cassandra + conversationCodes: cassandra + teamFeatures: cassandra + migrateConversations: false + migrateConversationCodes: false + migrateTeamFeatures: false # Enable for federation enableFederation: false metrics: diff --git a/values/wire-server/prod-values.example.yaml b/values/wire-server/prod-values.example.yaml index a0e8a2c67..f3aad9b2b 100644 --- a/values/wire-server/prod-values.example.yaml +++ b/values/wire-server/prod-values.example.yaml @@ -36,6 +36,9 @@ brig: port: "5432" user: wire-server dbname: wire-server + # See pool size calculation guide: https://docs.wire.com/latest/how-to/administrate/postgresql.html + postgresqlPool: + size: 10 # adjust pool size as needed based on expected load and available resources useSES: false # Set to false if you want to hand out DynamoDB to store prekeys randomPrekeys: true @@ -56,7 +59,7 @@ brig: enableFederation: false # Keep false unless federation is explicitly configured optSettings: setEnableMLS: false # Enable for MLS protocol use - setFederationDomain: example.com # change this per host deployment + setFederationDomain: example.com # change this # Sync the domain with the 'host' variable in the sftd chart # Comment the next line (by adding '#' before it) if conference calling is not used setSftStaticUrl: "https://sftd.example.com:443" @@ -183,10 +186,15 @@ galley: port: "5432" user: wire-server dbname: wire-server + # See pool size calculation guide: https://docs.wire.com/latest/how-to/administrate/postgresql.html + postgresqlPool: + size: 10 # adjust pool size as needed based on expected load and available resources # Explicitly set postgresMigration to cassandra for fresh deployments. - # This controls whether galley reads conversations from Cassandra or PostgreSQL. + # This controls whether galley reads conversations/teamFeatures from Cassandra or PostgreSQL. postgresMigration: conversation: cassandra + conversationCodes: cassandra + teamFeatures: cassandra enableFederation: false # Enable to use federation settings: # prefix URI used when inviting users to a conversation by link @@ -366,13 +374,16 @@ background-worker: port: "5432" user: wire-server dbname: wire-server - # IMPORTANT: At Chart 5.25.0, the background-worker Helm chart incorrectly defaults - # postgresMigration.conversation to "postgresql" instead of "cassandra". - # This MUST be explicitly set to "cassandra" unless you have already migrated - # conversations to PostgreSQL. Without this override, User Group to Channel sync - # jobs will silently skip member synchronization. + # See pool size calculation guide: https://docs.wire.com/latest/how-to/administrate/postgresql.html + postgresqlPool: + size: 5 # Background worker has fewer connections to DB, so smaller pool size is fine postgresMigration: conversation: cassandra + conversationCodes: cassandra + teamFeatures: cassandra + migrateConversations: false + migrateConversationCodes: false + migrateTeamFeatures: false # Enable for federation enableFederation: false metrics: