Skip to content

Commit

Permalink
chore: swap to openid-connect instead of _ (#179)
Browse files Browse the repository at this point in the history
## Description

Swap over to accept `openid-connect` instead of `openid_connect`.

## Related Issue

Fixes #N/A

## Type of change

- [ ] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [X] Other (security config, docs update, etc)

## Checklist before merging

- [X] Test, docs, adr added or updated as needed
- [X] [Contributor Guide
Steps](https://github.com/defenseunicorns/uds-package-gitlab/blob/main/CONTRIBUTING.md#developer-workflow)
followed

Release-As: v17.1.2-uds.2
  • Loading branch information
Racer159 committed Jul 26, 2024
1 parent d7be43a commit 59e3954
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 3 deletions.
4 changes: 2 additions & 2 deletions bundle/uds-bundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ packages:
description: "Boolean to enable or disable sso things"
path: "sso.enabled"
- name: GITLAB_SSO_PROTOCOL
description: "Protocol to use. Valid values are 'openid_connect' and 'saml'. Default value is 'saml'"
description: "Protocol to use. Valid values are 'openid-connect' and 'saml'. Default value is 'saml'"
path: "sso.protocol"
- name: GITLAB_ADMIN_GROUPS
description: "Array of group names that grant admin role gitlab when saml protocol is active."
Expand Down Expand Up @@ -110,7 +110,7 @@ packages:
description: "Boolean to enable or disable sso things"
path: "global.appConfig.omniauth.enabled"
- name: GITLAB_SSO_PROTOCOL
description: "Protocol to use. Valid values are 'openid_connect' and 'saml'. Default value is 'saml'"
description: "Protocol to use. Valid values are 'openid-connect' and 'saml'. Default value is 'saml'"
path: "global.appConfig.omniauth.autoSignInWithProvider"
- name: MIGRATIONS_RESOURCES
description: "Gitlab Migrations Resources"
Expand Down
8 changes: 8 additions & 0 deletions chart/templates/NOTES.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{{- $NOTICE := "\n=== NOTICE" -}}
{{- $WARNING := "\n=== WARNING" -}}
{{- $CRITICAL := "\n=== CRITICAL" -}}

{{- if eq .Values.sso.protocol "openid_connect" }}
{{ $NOTICE }}
Setting `.sso.protocol` to `openid_connect` has been deprecated - please switch to using `openid-connect` instead
{{- end }}
2 changes: 1 addition & 1 deletion chart/templates/uds-package.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: gitlab
namespace: {{ .Release.Namespace }}
spec:
{{- if and (.Values.sso.enabled) (eq .Values.sso.protocol "openid_connect") }}
{{- if and (.Values.sso.enabled) (or (eq .Values.sso.protocol "openid_connect") (eq .Values.sso.protocol "openid-connect")) }}
sso:
- name: GitLab Login
clientId: uds-swf-gitlab
Expand Down

0 comments on commit 59e3954

Please sign in to comment.