From 3c8d2cd1860b5bc7535865e8bd731a7e9ef31932 Mon Sep 17 00:00:00 2001 From: Michael-Kruggel Date: Tue, 9 Jul 2024 18:06:31 +0000 Subject: [PATCH] fix: removed unicorn flavor --- .github/workflows/ci-docs-shim.yaml | 2 +- .github/workflows/tag-and-release.yaml | 2 +- .github/workflows/test.yaml | 2 +- README.md | 3 +-- values/unicorn.yaml | 19 ------------------- zarf.yaml | 19 ------------------- 6 files changed, 4 insertions(+), 43 deletions(-) delete mode 100644 values/unicorn.yaml diff --git a/.github/workflows/ci-docs-shim.yaml b/.github/workflows/ci-docs-shim.yaml index 2674ea1..68c175e 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, unicorn] + flavor: [registry1] 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 908a7e8..3ecb6cf 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, unicorn] + flavor: [registry1] permissions: contents: read diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 4ba6805..c1aa38c 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -38,7 +38,7 @@ jobs: timeout-minutes: 25 strategy: matrix: - flavor: [registry1, unicorn] + flavor: [registry1] type: [install, upgrade] steps: diff --git a/README.md b/README.md index 5ebdcf9..af8ff01 100644 --- a/README.md +++ b/README.md @@ -15,10 +15,9 @@ 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` | -| unicorn | Uses images from cgr.dev within the package. | `zarf package create . -f unicorn` | > [!IMPORTANT] -> **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). +> **NOTE:** To create the registry1 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/values/unicorn.yaml b/values/unicorn.yaml deleted file mode 100644 index 5f3434a..0000000 --- a/values/unicorn.yaml +++ /dev/null @@ -1,19 +0,0 @@ -controller: - image: - registry: "cgr.dev" - repository: "chainguard/jenkins" - tag: "latest" - sidecars: - configAutoReload: - image: - registry: "cgr.dev" - repository: "chainguard/k8s-sidecar" - tag: "latest" - -# TODO get a unicorn version of this image -agent: - image: - # -- Repository to pull the agent jnlp image from - repository: "registry1.dso.mil/ironbank/opensource/jenkins/inbound-agent" - # -- Tag of the image to pull - tag: "3186.vc3b_7249b_87eb_-1" diff --git a/zarf.yaml b/zarf.yaml index b3e31b9..66dacfc 100644 --- a/zarf.yaml +++ b/zarf.yaml @@ -38,22 +38,3 @@ components: - registry1.dso.mil/ironbank/opensource/jenkins/inbound-agent:3186.vc3b_7249b_87eb_-1 - registry1.dso.mil/ironbank/kiwigrid/k8s-sidecar:1.27.2 - registry1.dso.mil/ironbank/opensource/bats/bats:v1.10.0-ubi9 - -# Note: unicorn flavor is experimental - - name: jenkins - required: true - description: "Deploy jenkins with registry1 images" - import: - path: common - only: - flavor: unicorn - cluster: - architecture: amd64 - charts: - - name: jenkins - valuesFiles: - - values/unicorn.yaml - images: - - cgr.dev/chainguard/jenkins:latest - - registry1.dso.mil/ironbank/opensource/jenkins/inbound-agent:3186.vc3b_7249b_87eb_-1 - - cgr.dev/chainguard/k8s-sidecar:latest