diff --git a/chart/templates/NOTES.txt b/chart/templates/NOTES.txt new file mode 100644 index 0000000..d21e048 --- /dev/null +++ b/chart/templates/NOTES.txt @@ -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 }} diff --git a/chart/templates/uds-package.yaml b/chart/templates/uds-package.yaml index 1e9fbda..c6c2544 100644 --- a/chart/templates/uds-package.yaml +++ b/chart/templates/uds-package.yaml @@ -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 }} @@ -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 }}" diff --git a/chart/values.yaml b/chart/values.yaml index b7b6fcc..3b4d79f 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -29,7 +29,7 @@ postgres: mattermostLicense: "" sso: enabled: true - # Options: "gitlab", "openid_connect" + # Options: "gitlab", "openid-connect" protocol: "gitlab" secretName: mattermost-sso