Skip to content
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

feat: expose requiredGroups in sso config #167

Merged
merged 3 commits into from
Jul 16, 2024
Merged

feat: expose requiredGroups in sso config #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f73bac2
feat: expose requiredGroups in sso config
Racer159 Jul 15, 2024
03614e8
add an example
Racer159 Jul 15, 2024
5427927
add an example
Racer159 Jul 15, 2024
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
3 changes: 3 additions & 0 deletions bundle/uds-bundle.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,9 @@ packages:
- name: GITLAB_ADMIN_GROUPS
description: "Array of group names that grant admin role gitlab when saml protocol is active."
path: "sso.adminGroups"
- name: GITLAB_REQUIRED_GROUPS
description: "Array of group names that are required for GitLab acess."
path: "sso.requiredGroups"
values:
# TODO: (@WSTARR) The below two overrides will no longer be needed after the next release
- path: redis.namespace
Expand Down
1 change: 1 addition & 0 deletions bundle/uds-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ variables:
gitlab:
DISABLE_REGISTRY_REDIRECT: "true"
GITLAB_PAGES_ENABLED: true
GITLAB_REQUIRED_GROUPS: [] # ["/GitLab"]
GITLAB_ADMIN_GROUPS: ["/GitLab Admin", "/UDS Core/Admin"]
GITLAB_SSO_PROTOCOL: saml
# # Overrides for scaled down cluster for local dev and CI
Expand Down
1 change: 1 addition & 0 deletions chart/templates/uds-package.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ spec:
"name":"saml",
"label":"SSO",
"groups_attribute": "Groups",
"required_groups": {{ .Values.sso.requiredGroups | toJson }},
"admin_groups": {{ .Values.sso.adminGroups | toJson }},
"args":{
"assertion_consumer_service_url": "https://gitlab.{{ .Values.domain }}/users/auth/saml/callback",
Expand Down
2 changes: 2 additions & 0 deletions chart/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ sso:
enabled: true
protocol: saml
secretName: gitlab-sso
# Note: the following settings only apply when using `saml`
requiredGroups: []
adminGroups: ["/GitLab Admin", "/UDS Core/Admin"]
storage:
# Set to false to use external storage
Expand Down