From 69433b75cef8aa6f5d15191e4998f07af39a1282 Mon Sep 17 00:00:00 2001 From: codyshoffner Date: Fri, 13 Feb 2026 14:23:06 -0600 Subject: [PATCH 1/3] chore: point to upstream, enable testing --- .../helm/chart/values.yaml | 2 +- .github/workflows/release.yaml | 62 +++++++++---------- common/zarf.yaml | 2 +- tasks.yaml | 4 +- tasks/dependencies.yaml | 13 ---- values/unicorn-values.yaml | 2 +- values/upstream-values.yaml | 2 +- zarf.yaml | 4 +- 8 files changed, 38 insertions(+), 53 deletions(-) delete mode 100644 tasks/dependencies.yaml diff --git a/.github/container-and-chart/helm/chart/values.yaml b/.github/container-and-chart/helm/chart/values.yaml index 53749db..7cfc4b6 100644 --- a/.github/container-and-chart/helm/chart/values.yaml +++ b/.github/container-and-chart/helm/chart/values.yaml @@ -3,7 +3,7 @@ image: repository: reference-package - tag: latest + tag: v0.1.0 pullPolicy: IfNotPresent service: diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index df9302a..e5ab3d3 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -1,35 +1,35 @@ -# # Copyright 2024 Defense Unicorns -# # SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial -# name: Release +name: Release -# on: -# push: -# branches: -# - main -# paths-ignore: -# - ".github/container-and-chart/**" +on: + push: + branches: + - main + paths-ignore: + - ".github/container-and-chart/**" -# # Permissions for the GITHUB_TOKEN used by the workflow. -# permissions: -# contents: read # Allows reading the content of the repository. -# packages: read # Allows reading the content of the repository's packages. -# id-token: write +# Permissions for the GITHUB_TOKEN used by the workflow. +permissions: + contents: read # Allows reading the content of the repository. + packages: read # Allows reading the content of the repository's packages. + id-token: write -# jobs: -# publish: -# permissions: -# contents: write # Allows writing the content of the repository. -# packages: write # Allows writing the content of the repository's packages. -# id-token: write -# strategy: -# matrix: -# flavor: [upstream, unicorn] -# architecture: [amd64, arm64] -# uses: defenseunicorns/uds-common/.github/workflows/callable-publish.yaml@730d22c6e061153d525a6d6f932e108ae952bd46 # v1.23.0 -# with: -# flavor: ${{ matrix.flavor }} -# options: --set BASE_REPO="ghcr.io/uds-packages" -# runsOn: ${{ matrix.architecture == 'arm64' && 'appstore-4-core-arm64' || 'appstore-4-core-amd64' }} -# uds-releaser: true -# secrets: inherit # Inherits all secrets from the parent workflow. +jobs: + publish: + permissions: + contents: write # Allows writing the content of the repository. + packages: write # Allows writing the content of the repository's packages. + id-token: write + strategy: + matrix: + flavor: [upstream, unicorn] + architecture: [amd64, arm64] + uses: defenseunicorns/uds-common/.github/workflows/callable-publish.yaml@730d22c6e061153d525a6d6f932e108ae952bd46 # v1.23.0 + with: + flavor: ${{ matrix.flavor }} + options: --set BASE_REPO="ghcr.io/uds-packages" + runsOn: ${{ matrix.architecture == 'arm64' && 'appstore-4-core-arm64' || 'appstore-4-core-amd64' }} + uds-releaser: true + secrets: inherit # Inherits all secrets from the parent workflow. diff --git a/common/zarf.yaml b/common/zarf.yaml index ed9eb6d..353087c 100644 --- a/common/zarf.yaml +++ b/common/zarf.yaml @@ -18,6 +18,6 @@ components: - name: reference-package namespace: reference-package version: 0.1.0 - localPath: ../src/helm/chart + url: oci://ghcr.io/uds-packages/reference-package/helm/reference-package valuesFiles: - ../values/common-values.yaml diff --git a/tasks.yaml b/tasks.yaml index a2307b1..802e55c 100644 --- a/tasks.yaml +++ b/tasks.yaml @@ -3,7 +3,6 @@ # yaml-language-server: $schema=https://raw.githubusercontent.com/defenseunicorns/uds-cli/refs/heads/main/tasks.schema.json includes: - test: ./tasks/test.yaml - - dependencies: ./tasks/dependencies.yaml - create: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.23.0/tasks/create.yaml - lint: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.23.0/tasks/lint.yaml - pull: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.23.0/tasks/pull.yaml @@ -12,7 +11,6 @@ includes: - actions: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.23.0/tasks/actions.yaml - badge: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.23.0/tasks/badge.yaml - upgrade: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.23.0/tasks/upgrade.yaml - - compliance: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.23.0/tasks/compliance.yaml - publish: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.23.0/tasks/publish.yaml tasks: @@ -26,7 +24,7 @@ tasks: - name: create-dev-package description: Create the package actions: - - task: dependencies:create-container-image + # - task: dependencies:create-container-image - task: create:package with: options: "--skip-sbom" diff --git a/tasks/dependencies.yaml b/tasks/dependencies.yaml deleted file mode 100644 index 8266313..0000000 --- a/tasks/dependencies.yaml +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 2026 Defense Unicorns -# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial - -tasks: - - name: all - actions: - - task: create-container-image - - - name: create-container-image - description: Create the Container Image for the Reference Package - actions: - - cmd: docker buildx build -t reference-package:v0.1.0 --load . - dir: src/docker diff --git a/values/unicorn-values.yaml b/values/unicorn-values.yaml index 81a1b15..5460759 100644 --- a/values/unicorn-values.yaml +++ b/values/unicorn-values.yaml @@ -2,6 +2,6 @@ # SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial image: - repository: reference-package + repository: ghcr.io/uds-packages/reference-package/container/reference-package tag: v0.1.0 pullPolicy: Always diff --git a/values/upstream-values.yaml b/values/upstream-values.yaml index 81a1b15..5460759 100644 --- a/values/upstream-values.yaml +++ b/values/upstream-values.yaml @@ -2,6 +2,6 @@ # SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial image: - repository: reference-package + repository: ghcr.io/uds-packages/reference-package/container/reference-package tag: v0.1.0 pullPolicy: Always diff --git a/zarf.yaml b/zarf.yaml index 384916c..c681361 100644 --- a/zarf.yaml +++ b/zarf.yaml @@ -25,7 +25,7 @@ components: valuesFiles: - values/upstream-values.yaml images: - - reference-package:v0.1.0 + - ghcr.io/uds-packages/reference-package/container/reference-package:v0.1.0 - name: reference-package required: true @@ -39,4 +39,4 @@ components: valuesFiles: - values/unicorn-values.yaml images: - - reference-package:v0.1.0 + - ghcr.io/uds-packages/reference-package/container/reference-package:v0.1.0 From ac5fadb2f8b0e3e2aeacb819d348c75461990c0f Mon Sep 17 00:00:00 2001 From: codyshoffner Date: Fri, 13 Feb 2026 14:38:32 -0600 Subject: [PATCH 2/3] style: linting --- .github/container-and-chart/helm/chart/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/container-and-chart/helm/chart/values.yaml b/.github/container-and-chart/helm/chart/values.yaml index 7cfc4b6..0dc2c02 100644 --- a/.github/container-and-chart/helm/chart/values.yaml +++ b/.github/container-and-chart/helm/chart/values.yaml @@ -22,5 +22,5 @@ sso: enabled: false secretName: reference-package-sso -monitoring: +monitoring: enabled: false From 252b96f25bf67833ce57fbcd6b0c298252a068a3 Mon Sep 17 00:00:00 2001 From: codyshoffner Date: Fri, 13 Feb 2026 14:39:08 -0600 Subject: [PATCH 3/3] chore: update tasks --- tasks.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tasks.yaml b/tasks.yaml index 802e55c..7d66e6d 100644 --- a/tasks.yaml +++ b/tasks.yaml @@ -24,7 +24,6 @@ tasks: - name: create-dev-package description: Create the package actions: - # - task: dependencies:create-container-image - task: create:package with: options: "--skip-sbom" @@ -64,9 +63,6 @@ tasks: - name: publish-package description: Build and publish the packages actions: - - description: Create the container image - task: dependencies:create-container-image - - description: Create the package task: create:package