feat: renamed flavor to unicorn

defenseunicorns · Jun 26, 2024 · 7c9f782 · 7c9f782
1 parent 5d4461e
commit 7c9f782
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 12 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 → values/unicorn.yaml b/values/chainguard.yaml → 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
@@ -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