From 5d73360033bf9160ab35a5ebab6293b52fcd4c96 Mon Sep 17 00:00:00 2001 From: Anthony Date: Wed, 2 Oct 2024 19:47:10 +0000 Subject: [PATCH 01/34] fix: validate package with full resource name --- common/zarf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/zarf.yaml b/common/zarf.yaml index 7383e57..8484a01 100644 --- a/common/zarf.yaml +++ b/common/zarf.yaml @@ -23,7 +23,7 @@ components: after: - wait: cluster: - kind: Packages + kind: packages.uds.dev name: jenkins namespace: jenkins condition: "'{.status.phase}'=Ready" From 38acd840b8f20697d1ee9508862705fccca5c9ee Mon Sep 17 00:00:00 2001 From: Andrew <46836330+andrewg-xyz@users.noreply.github.com> Date: Mon, 14 Oct 2024 20:54:38 -0600 Subject: [PATCH 02/34] chore: update CODEOWNERS (#82) * Update CODEOWNERS * Update CODEOWNERS --- CODEOWNERS | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CODEOWNERS b/CODEOWNERS index 1a8b13b..1420033 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -1,2 +1,4 @@ -# This repository is owned by the Defense Unicorns UDS-Marketplace Team -/* @defenseunicorns/uds-marketplace @defenseunicorns/task-force-narwhal +/* @defenseunicorns/uds-package-maintainers + +/CODEOWNERS @defenseunicorns/uds-package-maintainers +/LICENS* @jeff-mccoy @austenbryan From 22aa32357e89153e6b63f8940fcd843c6944bd86 Mon Sep 17 00:00:00 2001 From: Michael-Kruggel Date: Tue, 22 Oct 2024 17:23:12 +0000 Subject: [PATCH 03/34] docs: update codeowners --- CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CODEOWNERS b/CODEOWNERS index 1420033..7366bd7 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -1,4 +1,4 @@ -/* @defenseunicorns/uds-package-maintainers +/* @defenseunicorns/uds-package-maintainers @Michael-Kruggel @mkborland /CODEOWNERS @defenseunicorns/uds-package-maintainers /LICENS* @jeff-mccoy @austenbryan From 73fe56eb15bdf081ba22f8ce2d8b764ccb1bd51e Mon Sep 17 00:00:00 2001 From: ritika-du Date: Fri, 25 Oct 2024 12:28:22 -0400 Subject: [PATCH 04/34] chore(main): update scorecard --- .github/workflows/scorecard.yaml | 50 -------------------------------- README.md | 1 - 2 files changed, 51 deletions(-) delete mode 100644 .github/workflows/scorecard.yaml diff --git a/.github/workflows/scorecard.yaml b/.github/workflows/scorecard.yaml deleted file mode 100644 index a34eecf..0000000 --- a/.github/workflows/scorecard.yaml +++ /dev/null @@ -1,50 +0,0 @@ -name: Scorecards supply-chain security -on: - # Only the default branch is supported. - branch_protection_rule: - schedule: - - cron: '30 1 * * 6' - push: - branches: ["main"] - -# Declare default permissions as read only. -permissions: read-all - -jobs: - analysis: - name: Scorecards analysis - runs-on: ubuntu-latest - permissions: - # Needed to upload the results to code-scanning dashboard. - security-events: write - # Used to receive a badge. - id-token: write - - steps: - - name: "Checkout code" - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - with: - persist-credentials: false - - - name: "Run analysis" - uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.4.0 - with: - results_file: results.sarif - results_format: sarif - repo_token: ${{ secrets.SCORECARD_READ_TOKEN }} - publish_results: true - - # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF - # format to the repository Actions tab. - - name: "Upload artifact" - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0 - with: - name: SARIF file - path: results.sarif - retention-days: 5 - - # Upload the results to GitHub's code scanning dashboard. - - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@8214744c546c1e5c8f03dde8fab3a7353211988d # v3.26.7 - with: - sarif_file: results.sarif diff --git a/README.md b/README.md index 98482e6..7d1f258 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,6 @@ [Made for UDS](https://github.com/defenseunicorns/uds-core) [![Latest Release](https://img.shields.io/github/v/release/defenseunicorns/uds-package-jenkins)](https://github.com/defenseunicorns/uds-package-jenkins/releases) [![Build Status](https://img.shields.io/github/actions/workflow/status/defenseunicorns/uds-package-jenkins/tag-and-release.yaml)](https://github.com/defenseunicorns/uds-package-jenkins/actions/workflows/tag-and-release.yaml) -[![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/defenseunicorns/uds-package-jenkins/badge)](https://api.securityscorecards.dev/projects/github.com/defenseunicorns/uds-package-jenkins) This package is designed to be deployed on [UDS Core](https://github.com/defenseunicorns/uds-core), and is based on the upstream [Jenkins](https://github.com/jenkinsci/helm-charts/tree/main/charts/jenkins) chart. From 378439f340e392b61053244e5225542269b1fc31 Mon Sep 17 00:00:00 2001 From: ritika-du Date: Fri, 25 Oct 2024 12:31:45 -0400 Subject: [PATCH 05/34] chore(main): update release please config --- release-please-config.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/release-please-config.json b/release-please-config.json index 1064e8f..a2a49d8 100644 --- a/release-please-config.json +++ b/release-please-config.json @@ -16,7 +16,8 @@ "extra-files": [ "bundle/uds-bundle.yaml", "tasks/publish.yaml", - "zarf.yaml" + "zarf.yaml", + "tasks.yaml" ] } }, From 8fc654d799ba39da958335b67cf957652c86295f Mon Sep 17 00:00:00 2001 From: ritika-du Date: Fri, 25 Oct 2024 16:40:35 -0400 Subject: [PATCH 06/34] chore(main): update release.yaml --- .github/workflows/release.yaml | 46 +++++++++++++++++++++++ .github/workflows/tag-and-release.yaml | 51 -------------------------- 2 files changed, 46 insertions(+), 51 deletions(-) create mode 100644 .github/workflows/release.yaml delete mode 100644 .github/workflows/tag-and-release.yaml diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml new file mode 100644 index 0000000..33a0961 --- /dev/null +++ b/.github/workflows/release.yaml @@ -0,0 +1,46 @@ +name: Release + +on: + push: + branches: + - main + +# 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: + tag-new-version: + permissions: write-all + runs-on: uds-marketplace-ubuntu-big-boy-4-core + outputs: + release_created: ${{ steps.release-flag.outputs.release_created }} + steps: + - name: Create Release Tag + id: tag + uses: googleapis/release-please-action@7987652d64b4581673a76e33ad5e98e3dd56832f # v4.1.3 + - id: release-flag + run: echo "release_created=${{ steps.tag.outputs.release_created || false }}" >> "$GITHUB_OUTPUT" + + publish: + permissions: + contents: read # Allows reading the content of the repository. + packages: write # Allows reading the content of the repository's packages. + id-token: write + needs: tag-new-version + if: ${{ needs.tag-new-version.outputs.release_created == 'true' }} + strategy: + matrix: + flavor: [upstream, unicorn] + architecture: [amd64, arm64] + exclude: + - flavor: registry1 + architecture: arm64 + uses: defenseunicorns/uds-common/.github/workflows/callable-publish.yaml@f0164622ffc2007e96a0e1deaa3f5064db04b148 # v1.1.0 + with: + flavor: ${{ matrix.flavor }} + runsOn: ${{ matrix.architecture == 'arm64' && 'uds-marketplace-ubuntu-arm64-4-core' || 'uds-marketplace-ubuntu-big-boy-4-core' }} + reports-path: "tests/.playwright/reports/" + secrets: inherit # Inherits all secrets from the parent workflow. \ No newline at end of file diff --git a/.github/workflows/tag-and-release.yaml b/.github/workflows/tag-and-release.yaml deleted file mode 100644 index 78ab0d6..0000000 --- a/.github/workflows/tag-and-release.yaml +++ /dev/null @@ -1,51 +0,0 @@ -name: Publish UDS Package Jenkins - -on: - push: - branches: - - main - -jobs: - tag-new-version: - name: Tag New Version - permissions: write-all - runs-on: ubuntu-latest - outputs: - release_created: ${{ steps.release-flag.outputs.release_created }} - steps: - - name: Create release tag - id: tag - uses: google-github-actions/release-please-action@e4dc86ba9405554aeba3c6bb2d169500e7d3b4ee # v4.1.1 - - id: release-flag - run: echo "release_created=${{ steps.tag.outputs.release_created || false }}" >> $GITHUB_OUTPUT - - publish-package: - needs: tag-new-version - if: ${{ needs.tag-new-version.outputs.release_created == 'true' }} - runs-on: ubuntu-latest - name: Publish package - strategy: - matrix: - flavor: [upstream, registry1, unicorn] - - permissions: write-all - - steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - - - name: Environment setup - uses: defenseunicorns/uds-common/.github/actions/setup@24c8a2a48eeb33773b76b3587c489cb17496c9e0 # v0.12.0 - with: - registry1Username: ${{ secrets.IRON_BANK_ROBOT_USERNAME }} - registry1Password: ${{ secrets.IRON_BANK_ROBOT_PASSWORD }} - ghToken: ${{ secrets.GITHUB_TOKEN }} - chainguardIdentity: ${{ secrets.CHAINGUARD_IDENTITY }} - - - name: Publish Package - run: uds run -f tasks/publish.yaml package --set FLAVOR=${{ matrix.flavor }} --no-progress - - - name: Save logs - if: always() - uses: defenseunicorns/uds-common/.github/actions/save-logs@24c8a2a48eeb33773b76b3587c489cb17496c9e0 # v0.12.0 - with: - suffix: '${{ matrix.flavor }}-${{ github.run_id }}-${{ github.run_attempt }}' From 9a5189ae4a2094993afa164e40ceaf150caa0017 Mon Sep 17 00:00:00 2001 From: ritika-du Date: Fri, 25 Oct 2024 16:41:55 -0400 Subject: [PATCH 07/34] chore(main): update release.yaml --- .github/workflows/release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 33a0961..aab6d48 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -43,4 +43,4 @@ jobs: flavor: ${{ matrix.flavor }} runsOn: ${{ matrix.architecture == 'arm64' && 'uds-marketplace-ubuntu-arm64-4-core' || 'uds-marketplace-ubuntu-big-boy-4-core' }} reports-path: "tests/.playwright/reports/" - secrets: inherit # Inherits all secrets from the parent workflow. \ No newline at end of file + secrets: inherit # Inherits all secrets from the parent workflow. From c7e8e38160985b05a0b6a306944f90c87b7c951d Mon Sep 17 00:00:00 2001 From: ritika-du Date: Fri, 25 Oct 2024 17:01:18 -0400 Subject: [PATCH 08/34] chore(main): update test.yaml --- .github/workflows/test.yaml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 9e54168..835d602 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -42,7 +42,7 @@ jobs: uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: test-flavor - uses: defenseunicorns/uds-common/.github/actions/test-flavor@24c8a2a48eeb33773b76b3587c489cb17496c9e0 # v0.12.0 + uses: defenseunicorns/uds-common/.github/workflows/callable-publish.yaml@f0164622ffc2007e96a0e1deaa3f5064db04b148 # v1.1.0 id: test-flavor outputs: upgrade-flavors: ${{ steps.test-flavor.outputs.upgrade-flavors }} @@ -82,7 +82,7 @@ jobs: uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Environment setup - uses: defenseunicorns/uds-common/.github/actions/setup@24c8a2a48eeb33773b76b3587c489cb17496c9e0 # v0.12.0 + uses: defenseunicorns/uds-common/.github/workflows/callable-publish.yaml@f0164622ffc2007e96a0e1deaa3f5064db04b148 # v1.1.0 with: registry1Username: ${{ secrets.IRON_BANK_ROBOT_USERNAME }} registry1Password: ${{ secrets.IRON_BANK_ROBOT_PASSWORD }} @@ -90,18 +90,17 @@ jobs: chainguardIdentity: ${{ secrets.CHAINGUARD_IDENTITY }} - name: Playwright setup - uses: defenseunicorns/uds-common/.github/actions/playwright@24c8a2a48eeb33773b76b3587c489cb17496c9e0 # v0.12.0 + uses: defenseunicorns/uds-common/.github/workflows/callable-publish.yaml@f0164622ffc2007e96a0e1deaa3f5064db04b148 # v1.1.0 - name: Test - uses: defenseunicorns/uds-common/.github/actions/test-deploy@24c8a2a48eeb33773b76b3587c489cb17496c9e0 # v0.12.0 - with: + uses: defenseunicorns/uds-common/.github/workflows/callable-publish.yaml@f0164622ffc2007e96a0e1deaa3f5064db04b148 # v1.1.0 upgrade-flavors: ${{ needs.flavor-test.outputs.upgrade-flavors }} flavor: ${{ matrix.flavor }} type: ${{ matrix.type }} - name: Save logs if: always() - uses: defenseunicorns/uds-common/.github/actions/save-logs@24c8a2a48eeb33773b76b3587c489cb17496c9e0 # v0.12.0 + uses: defenseunicorns/uds-common/.github/workflows/callable-publish.yaml@f0164622ffc2007e96a0e1deaa3f5064db04b148 # v1.1.0 with: suffix: ${{ matrix.type }}-${{ matrix.flavor }}-${{ github.run_id }}-${{ github.run_attempt }} From afe1f5fcb37b0e154764abde278d73ade6310bd4 Mon Sep 17 00:00:00 2001 From: ritika-du Date: Fri, 25 Oct 2024 17:06:13 -0400 Subject: [PATCH 09/34] chore(main): update test.yaml --- .github/workflows/test.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 835d602..ef08715 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -94,6 +94,7 @@ jobs: - name: Test uses: defenseunicorns/uds-common/.github/workflows/callable-publish.yaml@f0164622ffc2007e96a0e1deaa3f5064db04b148 # v1.1.0 + with: upgrade-flavors: ${{ needs.flavor-test.outputs.upgrade-flavors }} flavor: ${{ matrix.flavor }} type: ${{ matrix.type }} From 8c4ae3536d6cd615724a66b1c65cba2a2bcc3823 Mon Sep 17 00:00:00 2001 From: ritika-du Date: Mon, 28 Oct 2024 14:03:20 -0400 Subject: [PATCH 10/34] chore: release unicorn flavor --- .github/workflows/ci-docs-shim.yaml | 19 ++--- .github/workflows/commitlint.yaml | 6 +- .github/workflows/lint.yaml | 33 ++------ .github/workflows/release.yaml | 15 ++-- .github/workflows/test.yaml | 3 + .pre-commit-config.yaml | 3 + bundle/uds-bundle.yaml | 3 + bundle/uds-config.yaml | 2 + chart/templates/uds-package.yaml | 3 + src/namespace/jenkins-ns.yaml | 3 + src/namespace/zarf.yaml | 3 + tasks.yaml | 115 +++++++++++++--------------- tasks/cleanup.yaml | 10 --- tasks/dependencies.yaml | 15 ++++ tasks/publish.yaml | 40 ---------- tasks/test.yaml | 9 +++ values/common.yaml | 3 + values/registry1.yaml | 3 + values/unicorn.yaml | 3 + values/upstream.yaml | 3 + zarf.yaml | 6 +- 21 files changed, 141 insertions(+), 159 deletions(-) delete mode 100644 tasks/cleanup.yaml create mode 100644 tasks/dependencies.yaml delete mode 100644 tasks/publish.yaml diff --git a/.github/workflows/ci-docs-shim.yaml b/.github/workflows/ci-docs-shim.yaml index be02cfa..e83d96a 100644 --- a/.github/workflows/ci-docs-shim.yaml +++ b/.github/workflows/ci-docs-shim.yaml @@ -1,3 +1,6 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial + name: CI Docs Shim on: @@ -6,15 +9,13 @@ on: types: [milestoned, opened, synchronize] jobs: - run-test: - name: ${{ matrix.type }} ${{ matrix.flavor }} - runs-on: "ubuntu-latest" - timeout-minutes: 20 + validate: strategy: matrix: - flavor: [upstream, registry1, unicorn] type: [install, upgrade] - steps: - - name: Shim for ${{ matrix.type }} ${{ matrix.flavor }} - run: | - echo "Documentation-only change detected; marking ${{ matrix.type }} ${{ matrix.flavor }} as successful." + flavor: [upstream, unicorn] + uses: defenseunicorns/uds-common/.github/workflows/callable-ci-docs-shim.yaml@f0164622ffc2007e96a0e1deaa3f5064db04b148 # v1.1.0 + with: + flavor: ${{ matrix.flavor }} + type: ${{ matrix.type }} + secrets: inherit # Inherits all secrets from the parent workflow. diff --git a/.github/workflows/commitlint.yaml b/.github/workflows/commitlint.yaml index 41a2ef7..462063d 100644 --- a/.github/workflows/commitlint.yaml +++ b/.github/workflows/commitlint.yaml @@ -1,3 +1,6 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial + name: Metadata on: @@ -11,5 +14,4 @@ on: jobs: validate: - name: Validate - uses: defenseunicorns/uds-common/.github/workflows/commitlint.yaml@24c8a2a48eeb33773b76b3587c489cb17496c9e0 # v0.12.0 + uses: uses: defenseunicorns/uds-common/.github/workflows/callable-commitlint.yaml@f0164622ffc2007e96a0e1deaa3f5064db04b148 # v1.1.0 diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index a215477..d82018e 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -1,35 +1,14 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial + name: Scan on: # This workflow is triggered on pull requests to the main branch. pull_request: - branches: [main] - types: [milestoned, opened, synchronize] + types: [milestoned, opened, reopened, synchronize] jobs: validate: - runs-on: ubuntu-latest - name: Lint - permissions: - contents: read # Allows reading the repo contents - - steps: - - name: Checkout - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - with: - fetch-depth: 0 - - - name: Environment setup - uses: defenseunicorns/uds-common/.github/actions/setup@24c8a2a48eeb33773b76b3587c489cb17496c9e0 # v0.12.0 - with: - registry1Username: ${{ secrets.IRON_BANK_ROBOT_USERNAME }} - registry1Password: ${{ secrets.IRON_BANK_ROBOT_PASSWORD }} - ghToken: ${{ secrets.GITHUB_TOKEN }} - - - name: Install lint deps - run: | - uds run lint:deps - - - name: Lint the repository - run: | - uds run lint:yaml + uses: defenseunicorns/uds-common/.github/workflows/callable-lint.yaml@f0164622ffc2007e96a0e1deaa3f5064db04b148 # v1.1.0 + secrets: inherit \ No newline at end of file diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index aab6d48..fe06f77 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -1,3 +1,6 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial + name: Release on: @@ -14,7 +17,7 @@ permissions: jobs: tag-new-version: permissions: write-all - runs-on: uds-marketplace-ubuntu-big-boy-4-core + runs-on: ubuntu-latest outputs: release_created: ${{ steps.release-flag.outputs.release_created }} steps: @@ -34,13 +37,9 @@ jobs: strategy: matrix: flavor: [upstream, unicorn] - architecture: [amd64, arm64] - exclude: - - flavor: registry1 - architecture: arm64 + architecture: [amd64] uses: defenseunicorns/uds-common/.github/workflows/callable-publish.yaml@f0164622ffc2007e96a0e1deaa3f5064db04b148 # v1.1.0 with: flavor: ${{ matrix.flavor }} - runsOn: ${{ matrix.architecture == 'arm64' && 'uds-marketplace-ubuntu-arm64-4-core' || 'uds-marketplace-ubuntu-big-boy-4-core' }} - reports-path: "tests/.playwright/reports/" - secrets: inherit # Inherits all secrets from the parent workflow. + runsOn: uds-marketplace-ubuntu-big-boy-4-core + secrets: inherit # Inherits all secrets from the parent workflow. \ No newline at end of file diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index ef08715..d2b9bd4 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -1,3 +1,6 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial + name: Test # This workflow is triggered on pull requests to the main branch. diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index fc9c66f..5e6510d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,3 +1,6 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial + repos: - repo: https://github.com/pre-commit/pre-commit-hooks rev: v4.6.0 diff --git a/bundle/uds-bundle.yaml b/bundle/uds-bundle.yaml index 8c2d2cb..3e3cdbe 100644 --- a/bundle/uds-bundle.yaml +++ b/bundle/uds-bundle.yaml @@ -1,3 +1,6 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial + kind: UDSBundle metadata: name: jenkins-test diff --git a/bundle/uds-config.yaml b/bundle/uds-config.yaml index e69de29..e8e24de 100644 --- a/bundle/uds-config.yaml +++ b/bundle/uds-config.yaml @@ -0,0 +1,2 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial \ No newline at end of file diff --git a/chart/templates/uds-package.yaml b/chart/templates/uds-package.yaml index e8d3d0c..cbcbb58 100644 --- a/chart/templates/uds-package.yaml +++ b/chart/templates/uds-package.yaml @@ -1,3 +1,6 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial + apiVersion: uds.dev/v1alpha1 kind: Package metadata: diff --git a/src/namespace/jenkins-ns.yaml b/src/namespace/jenkins-ns.yaml index 4c7c728..a9659fc 100644 --- a/src/namespace/jenkins-ns.yaml +++ b/src/namespace/jenkins-ns.yaml @@ -1,3 +1,6 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial + kind: Namespace apiVersion: v1 metadata: diff --git a/src/namespace/zarf.yaml b/src/namespace/zarf.yaml index 140454b..6c6968b 100644 --- a/src/namespace/zarf.yaml +++ b/src/namespace/zarf.yaml @@ -1,3 +1,6 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial + kind: ZarfPackageConfig metadata: name: dev-namespace diff --git a/tasks.yaml b/tasks.yaml index 1f29a1b..c387e04 100644 --- a/tasks.yaml +++ b/tasks.yaml @@ -1,67 +1,53 @@ includes: - - cleanup: ./tasks/cleanup.yaml - test: ./tasks/test.yaml - - create: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.12.0/tasks/create.yaml - - lint: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.12.0/tasks/lint.yaml - - pull: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.12.0/tasks/pull.yaml - - deploy: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.12.0/tasks/deploy.yaml - - upgrade: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.12.0/tasks/upgrade.yaml - - setup: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.12.0/tasks/setup.yaml + - dependencies: ./tasks/dependencies.yaml + - create: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.1.0/tasks/create.yaml + - lint: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.1.0/tasks/lint.yaml + - pull: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.1.0/tasks/pull.yaml + - deploy: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.1.0/tasks/deploy.yaml + - setup: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.1.0/tasks/setup.yaml + - actions: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.1.0/tasks/actions.yaml + - badge: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.1.0/tasks/badge.yaml + - upgrade: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.1.0/tasks/upgrade.yaml + - compliance: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.1.0/tasks/compliance.yaml + - publish: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.1.0/tasks/publish.yaml tasks: - name: default - description: Create K3D Cluster with UDS-Core + Jenkins + description: Create K3D Cluster with lite UDS-Core + Jenkins actions: - - task: create-jenkins-test-bundle - - task: setup:k3d-test-cluster - # TODO: Remove pinned version after uds-common releases 0.12.1 or later - with: - version: 0.26.1 - - task: deploy:test-bundle - + - task: create-dev-package + - task: setup:k3d-full-cluster + - task: create-deploy-test-bundle + - name: default-full - description: Create K3D Cluster with UDS-Core + Jenkins + description: Create K3D Cluster with full UDS-Core + Jenkins actions: - - task: create-jenkins-test-bundle + - task: create-dev-package - task: setup:k3d-full-cluster - # TODO: Remove pinned version after uds-common releases 0.12.1 or later - with: - version: 0.26.1 - - task: deploy:test-bundle + - task: create-deploy-test-bundle - - name: create-jenkins-package + - name: create-dev-package description: Create UDS Jenkins Package actions: - task: create:package with: options: "--skip-sbom" - - name: create-jenkins-test-bundle - description: Create a local UDS Jenkins bundle - actions: - - task: create-jenkins-package - - task: create:test-bundle - - - name: create-jenkins-latest-release-bundle - description: Create UDS Jenkins bundle based on the latest release + - name: create-deploy-test-bundle + description: Test and validate cluster is deployed with Jenkins actions: - - task: pull:latest-package-release - with: - spoof_release: "true" + - task: dependencies:create - task: create:test-bundle - - - name: setup-cluster - description: Setup a K3D cluster with UDS-Core-Slim - actions: - - task: setup:k3d-test-cluster - # TODO: Remove pinned version after uds-common releases 0.12.1 or later - with: - version: 0.26.1 + - task: deploy:test-bundle + - task: setup:create-doug-user + - task: test:all - name: dev - description: Create then deploy local jenkins bundle + description: Create and deploy the bundle on an existing cluster (for iteration/dev speed) actions: - - task: create-jenkins-test-bundle + - task: create-dev-package + - task: create:test-bundle - task: deploy:test-bundle # CI will execute the following (via uds-common/.github/actions/test) so they need to be here with these names @@ -69,29 +55,38 @@ tasks: - name: test-package description: Test the Jenkins package from the current branch actions: - - task: create-jenkins-test-bundle + - task: dependencies:create + - task: create-dev-package - task: setup:k3d-test-cluster - # TODO: Remove pinned version after uds-common releases 0.12.1 or later - with: - version: 0.26.1 - - task: deploy:test-bundle - - task: setup:create-doug-user - - task: test:health-check - - task: test:ingress + - task: create-deploy-test-bundle - task: test:ui - name: test-upgrade description: Test an upgrade from the latest released package to the current branch actions: + - task: dependencies:create - task: upgrade:create-latest-tag-bundle - task: setup:k3d-test-cluster - # TODO: Remove pinned version after uds-common releases 0.12.1 or later - with: - version: 0.26.1 - task: deploy:test-bundle - - task: create-jenkins-test-bundle - - task: deploy:test-bundle - - task: setup:create-doug-user - - task: test:health-check - - task: test:ingress - - task: test:ui + - task: create-dev-package + - task: create-deploy-test-bundle + + + - name: publish-package + description: Build and publish the packages + actions: + - description: Create the package + task: create:package + + - description: Setup the cluster + task: setup:k3d-test-cluster + + - description: Create deploy and test the bundle + task: create-deploy-test-bundle + + - description: Publish the packages + task: publish:package + with: + # x-release-please-start-version + version: 3.72.0-uds.0 + # x-release-please-end diff --git a/tasks/cleanup.yaml b/tasks/cleanup.yaml deleted file mode 100644 index d28da9c..0000000 --- a/tasks/cleanup.yaml +++ /dev/null @@ -1,10 +0,0 @@ -tasks: - - name: cluster - actions: - - description: Destroy k3d cluster - cmd: k3d cluster delete uds - - - name: bundle - actions: - - description: Remove the Deployed UDS Jenkins Bundle - cmd: ./uds remove ./bundle/uds-bundle-jenkins-test*.tar.zst --confirm --no-progress diff --git a/tasks/dependencies.yaml b/tasks/dependencies.yaml new file mode 100644 index 0000000..48a5492 --- /dev/null +++ b/tasks/dependencies.yaml @@ -0,0 +1,15 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial + +tasks: + - name: create + description: Create the Dev-Secrets Dependency Zarf Package + inputs: + options: + description: For setting create time variables and flags + architecture: + description: The architecture of the package to create + default: ${UDS_ARCH} + actions: + - cmd: ./uds zarf package create src/dev-secrets/ --confirm --no-progress --architecture=${{ .inputs.architecture }} --skip-sbom ${{ .inputs.options }} + - cmd: ./uds zarf package create src/namespace/ --confirm --no-progress --architecture=${{ .inputs.architecture }} --skip-sbom ${{ .inputs.options }} \ No newline at end of file diff --git a/tasks/publish.yaml b/tasks/publish.yaml deleted file mode 100644 index 4e858a8..0000000 --- a/tasks/publish.yaml +++ /dev/null @@ -1,40 +0,0 @@ -includes: - - dependencies: ./dependencies.yaml - - create: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.12.0/tasks/create.yaml - - publish: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.12.0/tasks/publish.yaml - -tasks: - - name: package - description: Build and publish the packages - actions: - - description: Create the AMD64 package - task: create:package - with: - architecture: amd64 - - - description: Publish the packages - task: publish:package - with: - # x-release-please-start-version - version: "5.6.1-uds.0" - # x-release-please-end - - - name: test-bundle - description: Build and publish the test bundles - actions: - - description: Create the AMD64 deps package - task: dependencies:create - with: - architecture: amd64 - - - description: Create the AMD64 bundle - task: create:test-bundle - with: - architecture: amd64 - - - description: Publish the bundles - task: publish:test-bundle - with: - # x-release-please-start-version - version: "5.6.1-uds.0" - # x-release-please-end diff --git a/tasks/test.yaml b/tasks/test.yaml index dfe00c3..752e193 100644 --- a/tasks/test.yaml +++ b/tasks/test.yaml @@ -1,4 +1,13 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial + tasks: + - name: all + description: Create K3D Cluster with UDS-Core + Securecodebox + actions: + - task: health-check + - task: ingress + - name: health-check actions: - description: Jenkins StatefulSet Health Check diff --git a/values/common.yaml b/values/common.yaml index 254b186..035af56 100644 --- a/values/common.yaml +++ b/values/common.yaml @@ -1,3 +1,6 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial + controller: jenkinsUrl: https://jenkins.###ZARF_VAR_DOMAIN### disableRememberMe: true diff --git a/values/registry1.yaml b/values/registry1.yaml index 8d09e87..162e6ba 100644 --- a/values/registry1.yaml +++ b/values/registry1.yaml @@ -1,3 +1,6 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial + controller: image: registry: "registry1.dso.mil" diff --git a/values/unicorn.yaml b/values/unicorn.yaml index 3e01488..c872f9e 100644 --- a/values/unicorn.yaml +++ b/values/unicorn.yaml @@ -1,3 +1,6 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial + controller: image: registry: "cgr.dev" diff --git a/values/upstream.yaml b/values/upstream.yaml index f5ba17a..507eaa0 100644 --- a/values/upstream.yaml +++ b/values/upstream.yaml @@ -1,3 +1,6 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial + controller: image: registry: "docker.io" diff --git a/zarf.yaml b/zarf.yaml index 2023c78..c61af8d 100644 --- a/zarf.yaml +++ b/zarf.yaml @@ -1,11 +1,12 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial + # yaml-language-server: $schema=https://raw.githubusercontent.com/defenseunicorns/zarf/main/zarf.schema.json kind: ZarfPackageConfig metadata: name: jenkins description: "UDS Jenkins package" - # x-release-please-start-version version: "5.6.1-uds.0" - # x-release-please-end architecture: amd64 variables: @@ -56,7 +57,6 @@ components: - registry1.dso.mil/ironbank/opensource/jenkins/inbound-agent:3186.vc3b_7249b_87eb_-1 - registry1.dso.mil/ironbank/kiwigrid/k8s-sidecar:1.27.6 - # Note: unicorn flavor is experimental - name: jenkins required: true description: "Deploy jenkins with unicorn images" From a5c5c0a6239a41f1fddef90e48c2e222e592a80a Mon Sep 17 00:00:00 2001 From: ritika-du Date: Mon, 28 Oct 2024 14:14:07 -0400 Subject: [PATCH 11/34] chore: release unicorn flavor --- .github/workflows/commitlint.yaml | 2 +- .github/workflows/lint.yaml | 2 +- .github/workflows/release.yaml | 2 +- bundle/uds-config.yaml | 2 +- tasks.yaml | 3 +-- tasks/dependencies.yaml | 2 +- tasks/test.yaml | 10 +++++----- 7 files changed, 11 insertions(+), 12 deletions(-) diff --git a/.github/workflows/commitlint.yaml b/.github/workflows/commitlint.yaml index 462063d..3fc60fd 100644 --- a/.github/workflows/commitlint.yaml +++ b/.github/workflows/commitlint.yaml @@ -14,4 +14,4 @@ on: jobs: validate: - uses: uses: defenseunicorns/uds-common/.github/workflows/callable-commitlint.yaml@f0164622ffc2007e96a0e1deaa3f5064db04b148 # v1.1.0 + uses: defenseunicorns/uds-common/.github/workflows/callable-commitlint.yaml@f0164622ffc2007e96a0e1deaa3f5064db04b148 # v1.1.0 diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index d82018e..b10ddd7 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -11,4 +11,4 @@ on: jobs: validate: uses: defenseunicorns/uds-common/.github/workflows/callable-lint.yaml@f0164622ffc2007e96a0e1deaa3f5064db04b148 # v1.1.0 - secrets: inherit \ No newline at end of file + secrets: inherit diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index fe06f77..cdc59b8 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -42,4 +42,4 @@ jobs: with: flavor: ${{ matrix.flavor }} runsOn: uds-marketplace-ubuntu-big-boy-4-core - secrets: inherit # Inherits all secrets from the parent workflow. \ No newline at end of file + secrets: inherit # Inherits all secrets from the parent workflow. diff --git a/bundle/uds-config.yaml b/bundle/uds-config.yaml index e8e24de..2067cc5 100644 --- a/bundle/uds-config.yaml +++ b/bundle/uds-config.yaml @@ -1,2 +1,2 @@ # Copyright 2024 Defense Unicorns -# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial \ No newline at end of file +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial diff --git a/tasks.yaml b/tasks.yaml index c387e04..4c74375 100644 --- a/tasks.yaml +++ b/tasks.yaml @@ -19,7 +19,7 @@ tasks: - task: create-dev-package - task: setup:k3d-full-cluster - task: create-deploy-test-bundle - + - name: default-full description: Create K3D Cluster with full UDS-Core + Jenkins actions: @@ -71,7 +71,6 @@ tasks: - task: create-dev-package - task: create-deploy-test-bundle - - name: publish-package description: Build and publish the packages actions: diff --git a/tasks/dependencies.yaml b/tasks/dependencies.yaml index 48a5492..8a4325e 100644 --- a/tasks/dependencies.yaml +++ b/tasks/dependencies.yaml @@ -12,4 +12,4 @@ tasks: default: ${UDS_ARCH} actions: - cmd: ./uds zarf package create src/dev-secrets/ --confirm --no-progress --architecture=${{ .inputs.architecture }} --skip-sbom ${{ .inputs.options }} - - cmd: ./uds zarf package create src/namespace/ --confirm --no-progress --architecture=${{ .inputs.architecture }} --skip-sbom ${{ .inputs.options }} \ No newline at end of file + - cmd: ./uds zarf package create src/namespace/ --confirm --no-progress --architecture=${{ .inputs.architecture }} --skip-sbom ${{ .inputs.options }} diff --git a/tasks/test.yaml b/tasks/test.yaml index 752e193..4316613 100644 --- a/tasks/test.yaml +++ b/tasks/test.yaml @@ -3,11 +3,11 @@ tasks: - name: all - description: Create K3D Cluster with UDS-Core + Securecodebox - actions: - - task: health-check - - task: ingress - + description: Create K3D Cluster with UDS-Core + Securecodebox + actions: + - task: health-check + - task: ingress + - name: health-check actions: - description: Jenkins StatefulSet Health Check From 684da33d081fe161942978cfbff8487ffab43f84 Mon Sep 17 00:00:00 2001 From: ritika-du Date: Mon, 28 Oct 2024 15:36:29 -0400 Subject: [PATCH 12/34] chore: add linting fixes --- .github/workflows/ci-docs-shim.yaml | 2 +- .github/workflows/commitlint.yaml | 6 +- .github/workflows/lint.yaml | 2 +- .github/workflows/release.yaml | 4 +- .github/workflows/test.yaml | 119 ++++------------------------ 5 files changed, 22 insertions(+), 111 deletions(-) diff --git a/.github/workflows/ci-docs-shim.yaml b/.github/workflows/ci-docs-shim.yaml index e83d96a..5f8e2d9 100644 --- a/.github/workflows/ci-docs-shim.yaml +++ b/.github/workflows/ci-docs-shim.yaml @@ -14,7 +14,7 @@ jobs: matrix: type: [install, upgrade] flavor: [upstream, unicorn] - uses: defenseunicorns/uds-common/.github/workflows/callable-ci-docs-shim.yaml@f0164622ffc2007e96a0e1deaa3f5064db04b148 # v1.1.0 + uses: defenseunicorns/uds-common/.github/workflows/callable-ci-docs-shim.yaml@2a5e66fceb5c506008d5f69f42abcf38ccf86b44 # v1.2.0 with: flavor: ${{ matrix.flavor }} type: ${{ matrix.type }} diff --git a/.github/workflows/commitlint.yaml b/.github/workflows/commitlint.yaml index 3fc60fd..f706786 100644 --- a/.github/workflows/commitlint.yaml +++ b/.github/workflows/commitlint.yaml @@ -4,14 +4,10 @@ name: Metadata on: - # This workflow is triggered on pull requests to the main branch. pull_request: branches: [main] types: [milestoned, opened, edited, synchronize] - # This allows other repositories to call this workflow in a reusable way - workflow_call: - jobs: validate: - uses: defenseunicorns/uds-common/.github/workflows/callable-commitlint.yaml@f0164622ffc2007e96a0e1deaa3f5064db04b148 # v1.1.0 + uses: defenseunicorns/uds-common/.github/workflows/callable-commitlint.yaml@2a5e66fceb5c506008d5f69f42abcf38ccf86b44 # v1.2.0 diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index b10ddd7..0cf579c 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -10,5 +10,5 @@ on: jobs: validate: - uses: defenseunicorns/uds-common/.github/workflows/callable-lint.yaml@f0164622ffc2007e96a0e1deaa3f5064db04b148 # v1.1.0 + uses: defenseunicorns/uds-common/.github/workflows/callable-lint.yaml@2a5e66fceb5c506008d5f69f42abcf38ccf86b44 # v1.2.0 secrets: inherit diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index cdc59b8..06bb220 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -38,8 +38,8 @@ jobs: matrix: flavor: [upstream, unicorn] architecture: [amd64] - uses: defenseunicorns/uds-common/.github/workflows/callable-publish.yaml@f0164622ffc2007e96a0e1deaa3f5064db04b148 # v1.1.0 + uses: defenseunicorns/uds-common/.github/workflows/callable-publish.yaml@2a5e66fceb5c506008d5f69f42abcf38ccf86b44 # v1.2.0 with: flavor: ${{ matrix.flavor }} - runsOn: uds-marketplace-ubuntu-big-boy-4-core + runsOn: uds-marketplace-ubuntu-big-boy-8-core secrets: inherit # Inherits all secrets from the parent workflow. diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index d2b9bd4..55005f3 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -37,117 +37,32 @@ permissions: packages: read jobs: - flavor-test: - name: Test-Flavor - runs-on: ubuntu-latest + check-flavor: + timeout-minutes: 30 + runs-on: uds-marketplace-ubuntu-big-boy-8-core steps: - name: Checkout repository - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 - name: test-flavor - uses: defenseunicorns/uds-common/.github/workflows/callable-publish.yaml@f0164622ffc2007e96a0e1deaa3f5064db04b148 # v1.1.0 + uses: defenseunicorns/uds-common/.github/actions/test-flavor@2a5e66fceb5c506008d5f69f42abcf38ccf86b44 # v1.2.0 id: test-flavor outputs: upgrade-flavors: ${{ steps.test-flavor.outputs.upgrade-flavors }} - deploy-test: - # TODO: need to fix how actions work in uds-common before this can be used - # needs: flavor-test - # permissions: write-all - # uses: defenseunicorns/uds-common/.github/workflows/test-deploy.yaml@callable_workflow_fix #@24c8a2a48eeb33773b76b3587c489cb17496c9e0 # v0.12.0 - # with: - # upgrade-flavors: ${{ needs.flavor-test.outputs.upgrade-flavors }} - # flavor: ${{ matrix.flavor }} - # type: ${{ matrix.type }} - # runs-on: ubuntu-latest - # clean-runner: false - # upload-reports: playwright - # timeout: 25 - # secrets: inherit # Inherits all secrets from the parent workflow. - # strategy: - # fail-fast: true - # matrix: - # type: [install, upgrade] - # flavor: [upstream, registry1, unicorn] - - - name: ${{ matrix.type }} ${{ matrix.flavor }} - runs-on: ubuntu-latest - timeout-minutes: 25 + validate: + needs: check-flavor strategy: fail-fast: false matrix: - flavor: [upstream, registry1, unicorn] type: [install, upgrade] - - steps: - - name: Checkout repository - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - - - name: Environment setup - uses: defenseunicorns/uds-common/.github/workflows/callable-publish.yaml@f0164622ffc2007e96a0e1deaa3f5064db04b148 # v1.1.0 - with: - registry1Username: ${{ secrets.IRON_BANK_ROBOT_USERNAME }} - registry1Password: ${{ secrets.IRON_BANK_ROBOT_PASSWORD }} - ghToken: ${{ secrets.GITHUB_TOKEN }} - chainguardIdentity: ${{ secrets.CHAINGUARD_IDENTITY }} - - - name: Playwright setup - uses: defenseunicorns/uds-common/.github/workflows/callable-publish.yaml@f0164622ffc2007e96a0e1deaa3f5064db04b148 # v1.1.0 - - - name: Test - uses: defenseunicorns/uds-common/.github/workflows/callable-publish.yaml@f0164622ffc2007e96a0e1deaa3f5064db04b148 # v1.1.0 - with: - upgrade-flavors: ${{ needs.flavor-test.outputs.upgrade-flavors }} - flavor: ${{ matrix.flavor }} - type: ${{ matrix.type }} - - - name: Save logs - if: always() - uses: defenseunicorns/uds-common/.github/workflows/callable-publish.yaml@f0164622ffc2007e96a0e1deaa3f5064db04b148 # v1.1.0 - with: - suffix: ${{ matrix.type }}-${{ matrix.flavor }}-${{ github.run_id }}-${{ github.run_attempt }} - - - name: Print cluster info - if: always() - shell: bash -e -o pipefail {0} - run: | - kubectl get nodes -o wide - - - name: Print pod info - if: always() - shell: bash -e -o pipefail {0} - run: | - kubectl get pods -A -o wide - - - name: Print service info - if: always() - shell: bash -e -o pipefail {0} - run: | - kubectl get svc -A -o wide - - - name: Print events - if: always() - shell: bash -e -o pipefail {0} - run: | - kubectl get events -A -o wide - - - name: Print Jenkins pod logs - if: always() - shell: bash -e -o pipefail {0} - run: | - kubectl logs jenkins-0 -n jenkins - - - name: Upload screenshot on failure - if: failure() - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4 - with: - name: playwright-screenshot - path: tests/screenshots/* - - - name: Upload video on failure - if: failure() - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4 - with: - name: playwright-video - path: tests/.playwright/output/* + flavor: [upstream, registry1, unicorn] + uses: defenseunicorns/uds-common/.github/workflows/callable-test.yaml@2a5e66fceb5c506008d5f69f42abcf38ccf86b44 # v1.2.0 + with: + timeout: 30 + runsOn: uds-marketplace-ubuntu-big-boy-8-core + upgrade-flavors: ${{ needs.check-flavor.outputs.upgrade-flavors }} + flavor: ${{ matrix.flavor }} + type: ${{ matrix.type }} + reports-path: "tests/.playwright/reports/" + secrets: inherit # Inherits all secrets from the parent workflow. From d687349052489bef9b7b2fc52573c714b1692963 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 28 Oct 2024 19:37:44 +0000 Subject: [PATCH 13/34] chore(deps): update jenkins plugin dependencies | datasource | package | from | to | | ----------- | -------------------------------------------- | --------------------- | --------------------- | | github-tags | jenkinsci/cloudbees-disk-usage-simple-plugin | 203.v3f46a_7462b_1a_ | 205.v47f4ee8803d1 | | github-tags | jenkinsci/configuration-as-code-plugin | 1850.va_a_8c31d3158b_ | 1873.vea_5814ca_9c93 | | github-tags | jenkinsci/kubernetes-plugin | 4287.v73451380b_576 | 4295.v7fa_01b_309c95 | | github-tags | jenkinsci/oic-auth-plugin | 4.340.ve70636c6590e | 4.418.vccc7061f5b_6d | | github-tags | jenkinsci/prometheus-plugin | 784.vea_eca_f6592eb_ | 787.v52e8f47488fc | | github-tags | jenkinsci/saml-plugin | 4.487.v9f1c3328f1c0 | 4.501.v4313a_01e3a_18 | --- values/common.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/values/common.yaml b/values/common.yaml index 254b186..3b70fd7 100644 --- a/values/common.yaml +++ b/values/common.yaml @@ -16,14 +16,14 @@ controller: cpu: "2000m" memory: "8192Mi" installPlugins: - - kubernetes:4287.v73451380b_576 + - kubernetes:4295.v7fa_01b_309c95 - workflow-aggregator:600.vb_57cdd26fdd7 - git:5.2.2 - - configuration-as-code:1850.va_a_8c31d3158b_ - - oic-auth:4.340.ve70636c6590e - - prometheus:784.vea_eca_f6592eb_ - - cloudbees-disk-usage-simple:203.v3f46a_7462b_1a_ - - saml:4.487.v9f1c3328f1c0 + - configuration-as-code:1873.vea_5814ca_9c93 + - oic-auth:4.418.vccc7061f5b_6d + - prometheus:787.v52e8f47488fc + - cloudbees-disk-usage-simple:205.v47f4ee8803d1 + - saml:4.501.v4313a_01e3a_18 - okhttp-api:4.11.0-181.v1de5b_83857df overwritePlugins: true JCasC: From 9a64c0ff2940eb3643eaa6d73b6a27f9c3825556 Mon Sep 17 00:00:00 2001 From: ritika-du Date: Mon, 28 Oct 2024 15:47:26 -0400 Subject: [PATCH 14/34] chore: update dependencies --- bundle/uds-bundle.yaml | 2 +- tasks.yaml | 6 +----- tasks/dependencies.yaml | 15 --------------- 3 files changed, 2 insertions(+), 21 deletions(-) delete mode 100644 tasks/dependencies.yaml diff --git a/bundle/uds-bundle.yaml b/bundle/uds-bundle.yaml index 3e3cdbe..dfd805c 100644 --- a/bundle/uds-bundle.yaml +++ b/bundle/uds-bundle.yaml @@ -4,7 +4,7 @@ kind: UDSBundle metadata: name: jenkins-test - description: A UDS bundle for deploying jenkins and it's dependencies on a development cluster + description: A UDS bundle for deploying jenkins on a development cluster # x-release-please-start-version version: 5.6.1-uds.0 # x-release-please-end diff --git a/tasks.yaml b/tasks.yaml index 4c74375..dd56cf3 100644 --- a/tasks.yaml +++ b/tasks.yaml @@ -1,6 +1,5 @@ includes: - test: ./tasks/test.yaml - - dependencies: ./tasks/dependencies.yaml - create: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.1.0/tasks/create.yaml - lint: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.1.0/tasks/lint.yaml - pull: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.1.0/tasks/pull.yaml @@ -36,8 +35,7 @@ tasks: - name: create-deploy-test-bundle description: Test and validate cluster is deployed with Jenkins - actions: - - task: dependencies:create + actions - task: create:test-bundle - task: deploy:test-bundle - task: setup:create-doug-user @@ -55,7 +53,6 @@ tasks: - name: test-package description: Test the Jenkins package from the current branch actions: - - task: dependencies:create - task: create-dev-package - task: setup:k3d-test-cluster - task: create-deploy-test-bundle @@ -64,7 +61,6 @@ tasks: - name: test-upgrade description: Test an upgrade from the latest released package to the current branch actions: - - task: dependencies:create - task: upgrade:create-latest-tag-bundle - task: setup:k3d-test-cluster - task: deploy:test-bundle diff --git a/tasks/dependencies.yaml b/tasks/dependencies.yaml deleted file mode 100644 index 8a4325e..0000000 --- a/tasks/dependencies.yaml +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 2024 Defense Unicorns -# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial - -tasks: - - name: create - description: Create the Dev-Secrets Dependency Zarf Package - inputs: - options: - description: For setting create time variables and flags - architecture: - description: The architecture of the package to create - default: ${UDS_ARCH} - actions: - - cmd: ./uds zarf package create src/dev-secrets/ --confirm --no-progress --architecture=${{ .inputs.architecture }} --skip-sbom ${{ .inputs.options }} - - cmd: ./uds zarf package create src/namespace/ --confirm --no-progress --architecture=${{ .inputs.architecture }} --skip-sbom ${{ .inputs.options }} From 6378a05ae7a1f3fba724821413530bc15638daf1 Mon Sep 17 00:00:00 2001 From: ritika-du Date: Mon, 28 Oct 2024 15:49:21 -0400 Subject: [PATCH 15/34] chore: fix typo --- tasks.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks.yaml b/tasks.yaml index dd56cf3..cea9a85 100644 --- a/tasks.yaml +++ b/tasks.yaml @@ -35,7 +35,7 @@ tasks: - name: create-deploy-test-bundle description: Test and validate cluster is deployed with Jenkins - actions + actions: - task: create:test-bundle - task: deploy:test-bundle - task: setup:create-doug-user From dbb4d4dc09d6eea8789bafbb7ac2281db171eeef Mon Sep 17 00:00:00 2001 From: binbashburns Date: Mon, 28 Oct 2024 16:23:47 -0400 Subject: [PATCH 16/34] Update lint.yaml to new format --- .github/workflows/lint.yaml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 0cf579c..c56d6b0 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -1,14 +1,16 @@ # Copyright 2024 Defense Unicorns # SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial -name: Scan +name: Lint on: # This workflow is triggered on pull requests to the main branch. pull_request: - types: [milestoned, opened, reopened, synchronize] + branches: [main] + # milestoned is added here as a workaround for release-please not triggering PR workflows (PRs should be added to a milestone to trigger the workflow). + types: [milestoned, opened, edited, synchronize] jobs: - validate: + run: uses: defenseunicorns/uds-common/.github/workflows/callable-lint.yaml@2a5e66fceb5c506008d5f69f42abcf38ccf86b44 # v1.2.0 secrets: inherit From a567e771f9f7388baa4370597a2f748e489b7765 Mon Sep 17 00:00:00 2001 From: ritika-du Date: Mon, 28 Oct 2024 16:33:43 -0400 Subject: [PATCH 17/34] chore: remove unecessary files --- .pre-commit-config.yaml | 56 ----------------------------------------- commitlint.config.js | 1 - 2 files changed, 57 deletions(-) delete mode 100644 .pre-commit-config.yaml delete mode 100644 commitlint.config.js diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml deleted file mode 100644 index 5e6510d..0000000 --- a/.pre-commit-config.yaml +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 2024 Defense Unicorns -# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial - -repos: - - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.6.0 - hooks: - - id: check-added-large-files - args: ["--maxkb=1024"] - - id: check-merge-conflict - - id: detect-aws-credentials - args: - - "--allow-missing-credentials" - - id: detect-private-key - exclude: | - (?x)^( - kustomizations/bigbang/environment-bb/values-bigbang.enc.yaml - )$ - - id: end-of-file-fixer - exclude: "^kustomizations/bigbang/vendor/.*$" - - id: fix-byte-order-marker - - id: trailing-whitespace - exclude: "^kustomizations/bigbang/vendor/.*$" - args: [--markdown-linebreak-ext=md] - - id: check-yaml - exclude: | - (?x)^( - chart/templates/uds-package.yaml - )$ - args: - - "--allow-multiple-documents" - - repo: https://github.com/sirosen/fix-smartquotes - rev: 0.2.0 - hooks: - - id: fix-smartquotes - - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.29.2 - hooks: - - id: check-jsonschema - name: "Validate Zarf Configs Against Schema" - files: "zarf.yaml" - types: [yaml] - args: - [ - "--schemafile", - "https://raw.githubusercontent.com/defenseunicorns/zarf/v0.39.0/zarf.schema.json", - "--no-cache" - ] - - repo: https://github.com/golangci/golangci-lint - rev: v1.61.0 - hooks: - - id: golangci-lint - - repo: https://github.com/renovatebot/pre-commit-hooks - rev: 38.85.1 - hooks: - - id: renovate-config-validator diff --git a/commitlint.config.js b/commitlint.config.js deleted file mode 100644 index 5073c20..0000000 --- a/commitlint.config.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = { extends: ["@commitlint/config-conventional"] }; From 619bf70e035b751ced91768b891e498a942caa7b Mon Sep 17 00:00:00 2001 From: ritika-du Date: Mon, 28 Oct 2024 16:45:54 -0400 Subject: [PATCH 18/34] chore: change lint.yaml --- .github/workflows/lint.yaml | 37 ++++++++++++++++++++++++++++--------- 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index c56d6b0..12c6081 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -1,16 +1,35 @@ -# Copyright 2024 Defense Unicorns -# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial - -name: Lint +name: Scan on: # This workflow is triggered on pull requests to the main branch. pull_request: branches: [main] - # milestoned is added here as a workaround for release-please not triggering PR workflows (PRs should be added to a milestone to trigger the workflow). - types: [milestoned, opened, edited, synchronize] + types: [milestoned, opened, synchronize] jobs: - run: - uses: defenseunicorns/uds-common/.github/workflows/callable-lint.yaml@2a5e66fceb5c506008d5f69f42abcf38ccf86b44 # v1.2.0 - secrets: inherit + validate: + runs-on: ubuntu-latest + name: Lint + permissions: + contents: read # Allows reading the repo contents + + steps: + - name: Checkout + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + with: + fetch-depth: 0 + + - name: Environment setup + uses: defenseunicorns/uds-common/.github/actions/setup@24c8a2a48eeb33773b76b3587c489cb17496c9e0 # v0.12.0 + with: + registry1Username: ${{ secrets.IRON_BANK_ROBOT_USERNAME }} + registry1Password: ${{ secrets.IRON_BANK_ROBOT_PASSWORD }} + ghToken: ${{ secrets.GITHUB_TOKEN }} + + - name: Install lint deps + run: | + uds run lint:deps + + - name: Lint the repository + run: | + uds run lint:yaml \ No newline at end of file From 7f84661dc0c4a09d36563cfdf5f1dc63be6fa6ec Mon Sep 17 00:00:00 2001 From: ritika-du Date: Mon, 28 Oct 2024 16:48:00 -0400 Subject: [PATCH 19/34] chore: change lint.yaml --- .github/workflows/lint.yaml | 34 ++++--------------- .../workflows/pull-request-conditionals.yaml | 30 ---------------- 2 files changed, 7 insertions(+), 57 deletions(-) delete mode 100644 .github/workflows/pull-request-conditionals.yaml diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 12c6081..7c6809f 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -1,35 +1,15 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial + name: Scan on: # This workflow is triggered on pull requests to the main branch. pull_request: - branches: [main] - types: [milestoned, opened, synchronize] + # milestoned is added here as a workaround for release-please not triggering PR workflows (PRs should be added to a milestone to trigger the workflow). + types: [milestoned, opened, reopened, synchronize] jobs: validate: - runs-on: ubuntu-latest - name: Lint - permissions: - contents: read # Allows reading the repo contents - - steps: - - name: Checkout - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - with: - fetch-depth: 0 - - - name: Environment setup - uses: defenseunicorns/uds-common/.github/actions/setup@24c8a2a48eeb33773b76b3587c489cb17496c9e0 # v0.12.0 - with: - registry1Username: ${{ secrets.IRON_BANK_ROBOT_USERNAME }} - registry1Password: ${{ secrets.IRON_BANK_ROBOT_PASSWORD }} - ghToken: ${{ secrets.GITHUB_TOKEN }} - - - name: Install lint deps - run: | - uds run lint:deps - - - name: Lint the repository - run: | - uds run lint:yaml \ No newline at end of file + uses: defenseunicorns/uds-common/.github/workflows/callable-lint.yaml@97fc3a00fb2b9897316131cd210026691e160d5a # v1.1.1 + secrets: inherit \ No newline at end of file diff --git a/.github/workflows/pull-request-conditionals.yaml b/.github/workflows/pull-request-conditionals.yaml deleted file mode 100644 index 9de8ac5..0000000 --- a/.github/workflows/pull-request-conditionals.yaml +++ /dev/null @@ -1,30 +0,0 @@ -name: Setup - -# This workflow is triggered on pull requests to the main branch. -on: - pull_request: - paths: - - ".github/**" - - "bundle/**" - - "values/**" - - "tasks/**" - - "tests/**" - - "tasks.yaml" - - "zarf.yaml" - -# Permissions for the GITHUB_TOKEN used by the workflow. -permissions: - id-token: write # Needed for OIDC-related operations. - contents: read # Allows reading the content of the repository. - pull-requests: read # Allows reading pull request metadata. - -# Default settings for all run commands in the workflow jobs. -defaults: - run: - shell: bash -e -o pipefail {0} # Ensures that scripts fail on error and pipefail is set. - -jobs: - run-test: - name: Test - uses: ./.github/workflows/test.yaml - secrets: inherit From cdd45a7eda4f4456e5ec8d0017346b8033d9257d Mon Sep 17 00:00:00 2001 From: ritika-du Date: Mon, 28 Oct 2024 16:48:44 -0400 Subject: [PATCH 20/34] chore: fix typo --- .github/workflows/lint.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 7c6809f..d8560aa 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -12,4 +12,4 @@ on: jobs: validate: uses: defenseunicorns/uds-common/.github/workflows/callable-lint.yaml@97fc3a00fb2b9897316131cd210026691e160d5a # v1.1.1 - secrets: inherit \ No newline at end of file + secrets: inherit From 51a0421b2422d65b86e651d1d5b4041e95aceab0 Mon Sep 17 00:00:00 2001 From: binbashburns Date: Mon, 28 Oct 2024 16:51:34 -0400 Subject: [PATCH 21/34] Update lint.yaml --- .github/workflows/lint.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index d8560aa..8db6bef 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -1,15 +1,15 @@ # Copyright 2024 Defense Unicorns # SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial -name: Scan +name: PR Title Check on: # This workflow is triggered on pull requests to the main branch. pull_request: + branches: [main] # milestoned is added here as a workaround for release-please not triggering PR workflows (PRs should be added to a milestone to trigger the workflow). - types: [milestoned, opened, reopened, synchronize] + types: [milestoned, opened, edited, synchronize] jobs: - validate: - uses: defenseunicorns/uds-common/.github/workflows/callable-lint.yaml@97fc3a00fb2b9897316131cd210026691e160d5a # v1.1.1 - secrets: inherit + run: + uses: defenseunicorns/uds-common/.github/workflows/callable-commitlint.yaml@2a5e66fceb5c506008d5f69f42abcf38ccf86b44 # v1.2.0 From 52d1dd333a058a717e021537e52aa4170d531da8 Mon Sep 17 00:00:00 2001 From: ritika-du Date: Mon, 28 Oct 2024 16:54:08 -0400 Subject: [PATCH 22/34] chore: fix linting --- .github/workflows/lint.yaml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index d8560aa..3b67f52 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -1,15 +1,16 @@ # Copyright 2024 Defense Unicorns # SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial -name: Scan +name: Lint on: # This workflow is triggered on pull requests to the main branch. pull_request: + branches: [main] # milestoned is added here as a workaround for release-please not triggering PR workflows (PRs should be added to a milestone to trigger the workflow). - types: [milestoned, opened, reopened, synchronize] + types: [milestoned, opened, edited, synchronize] jobs: - validate: - uses: defenseunicorns/uds-common/.github/workflows/callable-lint.yaml@97fc3a00fb2b9897316131cd210026691e160d5a # v1.1.1 - secrets: inherit + run: + uses: defenseunicorns/uds-common/.github/workflows/callable-lint.yaml@2a5e66fceb5c506008d5f69f42abcf38ccf86b44 # v1.2.0 + secrets: inherit \ No newline at end of file From fd91694c1dde42aa4283c7a86f9cb23bd85ce0fe Mon Sep 17 00:00:00 2001 From: ritika-du Date: Mon, 28 Oct 2024 17:01:06 -0400 Subject: [PATCH 23/34] chore: fix linting --- .github/workflows/lint.yaml | 37 ++++++++++++++++++++++++++++--------- 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index c56d6b0..12c6081 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -1,16 +1,35 @@ -# Copyright 2024 Defense Unicorns -# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial - -name: Lint +name: Scan on: # This workflow is triggered on pull requests to the main branch. pull_request: branches: [main] - # milestoned is added here as a workaround for release-please not triggering PR workflows (PRs should be added to a milestone to trigger the workflow). - types: [milestoned, opened, edited, synchronize] + types: [milestoned, opened, synchronize] jobs: - run: - uses: defenseunicorns/uds-common/.github/workflows/callable-lint.yaml@2a5e66fceb5c506008d5f69f42abcf38ccf86b44 # v1.2.0 - secrets: inherit + validate: + runs-on: ubuntu-latest + name: Lint + permissions: + contents: read # Allows reading the repo contents + + steps: + - name: Checkout + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + with: + fetch-depth: 0 + + - name: Environment setup + uses: defenseunicorns/uds-common/.github/actions/setup@24c8a2a48eeb33773b76b3587c489cb17496c9e0 # v0.12.0 + with: + registry1Username: ${{ secrets.IRON_BANK_ROBOT_USERNAME }} + registry1Password: ${{ secrets.IRON_BANK_ROBOT_PASSWORD }} + ghToken: ${{ secrets.GITHUB_TOKEN }} + + - name: Install lint deps + run: | + uds run lint:deps + + - name: Lint the repository + run: | + uds run lint:yaml \ No newline at end of file From 5b3bdc892cae4cc6cea753e5a27bc789e4e95e04 Mon Sep 17 00:00:00 2001 From: ritika-du Date: Mon, 28 Oct 2024 17:01:50 -0400 Subject: [PATCH 24/34] chore: fix linting --- .github/workflows/lint.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 12c6081..b8cff3f 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -20,7 +20,7 @@ jobs: fetch-depth: 0 - name: Environment setup - uses: defenseunicorns/uds-common/.github/actions/setup@24c8a2a48eeb33773b76b3587c489cb17496c9e0 # v0.12.0 + uses: defenseunicorns/uds-common/.github/workflows/callable-lint.yaml@2a5e66fceb5c506008d5f69f42abcf38ccf86b44 # v1.2.0 with: registry1Username: ${{ secrets.IRON_BANK_ROBOT_USERNAME }} registry1Password: ${{ secrets.IRON_BANK_ROBOT_PASSWORD }} From ccf6a46acbe0232816e89b297fd3f5c5e1358534 Mon Sep 17 00:00:00 2001 From: ritika-du Date: Mon, 28 Oct 2024 17:05:51 -0400 Subject: [PATCH 25/34] chore: fix linting --- .github/workflows/lint.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index b8cff3f..7c6f1b2 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -1,4 +1,4 @@ -name: Scan +name: Lint on: # This workflow is triggered on pull requests to the main branch. From 2dfff33ae42a11867ccf9364578f4be4c6537e7f Mon Sep 17 00:00:00 2001 From: ritika-du Date: Mon, 28 Oct 2024 17:23:22 -0400 Subject: [PATCH 26/34] chore: add licensing and lint --- .github/workflows/lint.yaml | 35 +- LICENSE | 201 ----------- LICENSE.md | 661 ++++++++++++++++++++++++++++++++++++ LICENSING.md | 18 + 4 files changed, 687 insertions(+), 228 deletions(-) delete mode 100644 LICENSE create mode 100644 LICENSE.md create mode 100644 LICENSING.md diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 7c6f1b2..3b67f52 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -1,35 +1,16 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial + name: Lint on: # This workflow is triggered on pull requests to the main branch. pull_request: branches: [main] - types: [milestoned, opened, synchronize] + # milestoned is added here as a workaround for release-please not triggering PR workflows (PRs should be added to a milestone to trigger the workflow). + types: [milestoned, opened, edited, synchronize] jobs: - validate: - runs-on: ubuntu-latest - name: Lint - permissions: - contents: read # Allows reading the repo contents - - steps: - - name: Checkout - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - with: - fetch-depth: 0 - - - name: Environment setup - uses: defenseunicorns/uds-common/.github/workflows/callable-lint.yaml@2a5e66fceb5c506008d5f69f42abcf38ccf86b44 # v1.2.0 - with: - registry1Username: ${{ secrets.IRON_BANK_ROBOT_USERNAME }} - registry1Password: ${{ secrets.IRON_BANK_ROBOT_PASSWORD }} - ghToken: ${{ secrets.GITHUB_TOKEN }} - - - name: Install lint deps - run: | - uds run lint:deps - - - name: Lint the repository - run: | - uds run lint:yaml \ No newline at end of file + run: + uses: defenseunicorns/uds-common/.github/workflows/callable-lint.yaml@2a5e66fceb5c506008d5f69f42abcf38ccf86b44 # v1.2.0 + secrets: inherit \ No newline at end of file diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 261eeb9..0000000 --- a/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 0000000..29ebfa5 --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +. \ No newline at end of file diff --git a/LICENSING.md b/LICENSING.md new file mode 100644 index 0000000..29166a4 --- /dev/null +++ b/LICENSING.md @@ -0,0 +1,18 @@ +# Dual Licensing + +This software is licensed under either of: + +- GNU Affero General Public License v3.0 (AGPLv3), see [LICENSE.md](./LICENSE.md) +- Defense Unicorns Commercial License, see below + +## Defense Unicorns Commercial License + +The use of this software under a commercial license is subject to the individual +terms of the license agreement between the licensee and Defense Unicorns. The +content of this license depends on the specific agreement and may vary. For +more information about obtaining a commercial license, please contact +Defense Unicorns at [defenseunicorns.com](https://defenseunicorns.com). + +To use this software under the commercial license, you must have a valid license +agreement with Defense Unicorns. The terms of the Defense Unicorns, Inc. license +agreement supplant and supersede the terms of the AGPL v3 license. \ No newline at end of file From c97cad5040f8e25d360daf7d764632ae628d4033 Mon Sep 17 00:00:00 2001 From: ritika-du Date: Mon, 28 Oct 2024 17:24:21 -0400 Subject: [PATCH 27/34] chore: fix typo --- .github/workflows/lint.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 3b67f52..c56d6b0 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -13,4 +13,4 @@ on: jobs: run: uses: defenseunicorns/uds-common/.github/workflows/callable-lint.yaml@2a5e66fceb5c506008d5f69f42abcf38ccf86b44 # v1.2.0 - secrets: inherit \ No newline at end of file + secrets: inherit From 7fd55fd20ccfb25cfa0ffa63af2523c52239e725 Mon Sep 17 00:00:00 2001 From: ritika-du Date: Mon, 28 Oct 2024 17:45:51 -0400 Subject: [PATCH 28/34] chore: add licensing --- =1.30.0 | 0 chart/Chart.yaml | 3 +++ chart/values.yaml | 3 +++ common/zarf.yaml | 3 +++ tasks.yaml | 3 +++ tests/auth.setup.ts | 5 +++++ tests/jenkins.test.ts | 5 +++++ tests/playwright.config.ts | 5 +++++ 8 files changed, 27 insertions(+) create mode 100644 =1.30.0 diff --git a/=1.30.0 b/=1.30.0 new file mode 100644 index 0000000..e69de29 diff --git a/chart/Chart.yaml b/chart/Chart.yaml index de1cb6a..1e37731 100644 --- a/chart/Chart.yaml +++ b/chart/Chart.yaml @@ -1,3 +1,6 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial + apiVersion: v2 name: chart description: uds-jenkins-config diff --git a/chart/values.yaml b/chart/values.yaml index 69b7ad7..12dd7bc 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -1,3 +1,6 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial + domain: "###ZARF_VAR_DOMAIN###" sso: diff --git a/common/zarf.yaml b/common/zarf.yaml index 7383e57..21e014b 100644 --- a/common/zarf.yaml +++ b/common/zarf.yaml @@ -1,3 +1,6 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial + # yaml-language-server: $schema=https://raw.githubusercontent.com/defenseunicorns/zarf/main/zarf.schema.json kind: ZarfPackageConfig metadata: diff --git a/tasks.yaml b/tasks.yaml index cea9a85..ba799c1 100644 --- a/tasks.yaml +++ b/tasks.yaml @@ -1,3 +1,6 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial + includes: - test: ./tasks/test.yaml - create: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.1.0/tasks/create.yaml diff --git a/tests/auth.setup.ts b/tests/auth.setup.ts index f015b72..234597f 100644 --- a/tests/auth.setup.ts +++ b/tests/auth.setup.ts @@ -1,3 +1,8 @@ +/** + * Copyright 2024 Defense Unicorns + * SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial + */ + import { test as setup, expect } from '@playwright/test'; import { authFile } from './playwright.config'; import path from 'path'; diff --git a/tests/jenkins.test.ts b/tests/jenkins.test.ts index 939fa34..ef1af92 100644 --- a/tests/jenkins.test.ts +++ b/tests/jenkins.test.ts @@ -1,3 +1,8 @@ +/** + * Copyright 2024 Defense Unicorns + * SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial + */ + import { test, expect, devices } from '@playwright/test'; import path from 'path'; diff --git a/tests/playwright.config.ts b/tests/playwright.config.ts index 5468a7b..ba4696c 100644 --- a/tests/playwright.config.ts +++ b/tests/playwright.config.ts @@ -1,3 +1,8 @@ +/** + * Copyright 2024 Defense Unicorns + * SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial + */ + import { defineConfig, devices } from '@playwright/test'; export const playwrightDir = '.playwright'; From 025d875dfb5f247aa07e044098d8f45614537d41 Mon Sep 17 00:00:00 2001 From: ritika-du Date: Mon, 28 Oct 2024 17:49:35 -0400 Subject: [PATCH 29/34] chore: add registry1 --- .github/workflows/ci-docs-shim.yaml | 2 +- .github/workflows/release.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-docs-shim.yaml b/.github/workflows/ci-docs-shim.yaml index 5f8e2d9..ccdd440 100644 --- a/.github/workflows/ci-docs-shim.yaml +++ b/.github/workflows/ci-docs-shim.yaml @@ -13,7 +13,7 @@ jobs: strategy: matrix: type: [install, upgrade] - flavor: [upstream, unicorn] + flavor: [upstream, registry1, unicorn] uses: defenseunicorns/uds-common/.github/workflows/callable-ci-docs-shim.yaml@2a5e66fceb5c506008d5f69f42abcf38ccf86b44 # v1.2.0 with: flavor: ${{ matrix.flavor }} diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 06bb220..4ab4eb4 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -36,7 +36,7 @@ jobs: if: ${{ needs.tag-new-version.outputs.release_created == 'true' }} strategy: matrix: - flavor: [upstream, unicorn] + flavor: [upstream, registry1, unicorn] architecture: [amd64] uses: defenseunicorns/uds-common/.github/workflows/callable-publish.yaml@2a5e66fceb5c506008d5f69f42abcf38ccf86b44 # v1.2.0 with: From 4b50b489096eb5cea3d4239acdbdeae5aff779fc Mon Sep 17 00:00:00 2001 From: ritika-du Date: Mon, 28 Oct 2024 18:39:40 -0400 Subject: [PATCH 30/34] chore: exclude registry1 --- .github/workflows/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 55005f3..e22b75c 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -56,7 +56,7 @@ jobs: fail-fast: false matrix: type: [install, upgrade] - flavor: [upstream, registry1, unicorn] + flavor: [upstream, unicorn] uses: defenseunicorns/uds-common/.github/workflows/callable-test.yaml@2a5e66fceb5c506008d5f69f42abcf38ccf86b44 # v1.2.0 with: timeout: 30 From a365cc9dca066845309bf3c3e47bf77be603f2a1 Mon Sep 17 00:00:00 2001 From: binbashburns Date: Mon, 28 Oct 2024 18:59:14 -0400 Subject: [PATCH 31/34] Update release-please-config.json --- release-please-config.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/release-please-config.json b/release-please-config.json index a2a49d8..b883dd5 100644 --- a/release-please-config.json +++ b/release-please-config.json @@ -15,9 +15,8 @@ "prerelease-type": "uds", "extra-files": [ "bundle/uds-bundle.yaml", - "tasks/publish.yaml", - "zarf.yaml", - "tasks.yaml" + "tasks.yaml", + "zarf.yaml" ] } }, From cf3f5bd5371a089fdc0b2149ec419b8fc0d5f163 Mon Sep 17 00:00:00 2001 From: binbashburns Date: Mon, 28 Oct 2024 19:00:35 -0400 Subject: [PATCH 32/34] Update zarf.yaml --- zarf.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/zarf.yaml b/zarf.yaml index c61af8d..16d6eca 100644 --- a/zarf.yaml +++ b/zarf.yaml @@ -6,7 +6,9 @@ kind: ZarfPackageConfig metadata: name: jenkins description: "UDS Jenkins package" + # x-release-please-start-version version: "5.6.1-uds.0" + # x-release-please-end architecture: amd64 variables: From de93c36d4eacac2c43a4cac12034e08c9c0ce450 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 29 Oct 2024 12:52:00 +0000 Subject: [PATCH 33/34] chore(main): release 5.6.1-uds.1 --- .release-please-manifest.json | 2 +- CHANGELOG.md | 31 +++++++++++++++++++++++++++++++ bundle/uds-bundle.yaml | 4 ++-- tasks.yaml | 2 +- version.txt | 2 +- zarf.yaml | 2 +- 6 files changed, 37 insertions(+), 6 deletions(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index aaebafc..3fd2005 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,3 +1,3 @@ { - ".": "5.6.1-uds.0" + ".": "5.6.1-uds.1" } diff --git a/CHANGELOG.md b/CHANGELOG.md index f2733fb..0534951 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,37 @@ All notable changes to this project will be documented in this file. +## [5.6.1-uds.1](https://github.com/defenseunicorns/uds-package-jenkins/compare/v5.6.1-uds.0...v5.6.1-uds.1) (2024-10-29) + + +### Miscellaneous + +* add licensing ([7fd55fd](https://github.com/defenseunicorns/uds-package-jenkins/commit/7fd55fd20ccfb25cfa0ffa63af2523c52239e725)) +* add licensing and lint ([2dfff33](https://github.com/defenseunicorns/uds-package-jenkins/commit/2dfff33ae42a11867ccf9364578f4be4c6537e7f)) +* add linting fixes ([684da33](https://github.com/defenseunicorns/uds-package-jenkins/commit/684da33d081fe161942978cfbff8487ffab43f84)) +* add registry1 ([025d875](https://github.com/defenseunicorns/uds-package-jenkins/commit/025d875dfb5f247aa07e044098d8f45614537d41)) +* change lint.yaml ([7f84661](https://github.com/defenseunicorns/uds-package-jenkins/commit/7f84661dc0c4a09d36563cfdf5f1dc63be6fa6ec)) +* change lint.yaml ([619bf70](https://github.com/defenseunicorns/uds-package-jenkins/commit/619bf70e035b751ced91768b891e498a942caa7b)) +* exclude registry1 ([4b50b48](https://github.com/defenseunicorns/uds-package-jenkins/commit/4b50b489096eb5cea3d4239acdbdeae5aff779fc)) +* fix linting ([ccf6a46](https://github.com/defenseunicorns/uds-package-jenkins/commit/ccf6a46acbe0232816e89b297fd3f5c5e1358534)) +* fix linting ([5b3bdc8](https://github.com/defenseunicorns/uds-package-jenkins/commit/5b3bdc892cae4cc6cea753e5a27bc789e4e95e04)) +* fix linting ([fd91694](https://github.com/defenseunicorns/uds-package-jenkins/commit/fd91694c1dde42aa4283c7a86f9cb23bd85ce0fe)) +* fix linting ([52d1dd3](https://github.com/defenseunicorns/uds-package-jenkins/commit/52d1dd333a058a717e021537e52aa4170d531da8)) +* fix typo ([c97cad5](https://github.com/defenseunicorns/uds-package-jenkins/commit/c97cad5040f8e25d360daf7d764632ae628d4033)) +* fix typo ([cdd45a7](https://github.com/defenseunicorns/uds-package-jenkins/commit/cdd45a7eda4f4456e5ec8d0017346b8033d9257d)) +* fix typo ([6378a05](https://github.com/defenseunicorns/uds-package-jenkins/commit/6378a05ae7a1f3fba724821413530bc15638daf1)) +* **main:** update release please config ([378439f](https://github.com/defenseunicorns/uds-package-jenkins/commit/378439f340e392b61053244e5225542269b1fc31)) +* **main:** update release.yaml ([9a5189a](https://github.com/defenseunicorns/uds-package-jenkins/commit/9a5189ae4a2094993afa164e40ceaf150caa0017)) +* **main:** update release.yaml ([8fc654d](https://github.com/defenseunicorns/uds-package-jenkins/commit/8fc654d799ba39da958335b67cf957652c86295f)) +* **main:** update scorecard ([73fe56e](https://github.com/defenseunicorns/uds-package-jenkins/commit/73fe56eb15bdf081ba22f8ce2d8b764ccb1bd51e)) +* **main:** update test.yaml ([afe1f5f](https://github.com/defenseunicorns/uds-package-jenkins/commit/afe1f5fcb37b0e154764abde278d73ade6310bd4)) +* **main:** update test.yaml ([c7e8e38](https://github.com/defenseunicorns/uds-package-jenkins/commit/c7e8e38160985b05a0b6a306944f90c87b7c951d)) +* release unicorn flavor ([a5c5c0a](https://github.com/defenseunicorns/uds-package-jenkins/commit/a5c5c0a6239a41f1fddef90e48c2e222e592a80a)) +* release unicorn flavor ([8c4ae35](https://github.com/defenseunicorns/uds-package-jenkins/commit/8c4ae3536d6cd615724a66b1c65cba2a2bcc3823)) +* remove unecessary files ([a567e77](https://github.com/defenseunicorns/uds-package-jenkins/commit/a567e771f9f7388baa4370597a2f748e489b7765)) +* update CODEOWNERS ([#82](https://github.com/defenseunicorns/uds-package-jenkins/issues/82)) ([38acd84](https://github.com/defenseunicorns/uds-package-jenkins/commit/38acd840b8f20697d1ee9508862705fccca5c9ee)) +* update dependencies ([9a64c0f](https://github.com/defenseunicorns/uds-package-jenkins/commit/9a64c0ff2940eb3643eaa6d73b6a27f9c3825556)) + ## [5.6.1-uds.0](https://github.com/defenseunicorns/uds-package-jenkins/compare/v5.5.14-uds.1...v5.6.1-uds.0) (2024-09-17) diff --git a/bundle/uds-bundle.yaml b/bundle/uds-bundle.yaml index dfd805c..f1102b8 100644 --- a/bundle/uds-bundle.yaml +++ b/bundle/uds-bundle.yaml @@ -6,14 +6,14 @@ metadata: name: jenkins-test description: A UDS bundle for deploying jenkins on a development cluster # x-release-please-start-version - version: 5.6.1-uds.0 + version: 5.6.1-uds.1 # x-release-please-end packages: - name: jenkins path: ../ # x-release-please-start-version - ref: 5.6.1-uds.0 + ref: 5.6.1-uds.1 # x-release-please-end overrides: uds-jenkins-config: diff --git a/tasks.yaml b/tasks.yaml index ba799c1..c9eef8b 100644 --- a/tasks.yaml +++ b/tasks.yaml @@ -86,5 +86,5 @@ tasks: task: publish:package with: # x-release-please-start-version - version: 3.72.0-uds.0 + version: 5.6.1-uds.1 # x-release-please-end diff --git a/version.txt b/version.txt index 22b6cd1..fc9cad1 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -5.6.1-uds.0 +5.6.1-uds.1 diff --git a/zarf.yaml b/zarf.yaml index 16d6eca..28abbde 100644 --- a/zarf.yaml +++ b/zarf.yaml @@ -7,7 +7,7 @@ metadata: name: jenkins description: "UDS Jenkins package" # x-release-please-start-version - version: "5.6.1-uds.0" + version: "5.6.1-uds.1" # x-release-please-end architecture: amd64 From ef2b3e10c522b1ab50d213b9268bdd250cf25ac6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 29 Oct 2024 15:48:25 +0000 Subject: [PATCH 34/34] chore(deps): update jenkins package dependencies | datasource | package | from | to | | ---------- | ----------------------------------------------------- | ------ | ------ | | docker | cgr.dev/du-uds-defenseunicorns/jenkins | 2.476 | 2.480 | | docker | cgr.dev/du-uds-defenseunicorns/k8s-sidecar | 1.27.6 | 1.28.0 | | docker | docker.io/jenkins/jenkins | 2.476 | 2.483 | | docker | docker.io/kiwigrid/k8s-sidecar | 1.27.6 | 1.28.0 | | helm | jenkins | 5.6.1 | 5.7.9 | | docker | registry1.dso.mil/ironbank/kiwigrid/k8s-sidecar | 1.27.6 | 1.28.0 | | docker | registry1.dso.mil/ironbank/opensource/jenkins/jenkins | 2.476 | 2.482 | --- common/zarf.yaml | 2 +- values/registry1.yaml | 4 ++-- values/unicorn.yaml | 4 ++-- values/upstream.yaml | 4 ++-- zarf.yaml | 12 ++++++------ 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/common/zarf.yaml b/common/zarf.yaml index 21e014b..604f83d 100644 --- a/common/zarf.yaml +++ b/common/zarf.yaml @@ -41,7 +41,7 @@ components: - name: jenkins namespace: jenkins url: https://charts.jenkins.io - version: 5.6.1 + version: 5.7.9 repoName: jenkins releaseName: jenkins valuesFiles: diff --git a/values/registry1.yaml b/values/registry1.yaml index 162e6ba..4048646 100644 --- a/values/registry1.yaml +++ b/values/registry1.yaml @@ -5,13 +5,13 @@ controller: image: registry: "registry1.dso.mil" repository: "ironbank/opensource/jenkins/jenkins" - tag: "2.476-jdk17" + tag: "2.482-jdk17" sidecars: configAutoReload: image: registry: "registry1.dso.mil" repository: "ironbank/kiwigrid/k8s-sidecar" - tag: "1.27.6" + tag: "1.28.0" agent: image: diff --git a/values/unicorn.yaml b/values/unicorn.yaml index c872f9e..d2e6521 100644 --- a/values/unicorn.yaml +++ b/values/unicorn.yaml @@ -5,13 +5,13 @@ controller: image: registry: "cgr.dev" repository: "du-uds-defenseunicorns/jenkins" - tag: "2.476" + tag: "2.480" sidecars: configAutoReload: image: registry: "cgr.dev" repository: "du-uds-defenseunicorns/k8s-sidecar" - tag: "1.27.6" + tag: "1.28.0" agent: image: diff --git a/values/upstream.yaml b/values/upstream.yaml index 507eaa0..2b92e01 100644 --- a/values/upstream.yaml +++ b/values/upstream.yaml @@ -5,13 +5,13 @@ controller: image: registry: "docker.io" repository: "jenkins/jenkins" - tag: "2.476-jdk17" + tag: "2.483-jdk17" sidecars: configAutoReload: image: registry: "docker.io" repository: "kiwigrid/k8s-sidecar" - tag: "1.27.6" + tag: "1.28.0" agent: image: diff --git a/zarf.yaml b/zarf.yaml index 28abbde..a21a0e0 100644 --- a/zarf.yaml +++ b/zarf.yaml @@ -37,8 +37,8 @@ components: valuesFiles: - values/upstream.yaml images: - - docker.io/jenkins/jenkins:2.476-jdk17 - - docker.io/kiwigrid/k8s-sidecar:1.27.6 + - docker.io/jenkins/jenkins:2.483-jdk17 + - docker.io/kiwigrid/k8s-sidecar:1.28.0 - docker.io/jenkins/inbound-agent:3256.v88a_f6e922152-1 - name: jenkins @@ -55,9 +55,9 @@ components: valuesFiles: - values/registry1.yaml images: - - registry1.dso.mil/ironbank/opensource/jenkins/jenkins:2.476-jdk17 + - registry1.dso.mil/ironbank/opensource/jenkins/jenkins:2.482-jdk17 - registry1.dso.mil/ironbank/opensource/jenkins/inbound-agent:3186.vc3b_7249b_87eb_-1 - - registry1.dso.mil/ironbank/kiwigrid/k8s-sidecar:1.27.6 + - registry1.dso.mil/ironbank/kiwigrid/k8s-sidecar:1.28.0 - name: jenkins required: true @@ -73,6 +73,6 @@ components: valuesFiles: - values/unicorn.yaml images: - - cgr.dev/du-uds-defenseunicorns/jenkins:2.476 + - cgr.dev/du-uds-defenseunicorns/jenkins:2.480 - registry1.dso.mil/ironbank/opensource/jenkins/inbound-agent:3186.vc3b_7249b_87eb_-1 - - cgr.dev/du-uds-defenseunicorns/k8s-sidecar:1.27.6 + - cgr.dev/du-uds-defenseunicorns/k8s-sidecar:1.28.0