From 11d3a02446590be2ca9facaf8f6959c044f86375 Mon Sep 17 00:00:00 2001 From: Michael Borland Date: Fri, 15 Nov 2024 18:16:45 +0000 Subject: [PATCH 1/3] feat:add ability to change default scopes --- charts/config/templates/uds-package.yaml | 14 ++++++++++++-- charts/config/values.yaml | 2 ++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/charts/config/templates/uds-package.yaml b/charts/config/templates/uds-package.yaml index b71316f3..637ac7b6 100644 --- a/charts/config/templates/uds-package.yaml +++ b/charts/config/templates/uds-package.yaml @@ -13,7 +13,12 @@ spec: clientId: uds-swf-gitlab redirectUris: - "https://gitlab.{{ .Values.domain }}/users/auth/openid_connect/callback" - + defaultClientScopes: + {{- if .Values.sso.defaultClientScopes }} + {{- range .Values.sso.defaultClientScopes }} + - "{{ . }}" + {{- end }} + {{- end }} secretName: {{ .Values.sso.secretName }} secretTemplate: # GitLab expects a providers JSON file that is documented more here: https://gitlab-org.gitlab.io/technical-writing-group/gitlab-docs-hugo/administration/auth/oidc/ @@ -55,11 +60,16 @@ spec: protocol: saml defaultClientScopes: + {{- if .Values.sso.defaultClientScopes }} + {{- range .Values.sso.defaultClientScopes }} + - "{{ . }}" + {{- end }} + {{- else }} - "mapper-saml-email-email" - "mapper-saml-firstname-first_name" - "mapper-saml-lastname-last_name" - "mapper-saml-grouplist-groups" - + {{- end }} attributes: saml.client.signature: "false" diff --git a/charts/config/values.yaml b/charts/config/values.yaml index de3e023d..a3586ee6 100644 --- a/charts/config/values.yaml +++ b/charts/config/values.yaml @@ -17,6 +17,8 @@ sso: # Note: the following settings only apply when using `saml` requiredGroups: [] adminGroups: ["/GitLab Admin", "/UDS Core/Admin"] + # This will replace the current list of default scopes. + defaultClientScopes: {} storage: internal: true # Set to false to use external storage selector: From a440ae0b165e4e81039b1e18eb76de14432064a1 Mon Sep 17 00:00:00 2001 From: Michael Borland Date: Fri, 15 Nov 2024 18:42:22 +0000 Subject: [PATCH 2/3] WIP: bracket fix --- charts/config/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/config/values.yaml b/charts/config/values.yaml index a3586ee6..a7bb6b8f 100644 --- a/charts/config/values.yaml +++ b/charts/config/values.yaml @@ -18,7 +18,7 @@ sso: requiredGroups: [] adminGroups: ["/GitLab Admin", "/UDS Core/Admin"] # This will replace the current list of default scopes. - defaultClientScopes: {} + defaultClientScopes: [] storage: internal: true # Set to false to use external storage selector: From cef97a71716a9cc39d686504b76a0dbf0c37dc1f Mon Sep 17 00:00:00 2001 From: Michael Borland Date: Fri, 15 Nov 2024 20:09:54 +0000 Subject: [PATCH 3/3] fix: remove dependency:create --- tasks.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/tasks.yaml b/tasks.yaml index e79eeba3..a3f829d7 100644 --- a/tasks.yaml +++ b/tasks.yaml @@ -62,8 +62,6 @@ tasks: actions: # TODO Delete dependencies.yaml after next releaser - task: upgrade:create-latest-tag-bundle - with: - dep_commands: ./uds run dependencies:create - task: setup:k3d-test-cluster - task: deploy:test-bundle - task: compliance:validate