Skip to content

Commit c29f652

Browse files
authored
Merge pull request #4660 from wireapp/release_2025-07-11_14_25
Release 2025-07-11 - (expected chart version 5.18.0)
2 parents 732dd4e + 8aa8cc8 commit c29f652

File tree

357 files changed

+37034
-1550
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

357 files changed

+37034
-1550
lines changed

CHANGELOG.md

Lines changed: 84 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,86 @@
1+
# [2025-07-11] (Chart Release 5.18.0)
2+
3+
## Release notes
4+
5+
6+
* charts/cannon: There is a new configuration value called
7+
`config.notificationTTL`, this defaults to the same value as gundeck. If it is
8+
overriden in gundeck, it must also be overriden in cannon. (#4631)
9+
10+
11+
## API changes
12+
13+
14+
* Finalize API version V9 (#4645)
15+
16+
* Add the `TeamId` to the payload of `conversation.delete` events. The field's
17+
path is `team`. (#4618)
18+
19+
20+
## Features
21+
22+
23+
* Allow team admin to query channel data (#4633, #4635)
24+
25+
* Brig setting to en-/disable ephemeral user creation (#4630)
26+
27+
* Allow team admin to remove members from a channel (#4620)
28+
29+
* background-worker: New gauge metric `wire_background_worker_running_workers`,
30+
contains label `worker` for each worker. Set to `1` when the worker is running,
31+
set to `0` when the worker is not running. (#4652)
32+
33+
* cannon: Replace message count mechanism with detecting the end of initial sync (#4631)
34+
35+
* The /events websocket will close a connection when it detects client inactivity. The inactivity behaviour can be controlled by setting the cannon options `wsOpts.activityTimeout` and `wsOpts.pongTimeout`. After `wsOpts.activityTimeout` microseconds of client inactivity (including no pings), the server sends a ping, and waits for a corresponding pong for `wsOpts.pongTimeout` microseconds. If no pong is received within this time window, the connection is terminated. (#4636)
36+
37+
38+
## Bug fixes and other updates
39+
40+
41+
* Team name removed from team invitation email template (#4654)
42+
43+
* gundeck: Send push notifications to clients with `consumable-notifications` capability (#4626)
44+
45+
* Avoid returning duplicate user search results when handle matches exactly (#4656)
46+
47+
* background-worker/dead-user-notifs-watcher: Reconnect when connection with RabbitMQ is broken (#4652)
48+
49+
* Generated Swagger docs differed from the ratified ones for versions up to V9
50+
regarding the `get-all-registered-domains`
51+
(`/teams/{teamId}/registered-domains`) endpoint: The `backend_url` became part
52+
of the `backend` object which should be introduced with V10. As teams do not
53+
set backend redirects this should not be seen in practice. (#4647)
54+
55+
56+
## Documentation
57+
58+
59+
* Add documentation on self-deleting messages and setting custom time-frames for operators (#4650)
60+
61+
62+
## Internal changes
63+
64+
65+
* Upgrade RabbitMQ to version 4.x locally and on CI (#4639)
66+
67+
* No ack for `message_count` event (#4625)
68+
69+
* More test on validation of scim-provisioned emails. Cleanup of code and internal APIs. (#4617)
70+
71+
* Fix false positive warning of members not being present in remote conversations. (#4644)
72+
73+
* Updated email templates to v1.0.130 (#4648)
74+
75+
* Updated email templates to v1.0.133 (#4655)
76+
77+
* Limit the amount of unacknowledged messages the RabbitMQ notifications consumer
78+
receives to `100`. Beyond this limit, received messages have to be acknowledged
79+
to receive new ones. This prevents overloading the consumer with new messages. (#4615)
80+
81+
* Timestamps for failing integration tests. (#4638)
82+
83+
184
# [2025-06-16] (Chart Release 5.17.0)
285

386
## Release notes
@@ -106,7 +189,7 @@
106189
## API changes
107190

108191

109-
* From API version V9 on, the `POST /domain-verification/{domain}/backend` and
192+
* From API version V10 on, the `POST /domain-verification/{domain}/backend` and
110193
`POST /get-domain-registration` endpoints are adjusted to also carry the
111194
`webapp_url` in their payloads. The structure of these payloads changes as
112195
well: The former `backend_url` and the new `webapp_url` are now combined in one

Makefile

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ clean:
7777
clean-hint:
7878
@echo -e "\n\n\n>>> PSA: if you get errors that are hard to explain,"
7979
@echo -e ">>> try 'git submodule update --init --recursive' and 'make full-clean' and run your command again."
80-
@echo -e ">>> see https://github.com/wireapp/wire-server/blob/develop/docs/developer/building.md#linker-errors-while-compiling"
80+
@echo -e ">>> see https://github.com/wireapp/wire-server/blob/develop/docs/src/developer/developer/building.md#linker-errors-while-compiling"
8181
@echo -e ">>> to never have to remember submodules again, try 'git config --global submodule.recurse true'"
8282
@echo -e "\n\n\n"
8383

@@ -151,8 +151,8 @@ devtest:
151151
# find . -name '*.hs' | entr -s 'make -C ~/src/wire-server c package=wire-subsystems test=1'
152152
.PHONY: devtest-package
153153
devtest-package:
154-
@ghcid --command 'cabal repl test:$(package)-tests' --test='main' \
155-
|| echo -e "\n\n\n*** usage: make devtest-package package=wire-subsystems.\n*** did you make sure the test-suite goal in the cabal file of your\n*** package follows the naming convention (see wire-subsystems)?\n\n"
154+
@ghcid --command 'cabal repl $(package):tests lib:$(package)' --test='main' \
155+
|| echo -e "\n\n\n*** usage: make devtest-package package=<package>.\n*** this works for wire-subsystems; for other packages, you may need to edit the cabal file.\n\n"
156156

157157
.PHONY: sanitize-pr
158158
sanitize-pr: check-weed treefmt
@@ -444,7 +444,7 @@ libzauth:
444444
kube-integration: kube-integration-setup kube-integration-test
445445

446446
.PHONY: kube-integration-setup
447-
kube-integration-setup: charts-integration
447+
kube-integration-setup: charts-integration helm-oci-login
448448
export NAMESPACE=$(NAMESPACE); export HELM_PARALLELISM=$(HELM_PARALLELISM); ./hack/bin/integration-setup-federation.sh
449449

450450
.PHONY: kube-integration-test
@@ -468,6 +468,9 @@ kube-restart-%:
468468
kubectl delete pod -n $(NAMESPACE) -l app=$(*)
469469
kubectl delete pod -n $(NAMESPACE)-fed2 -l app=$(*)
470470

471+
helm-oci-login:
472+
./hack/bin/helm-oci-login.sh
473+
471474
.PHONY: latest-tag
472475
latest-tag:
473476
./hack/bin/find-latest-docker-tag.sh
@@ -540,7 +543,7 @@ upload-chart-%: release-chart-%
540543
./hack/bin/upload-helm-charts-s3.sh -r $(HELM_REPO) -d .local/charts/$(*)
541544

542545
# Usecases for this make target:
543-
# To uplaod all helm charts in the CHARTS_RELEASE list (see top of the time)
546+
# To upload all helm charts in the CHARTS_RELEASE list (see top of the time)
544547
# (assummption: CI sets DOCKER_TAG and HELM_SEMVER)
545548
.PHONY: upload-charts
546549
upload-charts: charts-release
@@ -626,7 +629,7 @@ kind-restart-%: .local/kind-kubeconfig
626629
kubectl delete pod -n $(NAMESPACE)-fed2 -l app=$(*)
627630

628631
# This target can be used to template a helm chart with values filled in from
629-
# hack/helm_vars (what CI uses) as overrrides, if available. This allows debugging helm
632+
# hack/helm_vars (what CI uses) as overrides, if available. This allows debugging helm
630633
# templating issues without actually installing anything, and without needing
631634
# access to a kubernetes cluster. e.g.:
632635
# make helm-template-wire-server

charts/brig/templates/configmap.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -388,5 +388,6 @@ data:
388388
setAuditLogEmailRecipient: {{ .setAuditLogEmailRecipient }}
389389
{{- end }}
390390
setChallengeTTL: {{ or .setChallengeTTL 172800 }}
391+
setEphemeralUserCreationEnabled: {{ .setEphemeralUserCreationEnabled }}
391392
{{- end }}
392393
{{- end }}

charts/brig/values.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ config:
8080
# key: <ca-attribute>
8181

8282
# Postgres connection settings
83-
#
83+
#
8484
# Values are described in https://www.postgresql.org/docs/17/libpq-connect.html#LIBPQ-PARAMKEYWORDS
8585
# To set the password via a brig secret see `secrets.pgPassword`.
8686
#
@@ -189,6 +189,7 @@ config:
189189
ipAddressExceptions: []
190190
maxRateLimitedKeys: 100000 # Estimated memory usage: 4 MB
191191
# setAuditLogEmailRecipient: [email protected]
192+
setEphemeralUserCreationEnabled: true
192193

193194
smtp:
194195
passwordFile: /etc/wire/brig/secrets/smtp-password.txt

charts/cannon/templates/configmap.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,16 @@ data:
3636
{{- end }}
3737
{{- end }}
3838
39+
rabbitMqMaxConnections: {{ .config.rabbitMqMaxConnections }}
40+
rabbitMqMaxChannels: {{ .config.rabbitMqMaxChannels }}
41+
3942
drainOpts:
4043
gracePeriodSeconds: {{ .config.drainOpts.gracePeriodSeconds }}
4144
millisecondsBetweenBatches: {{ .config.drainOpts.millisecondsBetweenBatches }}
4245
minBatchSize: {{ .config.drainOpts.minBatchSize }}
4346
4447
disabledAPIVersions: {{ toJson .config.disabledAPIVersions }}
48+
notificationTTL: {{ .config.notificationTTL }}
4549
{{- end }}
4650

4751

charts/cannon/values.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ config:
1717
vHost: /
1818
enableTls: false
1919
insecureSkipVerifyTls: false
20+
rabbitMqMaxConnections: 1000
21+
rabbitMqMaxChannels: 300
2022
cassandra:
2123
host: aws-cassandra
2224
# To enable TLS provide a CA:
@@ -37,6 +39,11 @@ config:
3739
millisecondsBetweenBatches: 50
3840
minBatchSize: 20
3941

42+
# TTL of stored notifications in Seconds. After this period, notifications
43+
# will be deleted and thus not delivered.
44+
# The default is 28 days.
45+
notificationTTL: 2419200
46+
4047
# Disable one ore more API versions. Please make sure the configuration value is the same in all these charts:
4148
# brig, cannon, cargohold, galley, gundeck, proxy, spar.
4249
disabledAPIVersions: [ development ]

charts/galley/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ config:
148148
status: disabled
149149
sso: disabled-by-default
150150
teamSearchVisibility: disabled-by-default
151-
validateSAMLemails:
151+
validateSAMLEmails:
152152
defaults:
153153
status: enabled
154154
outlookCalIntegration:

charts/nginz/values.yaml

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,6 @@ nginx_conf:
153153
- all
154154
max_body_size: "0"
155155
disable_request_buffering: true
156-
doc: true
157156
- path: /bot/assets
158157
envs:
159158
- all
@@ -170,12 +169,10 @@ nginx_conf:
170169
envs:
171170
- all
172171
use_websockets: true
173-
doc: true
174172
- path: /events
175173
envs:
176174
- all
177175
use_websockets: true
178-
doc: true
179176
brig:
180177
- path: /api-version
181178
envs:
@@ -185,11 +182,9 @@ nginx_conf:
185182
- path: /users
186183
envs:
187184
- all
188-
doc: true
189185
- path: /handles
190186
envs:
191187
- all
192-
doc: true
193188
- path: /list-users
194189
envs:
195190
- all
@@ -581,12 +576,10 @@ nginx_conf:
581576
- path: /conversations$
582577
envs:
583578
- all
584-
doc: true
585579
oauth_scope: conversations
586580
- path: /conversations/([^/]*)/code
587581
envs:
588582
- all
589-
doc: true
590583
oauth_scope: conversations_code
591584
- path: /conversations/join
592585
envs:
@@ -596,7 +589,6 @@ nginx_conf:
596589
- path: /conversations
597590
envs:
598591
- all
599-
doc: true
600592
- path: /legalhold/conversations/(.*)
601593
envs:
602594
- all
@@ -701,13 +693,15 @@ nginx_conf:
701693
- path: /push
702694
envs:
703695
- all
704-
doc: true
705696
- path: /presences
706697
envs:
707698
- all
708699
- path: /notifications
709700
envs:
710701
- all
702+
- path: /time
703+
envs:
704+
- all
711705
spar:
712706
- path: /identity-providers
713707
envs:
@@ -764,7 +758,6 @@ nginx_conf:
764758
- path: /proxy
765759
envs:
766760
- all
767-
doc: true
768761
ibis:
769762
- path: /billing
770763
envs:

deploy/dockerephemeral/docker-compose.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ services:
318318

319319
rabbitmq:
320320
container_name: rabbitmq
321-
image: rabbitmq:3.13.7-management-alpine
321+
image: rabbitmq:4.1.1-management-alpine
322322
environment:
323323
- RABBITMQ_USERNAME
324324
- RABBITMQ_PASSWORD

0 commit comments

Comments
 (0)