Skip to content

Make all feature configs overridable #2479

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 14, 2022
Merged

Make all feature configs overridable #2479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f7c3314
update galley configmap to make feature overridable, and add optional…
battermann Jun 14, 2022
f55c07c
changelog
battermann Jun 14, 2022
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
1 change: 1 addition & 0 deletions changelog.d/5-internal/pr-2479
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
20 changes: 20 additions & 0 deletions charts/galley/templates/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
49 changes: 38 additions & 11 deletions charts/galley/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,17 +37,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: {}
Expand Down