Merge remote-tracking branch 'origin/develop' into mls

.gitignore

@@ -59,9 +59,6 @@ spar.integration-aws.yaml
 integration-aws.yaml
 DOCKER_ID*
 swagger-ui
-!charts/nginz/static/swagger-ui
-
-services/nginz/integration-test/conf/nginz/zwagger-ui/*
 
 deploy/dockerephemeral/build/airdock_base-all/
 deploy/dockerephemeral/build/airdock_base/

Makefile

@@ -236,7 +236,7 @@ db-migrate-package:
 
 # Usage:
 #
-# Reset all keyspaces
+# Reset all keyspaces and reset the ES index
 # make db-reset
 #
 # Reset keyspace for only one service, say galley:
@@ -252,28 +252,22 @@ ifeq ($(package), all)
 else
 	$(EXE_SCHEMA) --keyspace $(package)_test --replication-factor 1 --reset
 endif
+	./dist/brig-index reset --elasticsearch-server http://localhost:9200 > /dev/null
 
 # Usage:
 #
-# Migrate all keyspaces
+# Migrate all keyspaces and reset the ES index
 # make db-migrate
 #
 # Migrate keyspace for only one service, say galley:
 # make db-migrate package=galley
 .PHONY: db-migrate
 db-migrate: c
-ifeq ($(package), all)
-	./dist/brig-schema --keyspace brig_test --replication-factor 1
-	./dist/galley-schema --keyspace galley_test --replication-factor 1
-	./dist/gundeck-schema --keyspace gundeck_test --replication-factor 1
-	./dist/spar-schema --keyspace spar_test --replication-factor 1
-# How this check works: https://stackoverflow.com/a/9802777
-else ifeq ($(package), $(filter $(package),brig galley gundeck spar))
-	$(EXE_SCHEMA) --keyspace $(package)_test --replication-factor 1
-else
-	@echo No schema migrations for $(package)
-endif
-
+	./dist/brig-schema --keyspace brig_test --replication-factor 1 > /dev/null
+	./dist/galley-schema --keyspace galley_test --replication-factor 1 > /dev/null
+	./dist/gundeck-schema --keyspace gundeck_test --replication-factor 1 > /dev/null
+	./dist/spar-schema --keyspace spar_test --replication-factor 1 > /dev/null
+	./dist/brig-index reset --elasticsearch-server http://localhost:9200 > /dev/null
 
 #################################
 ## dependencies

changelog.d/0-release-notes/coturn-beta

@@ -0,0 +1 @@
+The coturn Helm chart has been promoted to *beta* level stability.

changelog.d/2-features/coturn-image-update

@@ -0,0 +1,6 @@
+The coturn container image included in the coturn Helm chart was updated to
+version `4.6.0-wireapp.3`.
+
+With this version of coturn, the Prometheus metrics endpoint has been
+updated, and the `turn_active_allocations` metric label has been *renamed* to
+`turn_total_allocations`.

changelog.d/3-bug-fixes/coturn-config-reloader

@@ -0,0 +1,3 @@
+The container image used for handling online TLS certificate updates in the
+coturn Helm chart was updated to a version with metadata compatible with
+containerd.

changelog.d/4-docs/pr-3038

@@ -0,0 +1 @@
+Update SAML/SCIM docs

changelog.d/5-internal/doc-msg-sending

@@ -0,0 +1 @@
+Document in code a function that sends remote Proteus messages

changelog.d/5-internal/federator-log

@@ -0,0 +1 @@
+Lower the log level of federator inotify

changelog.d/5-internal/graceful-shutdown

@@ -0,0 +1 @@
+use Wai's settings for graceful shutdown

changelog.d/5-internal/redundant-constraints

@@ -0,0 +1,2 @@
+Enabling warnings for redundant constraints and removing the redundant
+constraints.

changelog.d/5-internal/servantify-teams-notifications

@@ -0,0 +1 @@
+Migrate `/teams/notifications` to use the Servant library.

charts/coturn/Chart.yaml

@@ -11,4 +11,4 @@ version: 0.0.42
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: 4.5.2-wireapp.8
+appVersion: 4.6.0-wireapp.3

charts/coturn/README.md

@@ -1,4 +1,4 @@
-**Warning**: this chart is currently considered alpha. Use at your own risk!
+**Warning**: this chart is currently considered beta. Use at your own risk!
 
 This chart deploys Wire's fork of [coturn](https://github.com/coturn/coturn),
 a STUN and TURN server, with some additional features developed by Wire (see

charts/coturn/values.yaml

@@ -36,7 +36,7 @@ tls:
     # for handling runtime certificate reloads.
     repository: quay.io/wire/config-reloader-sidecar
     pullPolicy: IfNotPresent
-    tag: 1aa6cbbf2ce3a5182ec47e3579bbcb8f47e22fdc
+    tag: 72c3c8434660bd157d42012b0bcd67f338fc5c7a
 
 metrics:
   serviceMonitor: