Skip to content

Commit

Permalink
revert: return to underscores for value of openid_connect (#180)
Browse files Browse the repository at this point in the history
## Description

This fixes the autosignin key docs since that must be an underscore `_`

## Related Issue

Fixes #N/A

## Type of change

- [X] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] 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

Refs: 59e3954
  • Loading branch information
Racer159 authored Jul 29, 2024
1 parent 59e3954 commit db21a45
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 18 deletions.
11 changes: 2 additions & 9 deletions bundle/uds-bundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -80,21 +80,14 @@ 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."
path: "sso.adminGroups"
- name: GITLAB_REQUIRED_GROUPS
description: "Array of group names that are required for GitLab acess."
path: "sso.requiredGroups"
values:
# TODO: (@WSTARR) The below two overrides will no longer be needed after the next release
- path: redis.namespace
value: valkey
- path: redis.selector
value:
app.kubernetes.io/name: valkey
gitlab:
values:
- path: global.psql.host
Expand All @@ -110,7 +103,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: 0 additions & 8 deletions chart/templates/NOTES.txt

This file was deleted.

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) (or (eq .Values.sso.protocol "openid_connect") (eq .Values.sso.protocol "openid-connect")) }}
{{- if and (.Values.sso.enabled) (eq .Values.sso.protocol "openid_connect") }}
sso:
- name: GitLab Login
clientId: uds-swf-gitlab
Expand Down

0 comments on commit db21a45

Please sign in to comment.