From db21a45833d07f692a9a8fd6b28447b8f8b21fee Mon Sep 17 00:00:00 2001
From: Wayne Starr <Racer159@users.noreply.github.com>
Date: Mon, 29 Jul 2024 13:45:12 -0600
Subject: [PATCH] revert: return to underscores for value of `openid_connect`
 (#180)

## 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
---
 bundle/uds-bundle.yaml           | 11 ++---------
 chart/templates/NOTES.txt        |  8 --------
 chart/templates/uds-package.yaml |  2 +-
 3 files changed, 3 insertions(+), 18 deletions(-)
 delete mode 100644 chart/templates/NOTES.txt

diff --git a/bundle/uds-bundle.yaml b/bundle/uds-bundle.yaml
index 42b58785..bbce3057 100644
--- a/bundle/uds-bundle.yaml
+++ b/bundle/uds-bundle.yaml
@@ -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."
@@ -88,13 +88,6 @@ packages:
             - 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
@@ -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"
diff --git a/chart/templates/NOTES.txt b/chart/templates/NOTES.txt
deleted file mode 100644
index d21e0484..00000000
--- a/chart/templates/NOTES.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-{{- $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 181c8158..f9ae3fa4 100644
--- a/chart/templates/uds-package.yaml
+++ b/chart/templates/uds-package.yaml
@@ -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