Skip to content
Merged
Show file tree
Hide file tree
Changes from 11 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -691,6 +691,10 @@ diff-live-manifest: clean-charts charts-integration
OUTPUT_FILE="/tmp/wire-server.yaml" ./hack/bin/render-manifest.sh "$(LIVE_VALUES_FILE)"; \
DIFF_OUTPUT_FILE="$(DIFF_OUTPUT_FILE)" ./hack/bin/diff-wire-server-manifests.sh "$(LIVE_MANIFEST_FILE)" /tmp/wire-server.yaml

render-ci-manifest: clean-charts charts-integration
./hack/bin/helm-render-ci-values.sh
./hack/bin/render-manifest.sh /tmp/wire-server-test-a.yaml

sbom.json:
nix -Lv build '.#wireServer.bomDependencies' && \
nix run 'github:wireapp/tom-bombadil#create-sbom' -- --root-package-name "wire-server"
Expand Down
1 change: 1 addition & 0 deletions changelog.d/0-release-notes/WPB-23942
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
A new root-level Helm value `consumableNotifications` was added to control whether RabbitMQ queues are created and used for clients with the `consumable-notifications` capability. The value is provided via the `wire-server` Helm chart defaults and defaults to `false`.
1 change: 1 addition & 0 deletions changelog.d/5-internal/WPB-23942
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Make consumable notifications configurable and disable them by default
1 change: 1 addition & 0 deletions charts/wire-server/templates/brig/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -394,5 +394,6 @@ data:
{{- if hasKey . "setNomadProfiles" }}
setNomadProfiles: {{ index . "setNomadProfiles" }}
{{- end }}
setConsumableNotifications: {{ $.Values.consumableNotifications }}
{{- end }}
{{- end }}
1 change: 1 addition & 0 deletions charts/wire-server/templates/gundeck/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -96,5 +96,6 @@ data:
{{- if hasKey . "cellsEventQueue" }}
cellsEventQueue: {{ .cellsEventQueue }}
{{- end }}
consumableNotifications: {{ $.Values.consumableNotifications }}

{{- end }}
2 changes: 2 additions & 0 deletions charts/wire-server/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ tags:
mlsstats: false
integration: false

consumableNotifications: false

galley:
replicaCount: 3
image:
Expand Down
17 changes: 17 additions & 0 deletions docs/src/developer/reference/config-options.md
Original file line number Diff line number Diff line change
Expand Up @@ -2000,6 +2000,23 @@ gundeck:
settings:
cellsEventQueue: "cells_events"
```

## Configure consumable notifications

The `consumableNotifications` flag controls whether the RabbitMQ-backed Events
API for clients with the `consumable-notifications` capability is operational.
When disabled, the legacy notification flow remains active.

This is a root-level Helm `values.yaml` setting. It is rendered into both the
`brig` and `gundeck` service configs:

```yaml
consumableNotifications: false
```

- In `brig`, it is rendered as `optSettings.setConsumableNotifications`.
- In `gundeck`, it is rendered as `settings.consumableNotifications`.

## Background worker: Background jobs

The background worker processes asynchronous jobs (conversation migrations, backend notifications). Configuration is supplied via Helm under `background-worker.config` and rendered into `background-worker.yaml`.
Expand Down
26 changes: 26 additions & 0 deletions hack/bin/helm-render-ci-values.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
#!/usr/bin/env bash
# best run via make render-wire-server-resources
# otherwise run make clean-charts and make charts-integration before

set -euo pipefail

# from repo root
export NAMESPACE_1="${NAMESPACE_1:-test-a}"
export NAMESPACE_2="${NAMESPACE_2:-test-b}"
export FEDERATION_DOMAIN_1="${FEDERATION_DOMAIN_1:-integration.example.com}"
export FEDERATION_DOMAIN_2="${FEDERATION_DOMAIN_2:-integration2.example.com}"
export FEDERATION_DOMAIN_BASE_1="${FEDERATION_DOMAIN_BASE_1:-example.com}"
export FEDERATION_DOMAIN_BASE_2="${FEDERATION_DOMAIN_BASE_2:-example.com}"
export FEDERATION_CA_CERTIFICATE="${FEDERATION_CA_CERTIFICATE:-$(cat services/nginz/integration-test/conf/nginz/integration-ca.pem)}"
export ENTERPRISE_IMAGE_PULL_SECRET="${ENTERPRISE_IMAGE_PULL_SECRET:-{}}"

helmfile -f hack/helmfile.yaml.gotmpl \
-e default \
--skip-deps \
-l name=wire-server \
write-values \
--output-file-template '/tmp/{{ .Release.Name }}-{{ .Release.Namespace }}.yaml'

VALUES_FILE="/tmp/wire-server-${NAMESPACE_1}.yaml"

echo "Rendered values: $VALUES_FILE"
2 changes: 2 additions & 0 deletions hack/helm_vars/wire-server/values.yaml.gotmpl
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ tags:
sftd: false
integration: true

consumableNotifications: false

cassandra-migrations:
imagePullPolicy: {{ .Values.imagePullPolicy }}
cassandra:
Expand Down
Loading
Loading