From 7c9f78238a0beb48c0c4ffe334069b73086c86b5 Mon Sep 17 00:00:00 2001
From: Michael-Kruggel <michael.kruggel@defenseunicorns.com>
Date: Wed, 26 Jun 2024 14:26:44 +0000
Subject: [PATCH] feat: renamed flavor to unicorn

---
 .github/workflows/ci-docs-shim.yaml      | 2 +-
 .github/workflows/tag-and-release.yaml   | 2 +-
 .github/workflows/test.yaml              | 2 +-
 README.md                                | 4 ++--
 chart/templates/uds-package.yaml         | 2 +-
 common/zarf.yaml                         | 2 +-
 values/common.yaml                       | 2 +-
 values/{chainguard.yaml => unicorn.yaml} | 2 +-
 zarf.yaml                                | 6 +++---
 9 files changed, 12 insertions(+), 12 deletions(-)
 rename values/{chainguard.yaml => unicorn.yaml} (90%)

diff --git a/.github/workflows/ci-docs-shim.yaml b/.github/workflows/ci-docs-shim.yaml
index cc04591..2674ea1 100644
--- a/.github/workflows/ci-docs-shim.yaml
+++ b/.github/workflows/ci-docs-shim.yaml
@@ -12,7 +12,7 @@ jobs:
     timeout-minutes: 20
     strategy:
       matrix:
-        flavor: [registry1, chainguard]
+        flavor: [registry1, unicorn]
         type: [install, upgrade]
     steps:
       - name: Shim for ${{ matrix.type }} ${{ matrix.flavor }}
diff --git a/.github/workflows/tag-and-release.yaml b/.github/workflows/tag-and-release.yaml
index 03b8b4a..908a7e8 100644
--- a/.github/workflows/tag-and-release.yaml
+++ b/.github/workflows/tag-and-release.yaml
@@ -26,7 +26,7 @@ jobs:
     name: Publish package
     strategy:
       matrix:
-        flavor: [registry1, chainguard]
+        flavor: [registry1, unicorn]
 
     permissions:
       contents: read
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 129f734..4ba6805 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -38,7 +38,7 @@ jobs:
     timeout-minutes: 25
     strategy:
       matrix:
-        flavor: [registry1, chainguard]
+        flavor: [registry1, unicorn]
         type: [install, upgrade]
 
     steps:
diff --git a/README.md b/README.md
index 7b6adc3..5ebdcf9 100644
--- a/README.md
+++ b/README.md
@@ -15,10 +15,10 @@ The Jenkins Package expects to be deployed on top of [UDS Core](https://github.c
 | Flavor | Description | Example Creation |
 | ------ | ----------- | ---------------- |
 | registry1 | Uses images from registry1.dso.mil within the package. | `zarf package create . -f registry1` |
-| chainguard | Uses images from cgr.dev within the package. | `zarf package create . -f chainguard` |
+| unicorn | Uses images from cgr.dev within the package. | `zarf package create . -f unicorn` |
 
 > [!IMPORTANT]
-> **NOTE:** To create the registry1 or the chainguard flavor you will need to be logged into Iron Bank - you can find instructions on how to do this in the [Big Bang Zarf Tutorial](https://docs.zarf.dev/tutorials/6-big-bang/#setup).
+> **NOTE:** To create the registry1 or the unicorn flavor you will need to be logged into Iron Bank - you can find instructions on how to do this in the [Big Bang Zarf Tutorial](https://docs.zarf.dev/tutorials/6-big-bang/#setup).
 
 ## Releases
 
diff --git a/chart/templates/uds-package.yaml b/chart/templates/uds-package.yaml
index 2c1dc41..c4c6455 100644
--- a/chart/templates/uds-package.yaml
+++ b/chart/templates/uds-package.yaml
@@ -7,7 +7,7 @@ spec:
   {{- if .Values.sso.enabled }}
   sso:
     - name: Jenkins SSO
-      clientId: uds-core-jenkins
+      clientId: uds-package-jenkins
       redirectUris:
         - "https://jenkins.{{ .Values.domain }}/securityRealm/finishLogin"
   {{- end }}
diff --git a/common/zarf.yaml b/common/zarf.yaml
index 1c2ba79..1317f6d 100644
--- a/common/zarf.yaml
+++ b/common/zarf.yaml
@@ -22,7 +22,7 @@ components:
                 name: jenkins
                 namespace: jenkins
                 condition: "'{.status.phase}'=Ready"
-          - cmd: zarf tools kubectl get secrets sso-client-uds-core-jenkins -n jenkins -o=jsonpath='{.data.secret}' | base64 -d
+          - cmd: zarf tools kubectl get secrets sso-client-uds-package-jenkins -n jenkins -o=jsonpath='{.data.secret}' | base64 -d
             mute: true
             setVariables:
               - name: JENKINS_CLIENT_SECRET
diff --git a/values/common.yaml b/values/common.yaml
index 98ca4fb..30453ff 100644
--- a/values/common.yaml
+++ b/values/common.yaml
@@ -29,7 +29,7 @@ controller:
         jenkins:
           securityRealm:
             oic:
-              clientId: "uds-core-jenkins"
+              clientId: "uds-package-jenkins"
               clientSecret: "###ZARF_VAR_JENKINS_CLIENT_SECRET###"
               wellKnownOpenIDConfigurationUrl: "https://sso.###ZARF_VAR_DOMAIN###/realms/uds"
               tokenServerUrl: "https://sso.###ZARF_VAR_DOMAIN###/realms/uds/protocol/openid-connect/token"
diff --git a/values/chainguard.yaml b/values/unicorn.yaml
similarity index 90%
rename from values/chainguard.yaml
rename to values/unicorn.yaml
index 1faab9a..5f3434a 100644
--- a/values/chainguard.yaml
+++ b/values/unicorn.yaml
@@ -10,7 +10,7 @@ controller:
         repository: "chainguard/k8s-sidecar"
         tag: "latest"
 
-# TODO get a chainguard version of this image
+# TODO get a unicorn version of this image
 agent:
   image:
     # -- Repository to pull the agent jnlp image from
diff --git a/zarf.yaml b/zarf.yaml
index ecfd267..b3e31b9 100644
--- a/zarf.yaml
+++ b/zarf.yaml
@@ -39,20 +39,20 @@ components:
       - registry1.dso.mil/ironbank/kiwigrid/k8s-sidecar:1.27.2
       - registry1.dso.mil/ironbank/opensource/bats/bats:v1.10.0-ubi9
 
-# Note: chainguard flavor is experimental
+# Note: unicorn flavor is experimental
   - name: jenkins
     required: true
     description: "Deploy jenkins with registry1 images"
     import:
       path: common
     only:
-      flavor: chainguard
+      flavor: unicorn
       cluster:
         architecture: amd64
     charts:
       - name: jenkins
         valuesFiles:
-          - values/chainguard.yaml
+          - values/unicorn.yaml
     images:
       - cgr.dev/chainguard/jenkins:latest
       - registry1.dso.mil/ironbank/opensource/jenkins/inbound-agent:3186.vc3b_7249b_87eb_-1