Skip to content

Commit 59e3954

Browse files
authoredJul 26, 2024··
chore: swap to openid-connect instead of _ (#179)
## 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
1 parent d7be43a commit 59e3954

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed
 

‎bundle/uds-bundle.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ packages:
8080
description: "Boolean to enable or disable sso things"
8181
path: "sso.enabled"
8282
- name: GITLAB_SSO_PROTOCOL
83-
description: "Protocol to use. Valid values are 'openid_connect' and 'saml'. Default value is 'saml'"
83+
description: "Protocol to use. Valid values are 'openid-connect' and 'saml'. Default value is 'saml'"
8484
path: "sso.protocol"
8585
- name: GITLAB_ADMIN_GROUPS
8686
description: "Array of group names that grant admin role gitlab when saml protocol is active."
@@ -110,7 +110,7 @@ packages:
110110
description: "Boolean to enable or disable sso things"
111111
path: "global.appConfig.omniauth.enabled"
112112
- name: GITLAB_SSO_PROTOCOL
113-
description: "Protocol to use. Valid values are 'openid_connect' and 'saml'. Default value is 'saml'"
113+
description: "Protocol to use. Valid values are 'openid-connect' and 'saml'. Default value is 'saml'"
114114
path: "global.appConfig.omniauth.autoSignInWithProvider"
115115
- name: MIGRATIONS_RESOURCES
116116
description: "Gitlab Migrations Resources"

‎chart/templates/NOTES.txt

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{{- $NOTICE := "\n=== NOTICE" -}}
2+
{{- $WARNING := "\n=== WARNING" -}}
3+
{{- $CRITICAL := "\n=== CRITICAL" -}}
4+
5+
{{- if eq .Values.sso.protocol "openid_connect" }}
6+
{{ $NOTICE }}
7+
Setting `.sso.protocol` to `openid_connect` has been deprecated - please switch to using `openid-connect` instead
8+
{{- end }}

‎chart/templates/uds-package.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
name: gitlab
55
namespace: {{ .Release.Namespace }}
66
spec:
7-
{{- if and (.Values.sso.enabled) (eq .Values.sso.protocol "openid_connect") }}
7+
{{- if and (.Values.sso.enabled) (or (eq .Values.sso.protocol "openid_connect") (eq .Values.sso.protocol "openid-connect")) }}
88
sso:
99
- name: GitLab Login
1010
clientId: uds-swf-gitlab

0 commit comments

Comments
 (0)
Please sign in to comment.