From 6cda5e01c91d015310660f90214882839d0ed29d Mon Sep 17 00:00:00 2001 From: Michael-Kruggel Date: Tue, 29 Oct 2024 19:31:04 +0000 Subject: [PATCH 01/11] feat: updating workflows and tasks to latest varsion --- .github/workflows/ci-docs-shim.yaml | 21 ++-- .github/workflows/commitlint.yaml | 10 +- .github/workflows/lint.yaml | 34 ++---- .../workflows/pull-request-conditionals.yaml | 3 + .github/workflows/release.yaml | 45 ++++++++ .github/workflows/scorecard.yaml | 38 ++----- .github/workflows/tag-and-release.yaml | 52 --------- .github/workflows/test.yaml | 82 +++++--------- tasks.yaml | 101 ++++++++++-------- tasks/cleanup.yaml | 10 -- tasks/publish.yaml | 55 ---------- tasks/test.yaml | 1 + 12 files changed, 161 insertions(+), 291 deletions(-) create mode 100644 .github/workflows/release.yaml delete mode 100644 .github/workflows/tag-and-release.yaml delete mode 100644 tasks/cleanup.yaml delete mode 100644 tasks/publish.yaml diff --git a/.github/workflows/ci-docs-shim.yaml b/.github/workflows/ci-docs-shim.yaml index b634e9f..6110e02 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: [registry1] - type: [install] - steps: - - name: Shim for ${{ matrix.type }} ${{ matrix.flavor }} - run: | - echo "Documentation-only change detected; marking ${{ matrix.type }} ${{ matrix.flavor }} as successful." + type: [install, upgrade] + flavor: [upstream, registry1] + uses: defenseunicorns/uds-common/.github/workflows/callable-ci-docs-shim.yaml@d59b1c601730bfa7ab76439643242358e529603e # v1.2.2 + 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 e0b2977..2838726 100644 --- a/.github/workflows/commitlint.yaml +++ b/.github/workflows/commitlint.yaml @@ -1,15 +1,13 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial + 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: - name: Validate - uses: defenseunicorns/uds-common/.github/workflows/commitlint.yaml@76287d41ec5f06ecbdd0a6453877a78675aceffe # v0.11.2 + uses: defenseunicorns/uds-common/.github/workflows/callable-commitlint.yaml@d59b1c601730bfa7ab76439643242358e529603e # v1.2.2 diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index ecb34d2..cd0ea72 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@76287d41ec5f06ecbdd0a6453877a78675aceffe # v0.11.2 - 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@d59b1c601730bfa7ab76439643242358e529603e # v1.2.2 + secrets: inherit diff --git a/.github/workflows/pull-request-conditionals.yaml b/.github/workflows/pull-request-conditionals.yaml index 9de8ac5..43972e1 100644 --- a/.github/workflows/pull-request-conditionals.yaml +++ b/.github/workflows/pull-request-conditionals.yaml @@ -1,3 +1,6 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial + name: Setup # This workflow is triggered on pull requests to the main branch. diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml new file mode 100644 index 0000000..60b00a1 --- /dev/null +++ b/.github/workflows/release.yaml @@ -0,0 +1,45 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial + +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: ubuntu-latest + 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, registry1] + architecture: [amd64] + uses: defenseunicorns/uds-common/.github/workflows/callable-publish.yaml@d59b1c601730bfa7ab76439643242358e529603e # v1.2.2 + with: + flavor: ${{ matrix.flavor }} + runsOn: uds-marketplace-ubuntu-big-boy-8-core + secrets: inherit # Inherits all secrets from the parent workflow. diff --git a/.github/workflows/scorecard.yaml b/.github/workflows/scorecard.yaml index d370386..dc6898a 100644 --- a/.github/workflows/scorecard.yaml +++ b/.github/workflows/scorecard.yaml @@ -1,3 +1,6 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial + name: Scorecards supply-chain security on: # Only the default branch is supported. @@ -11,40 +14,11 @@ on: permissions: read-all jobs: - analysis: - name: Scorecards analysis - runs-on: ubuntu-latest + validate: 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@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6 - 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@883d8588e56d1753a8a58c1c86e88976f0c23449 # v3.26.3 - with: - sarif_file: results.sarif + uses: defenseunicorns/uds-common/.github/workflows/callable-scorecard.yaml@d59b1c601730bfa7ab76439643242358e529603e # v1.2.2 + secrets: inherit diff --git a/.github/workflows/tag-and-release.yaml b/.github/workflows/tag-and-release.yaml deleted file mode 100644 index 78a638b..0000000 --- a/.github/workflows/tag-and-release.yaml +++ /dev/null @@ -1,52 +0,0 @@ -name: Publish UDS Package Artifactory - -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: [registry1] - - permissions: - contents: read - packages: write - - steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - - - name: Environment setup - uses: defenseunicorns/uds-common/.github/actions/setup@76287d41ec5f06ecbdd0a6453877a78675aceffe # v0.11.2 - with: - registry1Username: ${{ secrets.IRON_BANK_ROBOT_USERNAME }} - registry1Password: ${{ secrets.IRON_BANK_ROBOT_PASSWORD }} - ghToken: ${{ secrets.GITHUB_TOKEN }} - - - name: Publish Package - run: uds run -f tasks/publish.yaml package --set FLAVOR=${{ matrix.flavor }} - - - name: Save logs - if: always() - uses: defenseunicorns/uds-common/.github/actions/save-logs@76287d41ec5f06ecbdd0a6453877a78675aceffe # v0.11.2 - with: - suffix: '${{ matrix.flavor }}-${{ github.run_id }}-${{ github.run_attempt }}' diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 4c8cd41..fe0fa8d 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. @@ -30,65 +33,34 @@ concurrency: permissions: contents: read + id-token: write + packages: read jobs: - run-test: - name: ${{ matrix.type }} ${{ matrix.flavor }} + check-flavor: runs-on: uds-marketplace-ubuntu-big-boy-8-core - timeout-minutes: 25 - strategy: - matrix: - flavor: [registry1] - type: [install] - # Cannot test upgrade without a license key - # type: [install, upgrade] - steps: - name: Checkout repository - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - - - name: Environment setup - uses: defenseunicorns/uds-common/.github/actions/setup@76287d41ec5f06ecbdd0a6453877a78675aceffe # v0.11.2 - with: - registry1Username: ${{ secrets.IRON_BANK_ROBOT_USERNAME }} - registry1Password: ${{ secrets.IRON_BANK_ROBOT_PASSWORD }} - ghToken: ${{ secrets.GITHUB_TOKEN }} - - - name: Playwright setup - uses: defenseunicorns/uds-common/.github/actions/playwright@76287d41ec5f06ecbdd0a6453877a78675aceffe # v0.11.2 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - - name: Test - uses: defenseunicorns/uds-common/.github/actions/test@76287d41ec5f06ecbdd0a6453877a78675aceffe # v0.11.2 - with: - flavor: ${{ matrix.flavor }} - type: ${{ matrix.type }} + - name: test-flavor + uses: defenseunicorns/uds-common/.github/actions/test-flavor@d59b1c601730bfa7ab76439643242358e529603e # v1.2.2 + id: test-flavor + outputs: + upgrade-flavors: ${{ steps.test-flavor.outputs.upgrade-flavors }} - - name: Save logs - if: always() - uses: defenseunicorns/uds-common/.github/actions/save-logs@76287d41ec5f06ecbdd0a6453877a78675aceffe # v0.11.2 - 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 + validate: + needs: check-flavor + strategy: + fail-fast: false + matrix: + type: [install, upgrade] + flavor: [upstream, registry1] + uses: defenseunicorns/uds-common/.github/workflows/callable-test.yaml@d59b1c601730bfa7ab76439643242358e529603e # v1.2.2 + with: + 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. diff --git a/tasks.yaml b/tasks.yaml index f8c31a7..b6b2b3b 100644 --- a/tasks.yaml +++ b/tasks.yaml @@ -1,80 +1,93 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial + includes: - - cleanup: ./tasks/cleanup.yaml - dependencies: ./tasks/dependencies.yaml - test: ./tasks/test.yaml - - create: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.11.2/tasks/create.yaml - - lint: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.11.2/tasks/lint.yaml - - pull: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.11.2/tasks/pull.yaml - - deploy: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.11.2/tasks/deploy.yaml - - setup: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.11.2/tasks/setup.yaml + - create: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.2.2/tasks/create.yaml + - lint: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.2.2/tasks/lint.yaml + - pull: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.2.2/tasks/pull.yaml + - deploy: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.2.2/tasks/deploy.yaml + - setup: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.2.2/tasks/setup.yaml + - actions: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.2.2/tasks/actions.yaml + - badge: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.2.2/tasks/badge.yaml + - upgrade: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.2.2/tasks/upgrade.yaml + - compliance: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.2.2/tasks/compliance.yaml + - publish: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.2.2/tasks/publish.yaml tasks: - name: default - description: Create K3D Cluster with UDS-Core + Artifactory + description: Create K3D Cluster with lite UDS-Core + Confluence actions: - - task: create-artifactory-test-bundle + - task: create-dev-package - task: setup:k3d-test-cluster - - task: deploy:test-bundle + - task: create-deploy-test-bundle - name: default-full - description: Create K3D Cluster with UDS-Core + Artifactory + description: Create K3D Cluster with full UDS-Core + Confluence actions: - - task: create-artifactory-test-bundle + - task: create-dev-package - task: setup:k3d-full-cluster - - task: deploy:test-bundle + - task: create-deploy-test-bundle - - name: create-artifactory-package - description: Create UDS Artifactory Package, No dependencies included + - name: create-dev-package + description: Create the Confluence package actions: - task: create:package with: options: "--skip-sbom" - - name: create-artifactory-test-bundle - description: Create a local UDS Artifactory bundle with dependencies + - name: create-deploy-test-bundle + description: Test and validate cluster is deployed with Confluence actions: - - task: create-artifactory-package + - task: create-dev-package - task: dependencies:create - task: create:test-bundle - - - name: create-artifactory-latest-release-bundle - description: Create UDS Artifactory bundle with dependencies based on the latest release - 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 + - task: deploy:test-bundle + - task: setup:create-doug-user + - task: test:all - name: dev - description: Create then deploy local artifactory bundle + description: Create and deploy the bundle on an existing cluster (for iteration/dev speed) actions: - - task: create-artifactory-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 +# CI will execute the following (via uds-common/.github/workflows/callable-test.yaml) so they need to be here with these names - name: test-package - description: Test the Artifactory package from the current branch + description: Test deploying the current branch to a new cluster actions: - - task: create-artifactory-test-bundle + - task: create-dev-package - task: setup:k3d-test-cluster - - task: deploy:test-bundle - - task: test:health-check - - task: test:ingress + - task: create-deploy-test-bundle - name: test-upgrade description: Test an upgrade from the latest released package to the current branch actions: - - task: create-artifactory-latest-release-bundle + - task: upgrade:create-latest-tag-bundle + with: + dep_commands: "./uds run dependencies:create" - task: setup:k3d-test-cluster - task: deploy:test-bundle - - task: create-test-bundle - - task: deploy:test-bundle - - task: test:health-check - - task: test:ingress + - 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: "107.84.17-uds.1" + # x-release-please-end diff --git a/tasks/cleanup.yaml b/tasks/cleanup.yaml deleted file mode 100644 index d6f904e..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 Artifactory Bundle - cmd: ./uds remove ./bundle/uds-bundle-artifactory-test*.tar.zst --confirm --no-progress diff --git a/tasks/publish.yaml b/tasks/publish.yaml deleted file mode 100644 index b0fd472..0000000 --- a/tasks/publish.yaml +++ /dev/null @@ -1,55 +0,0 @@ -includes: - - dependencies: ./dependencies.yaml - - create: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.11.2/tasks/create.yaml - - publish: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.11.2/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: Create the ARM64 package - task: create:package - with: - architecture: arm64 - - - description: Publish the packages - task: publish:package - with: - # x-release-please-start-version - version: "107.84.17-uds.1" - # x-release-please-end - - - name: test-bundle - description: Build and publish the test bundles - actions: - - description: Create the ARM64 deps package - task: dependencies:create - with: - architecture: amd64 - - - description: Create the ARM64 deps package - task: dependencies:create - with: - architecture: arm64 - - - description: Create the AMD64 bundle - task: create:test-bundle - with: - architecture: amd64 - - - description: Create the ARM64 bundle - task: create:test-bundle - with: - architecture: arm64 - - - description: Publish the bundles - task: publish:test-bundle - with: - # x-release-please-start-version - version: "107.84.17-uds.1" - # x-release-please-end diff --git a/tasks/test.yaml b/tasks/test.yaml index eac4a06..56fb7c6 100644 --- a/tasks/test.yaml +++ b/tasks/test.yaml @@ -22,6 +22,7 @@ tasks: - task: test:health-check - task: test:ingress - task: test:credentials + - task: test:install-playwright-deps - task: test:ui - name: ui From 84a8aa54dac833fa26e1edc6f32fd2be1d7043a5 Mon Sep 17 00:00:00 2001 From: Michael-Kruggel Date: Tue, 29 Oct 2024 19:32:45 +0000 Subject: [PATCH 02/11] feat: update to chart version 107.98.7 --- bundle/uds-bundle.yaml | 2 +- common/zarf.yaml | 2 +- values/registry1.yaml | 4 ++-- zarf.yaml | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bundle/uds-bundle.yaml b/bundle/uds-bundle.yaml index a12f9aa..78aa69c 100644 --- a/bundle/uds-bundle.yaml +++ b/bundle/uds-bundle.yaml @@ -13,7 +13,7 @@ packages: - name: postgres-operator repository: ghcr.io/defenseunicorns/packages/uds/postgres-operator - ref: 1.10.1-uds.4-upstream + ref: 1.13.0-uds.3-upstream overrides: postgres-operator: uds-postgres-config: diff --git a/common/zarf.yaml b/common/zarf.yaml index 86f265e..519ddf6 100644 --- a/common/zarf.yaml +++ b/common/zarf.yaml @@ -16,7 +16,7 @@ components: - name: artifactory namespace: artifactory url: https://charts.jfrog.io - version: 107.84.17 + version: 107.98.7 repoName: artifactory releaseName: artifactory valuesFiles: diff --git a/values/registry1.yaml b/values/registry1.yaml index 03954bf..a4ac3cf 100644 --- a/values/registry1.yaml +++ b/values/registry1.yaml @@ -11,11 +11,11 @@ artifactory: image: registry: registry1.dso.mil repository: ironbank/jfrog/artifactory/artifactory - tag: 7.84.14 + tag: 7.90.15 router: name: router image: registry: registry1.dso.mil repository: ironbank/jfrog/jfrog-xray/router - tag: 7.108.0 + tag: 7.124.1 installerInfo: '{"productId":"ironbank_helm_artifactory-pro/10.14.4","features":[{"featureId":"Partner/ACC-013116"}]}' diff --git a/zarf.yaml b/zarf.yaml index 00c0d9f..5cb27cc 100644 --- a/zarf.yaml +++ b/zarf.yaml @@ -26,6 +26,6 @@ components: valuesFiles: - values/registry1.yaml images: - - registry1.dso.mil/ironbank/jfrog/artifactory/artifactory:7.84.14 - - registry1.dso.mil/ironbank/jfrog/jfrog-xray/router:7.108.0 + - registry1.dso.mil/ironbank/jfrog/artifactory/artifactory:7.90.15 + - registry1.dso.mil/ironbank/jfrog/jfrog-xray/router:7.124.1 - registry1.dso.mil/ironbank/redhat/ubi/ubi9-minimal:9.4 From 02820ed4fa3f58f57e7cb49373c3dc245340e648 Mon Sep 17 00:00:00 2001 From: Michael-Kruggel Date: Tue, 29 Oct 2024 19:35:33 +0000 Subject: [PATCH 03/11] wip: wip --- .pre-commit-config.yaml | 3 +++ LICENSE => LICENSE.md | 0 LICENSING.md | 18 ++++++++++++++++++ bundle/uds-bundle.yaml | 3 +++ bundle/uds-config.yaml | 3 +++ chart/Chart.yaml | 3 +++ chart/templates/admin-secret.yaml | 3 +++ chart/templates/serviceMonitor.yaml | 3 +++ chart/templates/uds-package.yaml | 3 +++ chart/values.yaml | 3 +++ commitlint.config.js | 5 +++++ common/zarf.yaml | 3 +++ src/dev-secrets/postgres-secret.yaml | 3 +++ src/dev-secrets/zarf.yaml | 3 +++ src/namespace/artifactory-ns.yaml | 3 +++ src/namespace/zarf.yaml | 3 +++ tasks/dependencies.yaml | 3 +++ tasks/test.yaml | 3 +++ tests/auth.setup.ts | 5 +++++ tests/playwright.config.ts | 5 +++++ values/common.yaml | 3 +++ values/registry1.yaml | 3 +++ zarf.yaml | 3 +++ 23 files changed, 87 insertions(+) rename LICENSE => LICENSE.md (100%) create mode 100644 LICENSING.md diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 7c2d82c..d464d50 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/LICENSE b/LICENSE.md similarity index 100% rename from LICENSE rename to LICENSE.md diff --git a/LICENSING.md b/LICENSING.md new file mode 100644 index 0000000..a439b77 --- /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. diff --git a/bundle/uds-bundle.yaml b/bundle/uds-bundle.yaml index 78aa69c..4a72ebc 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: artifactory-test diff --git a/bundle/uds-config.yaml b/bundle/uds-config.yaml index 56481a4..519b0f3 100644 --- a/bundle/uds-config.yaml +++ b/bundle/uds-config.yaml @@ -1,3 +1,6 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial + variables: artifactory: ARTIFACTORY_DB_ENDPOINT: "pg-cluster.postgres.svc.cluster.local" diff --git a/chart/Chart.yaml b/chart/Chart.yaml index 2511021..e08df6c 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-artifactory-config diff --git a/chart/templates/admin-secret.yaml b/chart/templates/admin-secret.yaml index 08701ac..d0d66df 100644 --- a/chart/templates/admin-secret.yaml +++ b/chart/templates/admin-secret.yaml @@ -1,3 +1,6 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial + apiVersion: v1 kind: Secret metadata: diff --git a/chart/templates/serviceMonitor.yaml b/chart/templates/serviceMonitor.yaml index 17c47d9..b76f2b7 100644 --- a/chart/templates/serviceMonitor.yaml +++ b/chart/templates/serviceMonitor.yaml @@ -1,3 +1,6 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial + apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: diff --git a/chart/templates/uds-package.yaml b/chart/templates/uds-package.yaml index bf94844..69d634c 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/chart/values.yaml b/chart/values.yaml index af65663..5d86441 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/commitlint.config.js b/commitlint.config.js index 5073c20..19e9f20 100644 --- a/commitlint.config.js +++ b/commitlint.config.js @@ -1 +1,6 @@ +/** + * Copyright 2024 Defense Unicorns + * SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial + */ + module.exports = { extends: ["@commitlint/config-conventional"] }; diff --git a/common/zarf.yaml b/common/zarf.yaml index 519ddf6..1f4038c 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/src/dev-secrets/postgres-secret.yaml b/src/dev-secrets/postgres-secret.yaml index da4add8..0902df2 100644 --- a/src/dev-secrets/postgres-secret.yaml +++ b/src/dev-secrets/postgres-secret.yaml @@ -1,3 +1,6 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial + apiVersion: v1 kind: Secret metadata: diff --git a/src/dev-secrets/zarf.yaml b/src/dev-secrets/zarf.yaml index f4fadc1..90df553 100644 --- a/src/dev-secrets/zarf.yaml +++ b/src/dev-secrets/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/src/namespace/artifactory-ns.yaml b/src/namespace/artifactory-ns.yaml index 19880da..5f470b9 100644 --- a/src/namespace/artifactory-ns.yaml +++ b/src/namespace/artifactory-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 c2ae6de..ab8e941 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/dependencies.yaml b/tasks/dependencies.yaml index 8c8d8fb..8a4325e 100644 --- a/tasks/dependencies.yaml +++ b/tasks/dependencies.yaml @@ -1,3 +1,6 @@ +# 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 diff --git a/tasks/test.yaml b/tasks/test.yaml index 56fb7c6..00aa297 100644 --- a/tasks/test.yaml +++ b/tasks/test.yaml @@ -1,3 +1,6 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial + tasks: - name: health-check actions: diff --git a/tests/auth.setup.ts b/tests/auth.setup.ts index 9f2bf37..995a321 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 dotenv from 'dotenv'; diff --git a/tests/playwright.config.ts b/tests/playwright.config.ts index fc10679..afe1ff4 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'; diff --git a/values/common.yaml b/values/common.yaml index 1a261b6..1b0577e 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 + artifactory: admin: secret: artifactory-admin-credentials diff --git a/values/registry1.yaml b/values/registry1.yaml index a4ac3cf..2c0a4cd 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 + global: imagePullSecrets: - name: private-registry diff --git a/zarf.yaml b/zarf.yaml index 5cb27cc..5e05f77 100644 --- a/zarf.yaml +++ b/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: From 689e12384c4f9b5e3feb9b904a35a275bfb4590d Mon Sep 17 00:00:00 2001 From: Michael-Kruggel Date: Tue, 29 Oct 2024 19:40:14 +0000 Subject: [PATCH 04/11] wip: wip --- .github/workflows/ci-docs-shim.yaml | 2 +- .github/workflows/release.yaml | 2 +- .github/workflows/test.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci-docs-shim.yaml b/.github/workflows/ci-docs-shim.yaml index 6110e02..16c9b96 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, registry1] + flavor: [registry1] uses: defenseunicorns/uds-common/.github/workflows/callable-ci-docs-shim.yaml@d59b1c601730bfa7ab76439643242358e529603e # v1.2.2 with: flavor: ${{ matrix.flavor }} diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 60b00a1..d989b55 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, registry1] + flavor: [registry1] architecture: [amd64] uses: defenseunicorns/uds-common/.github/workflows/callable-publish.yaml@d59b1c601730bfa7ab76439643242358e529603e # v1.2.2 with: diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index fe0fa8d..d89a294 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -55,7 +55,7 @@ jobs: fail-fast: false matrix: type: [install, upgrade] - flavor: [upstream, registry1] + flavor: [registry1] uses: defenseunicorns/uds-common/.github/workflows/callable-test.yaml@d59b1c601730bfa7ab76439643242358e529603e # v1.2.2 with: runsOn: uds-marketplace-ubuntu-big-boy-8-core From 8b88570b12139fdd0418c4e8b13ef4551c8dfeea Mon Sep 17 00:00:00 2001 From: Michael-Kruggel Date: Tue, 29 Oct 2024 19:43:20 +0000 Subject: [PATCH 05/11] wip: wip --- release-please-config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release-please-config.json b/release-please-config.json index 1064e8f..b883dd5 100644 --- a/release-please-config.json +++ b/release-please-config.json @@ -15,7 +15,7 @@ "prerelease-type": "uds", "extra-files": [ "bundle/uds-bundle.yaml", - "tasks/publish.yaml", + "tasks.yaml", "zarf.yaml" ] } From 325f8375f7687427691365a50fd4c77954735cf5 Mon Sep 17 00:00:00 2001 From: Michael-Kruggel Date: Tue, 29 Oct 2024 22:13:57 +0000 Subject: [PATCH 06/11] wip: wip --- bundle/uds-bundle.yaml | 19 +++++++++++++++---- src/dev-secrets/postgres-secret.yaml | 2 +- src/dev-secrets/zarf.yaml | 2 +- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/bundle/uds-bundle.yaml b/bundle/uds-bundle.yaml index 4a72ebc..da82a07 100644 --- a/bundle/uds-bundle.yaml +++ b/bundle/uds-bundle.yaml @@ -20,10 +20,21 @@ packages: overrides: postgres-operator: uds-postgres-config: - variables: - - name: POSTGRESQL - description: "Configure postgres using CRs via the uds-postgres-config chart" - path: postgresql + values: + - path: postgresql + value: + enabled: true # Set to false to not create the PostgreSQL resource + teamId: "uds" + volume: + size: "10Gi" + numberOfInstances: 2 + users: + artifactory.artifactory: [] # database owner + databases: + artifactorydb: artifactory.artifactory + version: "16" + ingress: + - remoteNamespace: artifactory - name: dev-secrets path: ../ diff --git a/src/dev-secrets/postgres-secret.yaml b/src/dev-secrets/postgres-secret.yaml index 0902df2..0a6e901 100644 --- a/src/dev-secrets/postgres-secret.yaml +++ b/src/dev-secrets/postgres-secret.yaml @@ -8,6 +8,6 @@ metadata: namespace: artifactory type: kubernetes.io/opaque stringData: - password: "###ZARF_VAR_POSTGRES_DB_PASSWORD###" + password: "###ZARF_VAR_ARTIFACTORY_DB_PASSWORD###" url: "jdbc:postgresql://###ZARF_VAR_ARTIFACTORY_DB_ENDPOINT###:5432/###ZARF_VAR_ARTIFACTORY_DB_NAME###?sslfactory=org.postgresql.ssl.NonValidatingFactory&sslmode=require" user: "###ZARF_VAR_ARTIFACTORY_DB_USERNAME###" diff --git a/src/dev-secrets/zarf.yaml b/src/dev-secrets/zarf.yaml index 90df553..f4f6334 100644 --- a/src/dev-secrets/zarf.yaml +++ b/src/dev-secrets/zarf.yaml @@ -23,7 +23,7 @@ components: - cmd: kubectl get secret -n artifactory artifactory.artifactory.pg-cluster.credentials.postgresql.acid.zalan.do --template={{.data.password}} | base64 -d mute: true setVariables: - - name: POSTGRES_DB_PASSWORD + - name: ARTIFACTORY_DB_PASSWORD sensitive: true - name: artifactory-postgres required: true From 36ff931cdff900045c61bbdde32603713cf06330 Mon Sep 17 00:00:00 2001 From: Michael-Kruggel Date: Tue, 29 Oct 2024 22:28:55 +0000 Subject: [PATCH 07/11] wip: wip --- bundle/uds-bundle.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundle/uds-bundle.yaml b/bundle/uds-bundle.yaml index da82a07..0000909 100644 --- a/bundle/uds-bundle.yaml +++ b/bundle/uds-bundle.yaml @@ -16,7 +16,7 @@ packages: - name: postgres-operator repository: ghcr.io/defenseunicorns/packages/uds/postgres-operator - ref: 1.13.0-uds.3-upstream + ref: 1.13.0-uds.2-upstream overrides: postgres-operator: uds-postgres-config: From 3ece7399464afa42b7560019db65424f6dca9d69 Mon Sep 17 00:00:00 2001 From: Michael-Kruggel Date: Tue, 29 Oct 2024 23:08:49 +0000 Subject: [PATCH 08/11] wip: removing upgrade test because it requires a license --- .github/workflows/ci-docs-shim.yaml | 2 +- .github/workflows/test.yaml | 2 +- bundle/uds-bundle.yaml | 2 +- values/common.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci-docs-shim.yaml b/.github/workflows/ci-docs-shim.yaml index 16c9b96..e71a09c 100644 --- a/.github/workflows/ci-docs-shim.yaml +++ b/.github/workflows/ci-docs-shim.yaml @@ -12,7 +12,7 @@ jobs: validate: strategy: matrix: - type: [install, upgrade] + type: [install] flavor: [registry1] uses: defenseunicorns/uds-common/.github/workflows/callable-ci-docs-shim.yaml@d59b1c601730bfa7ab76439643242358e529603e # v1.2.2 with: diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index d89a294..5149268 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -54,7 +54,7 @@ jobs: strategy: fail-fast: false matrix: - type: [install, upgrade] + type: [install] flavor: [registry1] uses: defenseunicorns/uds-common/.github/workflows/callable-test.yaml@d59b1c601730bfa7ab76439643242358e529603e # v1.2.2 with: diff --git a/bundle/uds-bundle.yaml b/bundle/uds-bundle.yaml index 0000909..da82a07 100644 --- a/bundle/uds-bundle.yaml +++ b/bundle/uds-bundle.yaml @@ -16,7 +16,7 @@ packages: - name: postgres-operator repository: ghcr.io/defenseunicorns/packages/uds/postgres-operator - ref: 1.13.0-uds.2-upstream + ref: 1.13.0-uds.3-upstream overrides: postgres-operator: uds-postgres-config: diff --git a/values/common.yaml b/values/common.yaml index 1b0577e..ebb375f 100644 --- a/values/common.yaml +++ b/values/common.yaml @@ -5,7 +5,7 @@ artifactory: admin: secret: artifactory-admin-credentials dataKey: adminCreds - openMetrics: + metrics: enabled: true database: type: postgresql From d3a2a9ad8e3c1bdbba7413ffacb45152f4dcb59d Mon Sep 17 00:00:00 2001 From: Michael-Kruggel Date: Wed, 30 Oct 2024 18:14:51 +0000 Subject: [PATCH 09/11] wip: delete unneeded file --- .../workflows/pull-request-conditionals.yaml | 33 ------------------- 1 file changed, 33 deletions(-) delete mode 100644 .github/workflows/pull-request-conditionals.yaml diff --git a/.github/workflows/pull-request-conditionals.yaml b/.github/workflows/pull-request-conditionals.yaml deleted file mode 100644 index 43972e1..0000000 --- a/.github/workflows/pull-request-conditionals.yaml +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 2024 Defense Unicorns -# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial - -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 df2b5db987c7dd670c78f3698e19e0632d5ad09b Mon Sep 17 00:00:00 2001 From: Michael Kruggel <108417058+Michael-Kruggel@users.noreply.github.com> Date: Fri, 1 Nov 2024 11:11:09 -0600 Subject: [PATCH 10/11] Discard changes to LICENSE.md --- LICENSE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE.md b/LICENSE.md index 0ad25db..29ebfa5 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -658,4 +658,4 @@ 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 From 260e6f03d7e251e89405d4c56c2cade87abb4883 Mon Sep 17 00:00:00 2001 From: Michael Kruggel <108417058+Michael-Kruggel@users.noreply.github.com> Date: Fri, 1 Nov 2024 11:11:12 -0600 Subject: [PATCH 11/11] Discard changes to LICENSING.md --- LICENSING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSING.md b/LICENSING.md index a439b77..29166a4 100644 --- a/LICENSING.md +++ b/LICENSING.md @@ -15,4 +15,4 @@ 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. +agreement supplant and supersede the terms of the AGPL v3 license. \ No newline at end of file