From a31c92522e013c1f76490975a0129988e6a38b12 Mon Sep 17 00:00:00 2001 From: zebot Date: Mon, 13 Jun 2022 16:29:38 +0200 Subject: [PATCH 1/5] chore: [charts] Update webapp version (#2475) Co-authored-by: Zebot --- changelog.d/0-release-notes/webapp-upgrade | 1 + charts/webapp/values.yaml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 changelog.d/0-release-notes/webapp-upgrade diff --git a/changelog.d/0-release-notes/webapp-upgrade b/changelog.d/0-release-notes/webapp-upgrade new file mode 100644 index 0000000000..b9100e20b3 --- /dev/null +++ b/changelog.d/0-release-notes/webapp-upgrade @@ -0,0 +1 @@ +Upgrade webapp version to 2022-06-13-production.0-v0.29.7-0-2819b90 diff --git a/charts/webapp/values.yaml b/charts/webapp/values.yaml index ef6d6b9d35..a639cd046a 100644 --- a/charts/webapp/values.yaml +++ b/charts/webapp/values.yaml @@ -9,7 +9,7 @@ resources: cpu: "1" image: repository: quay.io/wire/webapp - tag: "2022-05-04-production.0-v0.29.7-0-a6f2ded" + tag: "2022-06-13-production.0-v0.29.7-0-2819b90" service: https: externalPort: 443 From 4ad4c09bd1274d1bb684956f0e1b25c9347f2951 Mon Sep 17 00:00:00 2001 From: zebot Date: Tue, 14 Jun 2022 12:05:32 +0200 Subject: [PATCH 2/5] chore: [charts] Update team-settings version (#2477) Co-authored-by: Zebot --- changelog.d/0-release-notes/team-settings-upgrade | 1 + charts/team-settings/values.yaml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 changelog.d/0-release-notes/team-settings-upgrade diff --git a/changelog.d/0-release-notes/team-settings-upgrade b/changelog.d/0-release-notes/team-settings-upgrade new file mode 100644 index 0000000000..461c829d9d --- /dev/null +++ b/changelog.d/0-release-notes/team-settings-upgrade @@ -0,0 +1 @@ +Upgrade team-settings version to 4.10.0-v0.29.7-0-3be8ca3 diff --git a/charts/team-settings/values.yaml b/charts/team-settings/values.yaml index b4285adb49..abdcfdd60f 100644 --- a/charts/team-settings/values.yaml +++ b/charts/team-settings/values.yaml @@ -9,7 +9,7 @@ resources: cpu: "1" image: repository: quay.io/wire/team-settings - tag: "4.9.0-v0.29.7-0-142a76f" + tag: "4.10.0-v0.29.7-0-3be8ca3" service: https: externalPort: 443 From 7ba904baecafe83d98aed1a97125700ef63afd39 Mon Sep 17 00:00:00 2001 From: Leif Battermann Date: Tue, 14 Jun 2022 13:36:10 +0200 Subject: [PATCH 3/5] added guest link feature config docs (#2480) --- changelog.d/4-docs/pr-2480 | 1 + .../how-to/install/team-feature-settings.md | 23 +++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 changelog.d/4-docs/pr-2480 diff --git a/changelog.d/4-docs/pr-2480 b/changelog.d/4-docs/pr-2480 new file mode 100644 index 0000000000..309e21c1ae --- /dev/null +++ b/changelog.d/4-docs/pr-2480 @@ -0,0 +1 @@ +Docs for guest links server and team feature settings added diff --git a/docs/src/how-to/install/team-feature-settings.md b/docs/src/how-to/install/team-feature-settings.md index bc6384e838..01e1a8497d 100644 --- a/docs/src/how-to/install/team-feature-settings.md +++ b/docs/src/how-to/install/team-feature-settings.md @@ -28,3 +28,26 @@ galley: ``` Note that the lock status is required but has no effect, as it is currently not supported for team admins to enable or disable `sndFactorPasswordChallenge`. We recommend to set the lock status to `locked`. + +## Guest links + +The guest link feature is the ability for a Wire users to join a group conversation by tapping on a unique link generated by an admin of that group. + +The feature is enabled and unlocked by default and can be disabled on a per-team (via team management) basis or disabled and optionally locked for the entire backend (via Helm overrides). If the feature is locked, it cannot be enabled by team admins via team management. + +To change the configuration for the entire server, add the following to your Helm overrides in `values/wire-server/values.yaml`: + +```yaml +galley: + # ... + config: + # ... + settings: + # ... + featureFlags: + # ... + conversationGuestLinks: + defaults: + status: disabled + lockStatus: locked +``` From 0bb42cdd48fa54824ca530286e7223a50782b244 Mon Sep 17 00:00:00 2001 From: Leif Battermann Date: Tue, 14 Jun 2022 14:04:01 +0200 Subject: [PATCH 4/5] Make all feature configs overridable (#2479) --- changelog.d/5-internal/pr-2479 | 1 + charts/galley/templates/configmap.yaml | 20 +++++++++++ charts/galley/values.yaml | 49 ++++++++++++++++++++------ 3 files changed, 59 insertions(+), 11 deletions(-) create mode 100644 changelog.d/5-internal/pr-2479 diff --git a/changelog.d/5-internal/pr-2479 b/changelog.d/5-internal/pr-2479 new file mode 100644 index 0000000000..e90e5240a7 --- /dev/null +++ b/changelog.d/5-internal/pr-2479 @@ -0,0 +1 @@ +All feature configs like guest links e.g. can now be overridden in the helm configuration, so that they can be disabled/enabled and configured server wide diff --git a/charts/galley/templates/configmap.yaml b/charts/galley/templates/configmap.yaml index d12801abdc..eb7eda5141 100644 --- a/charts/galley/templates/configmap.yaml +++ b/charts/galley/templates/configmap.yaml @@ -79,5 +79,25 @@ data: searchVisibilityInbound: {{- toYaml .settings.featureFlags.searchVisibilityInbound | nindent 10 }} {{- end }} + {{- if .settings.featureFlags.validateSAMLemails }} + validateSAMLemails: + {{- toYaml .settings.featureFlags.validateSAMLemails | nindent 10 }} + {{- end }} + {{- if .settings.featureFlags.appLock }} + appLock: + {{- toYaml .settings.featureFlags.appLock | nindent 10 }} + {{- end }} + {{- if .settings.featureFlags.conferenceCalling }} + conferenceCalling: + {{- toYaml .settings.featureFlags.conferenceCalling | nindent 10 }} + {{- end }} + {{- if .settings.featureFlags.selfDeletingMessages }} + selfDeletingMessages: + {{- toYaml .settings.featureFlags.selfDeletingMessages | nindent 10 }} + {{- end }} + {{- if .settings.featureFlags.conversationGuestLinks }} + conversationGuestLinks: + {{- toYaml .settings.featureFlags.conversationGuestLinks | nindent 10 }} + {{- end }} {{- end }} {{- end }} diff --git a/charts/galley/values.yaml b/charts/galley/values.yaml index a070ebea49..d5746c15e3 100644 --- a/charts/galley/values.yaml +++ b/charts/galley/values.yaml @@ -34,17 +34,44 @@ config: status: disabled config: domains: [] - # fileSharing setting is optional - # if not set the default feature status is enabled and the default lock status is unlocked - # fileSharing: - # defaults: - # status: enabled - # lockStatus: unlocked - # sndFactorPasswordChallenge setting is optional - # sndFactorPasswordChallenge: - # defaults: - # status: disabled - # lockStatus: locked + # optional + fileSharing: + defaults: + status: enabled + lockStatus: unlocked + # optional + sndFactorPasswordChallenge: + defaults: + status: disabled + lockStatus: locked + # optional + validateSAMLemails: + defaults: + status: enabled + # optional + appLock: + defaults: + status: enabled + config: + enforceAppLock: false + inactivityTimeoutSecs: 60 + # optional + conferenceCalling: + defaults: + status: enabled + # optional + selfDeletingMessages: + defaults: + status: enabled + lockStatus: unlocked + config: + enforcedTimeoutSeconds: 0 + # optional + conversationGuestLinks: + defaults: + status: enabled + lockStatus: unlocked + aws: region: "eu-west-1" proxy: {} From 71c3f05fe130a0b9009b67c97c2ca1ccab90934c Mon Sep 17 00:00:00 2001 From: Zebot Date: Tue, 14 Jun 2022 12:17:06 +0000 Subject: [PATCH 5/5] Add changelog for Release 2022-06-14 --- CHANGELOG.md | 22 +++++++++++++++++++ .../0-release-notes/team-settings-upgrade | 1 - changelog.d/0-release-notes/webapp-upgrade | 1 - changelog.d/4-docs/pr-2480 | 1 - changelog.d/5-internal/pr-2479 | 1 - 5 files changed, 22 insertions(+), 4 deletions(-) delete mode 100644 changelog.d/0-release-notes/team-settings-upgrade delete mode 100644 changelog.d/0-release-notes/webapp-upgrade delete mode 100644 changelog.d/4-docs/pr-2480 delete mode 100644 changelog.d/5-internal/pr-2479 diff --git a/CHANGELOG.md b/CHANGELOG.md index 0a7338eaff..08ffdc33cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,25 @@ +# [2022-06-14] (Chart Release 4.14.0) + +## Release notes + + +* Upgrade team-settings version to 4.10.0-v0.29.7-0-3be8ca3 (#2180) + +* Upgrade webapp version to 2022-06-13-production.0-v0.29.7-0-2819b90 (#2302) + + +## Documentation + + +* Docs for guest links server and team feature settings added (#2480) + +## Internal changes + + +* All feature configs like guest links e.g. can now be overridden in the helm configuration, so that they can be disabled/enabled and configured server wide (#2479) + + + # [2022-06-08] (Chart Release 4.13.0) ## Release notes diff --git a/changelog.d/0-release-notes/team-settings-upgrade b/changelog.d/0-release-notes/team-settings-upgrade deleted file mode 100644 index 461c829d9d..0000000000 --- a/changelog.d/0-release-notes/team-settings-upgrade +++ /dev/null @@ -1 +0,0 @@ -Upgrade team-settings version to 4.10.0-v0.29.7-0-3be8ca3 diff --git a/changelog.d/0-release-notes/webapp-upgrade b/changelog.d/0-release-notes/webapp-upgrade deleted file mode 100644 index b9100e20b3..0000000000 --- a/changelog.d/0-release-notes/webapp-upgrade +++ /dev/null @@ -1 +0,0 @@ -Upgrade webapp version to 2022-06-13-production.0-v0.29.7-0-2819b90 diff --git a/changelog.d/4-docs/pr-2480 b/changelog.d/4-docs/pr-2480 deleted file mode 100644 index 309e21c1ae..0000000000 --- a/changelog.d/4-docs/pr-2480 +++ /dev/null @@ -1 +0,0 @@ -Docs for guest links server and team feature settings added diff --git a/changelog.d/5-internal/pr-2479 b/changelog.d/5-internal/pr-2479 deleted file mode 100644 index e90e5240a7..0000000000 --- a/changelog.d/5-internal/pr-2479 +++ /dev/null @@ -1 +0,0 @@ -All feature configs like guest links e.g. can now be overridden in the helm configuration, so that they can be disabled/enabled and configured server wide