From 004b819adb6e4bf00378ffb80a7caeea4ff1c79f Mon Sep 17 00:00:00 2001
From: Michael-Kruggel <michael.kruggel@defenseunicorns.com>
Date: Thu, 25 Jul 2024 16:50:27 +0000
Subject: [PATCH] changed oidc to openid-connect

---
 bundle/uds-bundle.yaml           | 2 +-
 chart/templates/uds-package.yaml | 8 +++++---
 chart/values.yaml                | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/bundle/uds-bundle.yaml b/bundle/uds-bundle.yaml
index 95c1b2e..6402ea7 100644
--- a/bundle/uds-bundle.yaml
+++ b/bundle/uds-bundle.yaml
@@ -20,5 +20,5 @@ packages:
               description: "Boolean to enable or disable sso things"
               path: "sso.enabled"
             - name: JENKINS_SSO_PROTOCOL
-              description: "Protocol to use. Valid values are 'oidc' and 'saml'. Default value is 'saml'"
+              description: "Protocol to use. Valid values are 'openid-connect' and 'saml'. Default value is 'saml'"
               path: "sso.protocol"
diff --git a/chart/templates/uds-package.yaml b/chart/templates/uds-package.yaml
index 2da4104..ac4db2c 100644
--- a/chart/templates/uds-package.yaml
+++ b/chart/templates/uds-package.yaml
@@ -37,14 +37,16 @@ spec:
                         idpMetadataConfiguration:
                           period: 1440
                           url: "https://sso.{{ .Values.domain }}/realms/uds/protocol/saml/descriptor"
-    {{- else if eq .Values.sso.protocol "oidc"  }}
-      clientId: uds-package-jenkins-oidc
+    {{- else if eq .Values.sso.protocol "openid-connect"  }}
+      clientId: uds-package-jenkins-openid-connect
+
+      protocol: openid-connect
 
       secretName: {{ .Values.sso.secretName }}
       secretTemplate:
         sso: |-
           oic:
-                        clientId: "uds-package-jenkins-oidc"
+                        clientId: "uds-package-jenkins-openid-connect"
                         clientSecret: "clientField(secret)"
                         wellKnownOpenIDConfigurationUrl: "https://sso.{{ .Values.domain }}/realms/uds"
                         tokenServerUrl: "https://sso.{{ .Values.domain }}/realms/uds/protocol/openid-connect/token"
diff --git a/chart/values.yaml b/chart/values.yaml
index 3fd15be..bda3a4d 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -3,7 +3,7 @@ domain: "###ZARF_VAR_DOMAIN###"
 sso:
   enabled: true
   secretName: jenkins-sso
-  # protocol should be either 'saml' or 'oidc'
+  # protocol should be either 'saml' or 'openid-connect'
   protocol: saml
 
 # customNetworkPolicies: