Merge pull request #2482 from wireapp/release_2022-06-14_12_17

Release 2022-06-14 - (expected chart version 4.14.0)
wireapp · Jun 14, 2022 · 98e86e7 · 98e86e7
2 parents e5583b9 + 71c3f05
commit 98e86e7
Show file tree

Hide file tree

Showing 6 changed files with 105 additions and 13 deletions.
diff --git 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/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
@@ -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: {}

diff --git 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

diff --git 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

diff --git 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 
+```