Skip to content

Commit

Permalink
chore: swap to openid-connect instead of _ (#124)
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: v9.10.1-uds.1
  • Loading branch information
Racer159 committed Jul 26, 2024
1 parent e967bf2 commit 88dde96
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 3 deletions.
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 }}
4 changes: 2 additions & 2 deletions chart/templates/uds-package.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
- "mapper-oidc-mattermostid-id"
- "mapper-oidc-email-email"
{{ end }}
{{ if eq .Values.sso.protocol "openid_connect" }}
{{ if or (eq .Values.sso.protocol "openid_connect") (eq .Values.sso.protocol "openid-connect") }}
- "profile"
- "email"
{{ end }}
Expand All @@ -32,7 +32,7 @@ spec:
MM_GITLABSETTINGS_TOKENENDPOINT: "http://keycloak-http.keycloak.svc.cluster.local:8080/realms/uds/protocol/openid-connect/token"
MM_GITLABSETTINGS_USERAPIENDPOINT: "https://sso.{{ .Values.domain }}/realms/uds/protocol/openid-connect/userinfo"
{{ end }}
{{ if eq .Values.sso.protocol "openid_connect" }}
{{ if or (eq .Values.sso.protocol "openid_connect") (eq .Values.sso.protocol "openid-connect") }}
MM_OPENIDSETTINGS_ENABLE: "{{ .Values.sso.enabled | toString }}"
MM_OPENIDSETTINGS_BUTTONTEXT: "{{ .Values.sso.login_button_text }}"
MM_OPENIDSETTINGS_BUTTONCOLOR: "{{ .Values.sso.login_button_color }}"
Expand Down
2 changes: 1 addition & 1 deletion chart/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ postgres:
mattermostLicense: ""
sso:
enabled: true
# Options: "gitlab", "openid_connect"
# Options: "gitlab", "openid-connect"
protocol: "gitlab"
secretName: mattermost-sso

Expand Down

0 comments on commit 88dde96

Please sign in to comment.