diff --git a/chart/templates/gitlab/secret-sso.yaml b/chart/templates/gitlab/secret-sso.yaml index 0c76b0a83c7c60b46a2c660eba198e005c734c2e..55c41b7269a277b93c58a7625143ac1ff6a5a0ff 100644 --- a/chart/templates/gitlab/secret-sso.yaml +++ b/chart/templates/gitlab/secret-sso.yaml @@ -16,23 +16,20 @@ stringData: "args": { "name": "openid_connect", "scope": [ - {{- $scopes := .Values.addons.gitlab.sso.scopes | default (list "Gitlab") | uniq }} - {{- range $index, $scopes }} - {{ $index | quote }}{{if ne $index (last $scopes)}},{{end}} - {{- end }} + "Gitlab" ], "response_type": "code", - "issuer": {{ .Values.addons.gitlab.sso.issuer_uri | default "https://{{ .Values.sso.oidc.host }}/auth/realms/{{ .Values.sso.oidc.realm }}" | quote }}, + "issuer": "https://{{ .Values.sso.oidc.host }}/auth/realms/{{ .Values.sso.oidc.realm }}", "client_auth_method": "query", "discovery": true, - "uid_field": {{ .Values.addons.gitlab.sso.uid_field | default "preferred_username" | quote }}, + "uid_field": "preferred_username", "client_options": { "identifier": "{{ .Values.addons.gitlab.sso.client_id | default .Values.sso.client_id }}", "secret": "{{ .Values.addons.gitlab.sso.client_secret | default .Values.sso.client_secret }}", "redirect_uri": "https://{{ .Values.addons.gitlab.hostnames.gitlab }}.{{ $domainName }}/users/auth/openid_connect/callback", - "end_session_endpoint": {{ .Values.addons.gitlab.sso.end_session_uri | default "https://{{ .Values.sso.oidc.host }}/auth/realms/{{ .Values.sso.oidc.realm }}/protocol/openid-connect/logout" | quote }} + "end_session_endpoint": "https://{{ .Values.sso.oidc.host }}/auth/realms/{{ .Values.sso.oidc.realm }}/protocol/openid-connect/logout" } } } {{- end }} -{{- end}} +{{- end}} \ No newline at end of file diff --git a/chart/values.yaml b/chart/values.yaml index 633598d1351a23de63e6aff4fc5160393703d354..10a1897bebf85bc7d7589a2322cfca11e00fcdf0 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -751,18 +751,6 @@ addons: # -- Gitlab SSO login button label label: "" - # -- Gitlab SSO Scopes, default is ["Gitlab"] - scopes: - - Gitlab - - # -- GitLab SSO URIs - # Only needed if your SSO is non-Keycloak - #issuer_uri: - #end_session_uri: - - # -- Gitlab SSO UID field - uid_field: preferred_username - database: # -- Hostname of a pre-existing PostgreSQL database to use for Gitlab. # Entering connection info will disable the deployment of an internal database and will auto-create any required secrets.