From 64dd3a231067592860016da3709a5f82231c1558 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 29 May 2024 21:01:05 +0000 Subject: [PATCH 1/2] chore(deps): update swf bundle dependencies | datasource | package | from | to | | ----------- | -------------------------------------------------- | ------- | ------- | | github-tags | actions/checkout | v4.1.5 | v4.1.6 | | github-tags | defenseunicorns/uds-cli | v0.10.4 | v0.11.0 | | github-tags | defenseunicorns/uds-common | v0.4.2 | v0.4.4 | | github-tags | defenseunicorns/uds-core | 0.21.1 | 0.22.0 | | docker | ghcr.io/defenseunicorns/packages/init | v0.33.1 | v0.34.0 | | docker | ghcr.io/defenseunicorns/packages/uds-k3d | 0.6.0 | 0.7.0 | | docker | ghcr.io/defenseunicorns/packages/uds/core | 0.21.1 | 0.22.0 | | docker | ghcr.io/defenseunicorns/packages/uds/gitlab | 16.11.1 | 17.0.1 | | docker | ghcr.io/defenseunicorns/packages/uds/gitlab-runner | 16.11.0 | 17.0.0 | | docker | ghcr.io/defenseunicorns/packages/uds/sonarqube | 9.9.2 | 9.9.5 | | github-tags | github/codeql-action | v3.25.4 | v3.25.6 | | github-tags | google-github-actions/release-please-action | v4.1.0 | v4.1.1 | | github-tags | ossf/scorecard-action | v2.3.1 | v2.3.3 | --- .github/workflows/commitlint.yaml | 2 +- .github/workflows/lint.yaml | 4 ++-- .github/workflows/scorecard.yaml | 6 +++--- .github/workflows/tag-and-release.yaml | 10 +++++----- .github/workflows/test.yaml | 8 ++++---- .vscode/settings.json | 6 +++--- README.md | 2 +- bundles/dev/uds-bundle.yaml | 6 +++--- bundles/k3d-demo/uds-bundle.yaml | 12 ++++++------ tasks.yaml | 10 +++++----- tasks/publish.yaml | 4 ++-- 11 files changed, 35 insertions(+), 35 deletions(-) diff --git a/.github/workflows/commitlint.yaml b/.github/workflows/commitlint.yaml index 00b949b..535b040 100644 --- a/.github/workflows/commitlint.yaml +++ b/.github/workflows/commitlint.yaml @@ -10,4 +10,4 @@ on: jobs: validate: name: Validate - uses: defenseunicorns/uds-common/.github/workflows/commitlint.yaml@b2e8b25930c953ef893e7c787fe350f0d8679ee2 # v0.4.2 + uses: defenseunicorns/uds-common/.github/workflows/commitlint.yaml@6e6f60bef00842dffbde8409b466256e5a478e78 # v0.4.4 diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index b63d8de..1e61289 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -15,12 +15,12 @@ jobs: steps: - name: Checkout - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 + uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 with: fetch-depth: 0 - name: Environment setup - uses: defenseunicorns/uds-common/.github/actions/setup@b2e8b25930c953ef893e7c787fe350f0d8679ee2 # v0.4.2 + uses: defenseunicorns/uds-common/.github/actions/setup@6e6f60bef00842dffbde8409b466256e5a478e78 # v0.4.4 with: registry1Username: ${{ secrets.IRON_BANK_ROBOT_USERNAME }} registry1Password: ${{ secrets.IRON_BANK_ROBOT_PASSWORD }} diff --git a/.github/workflows/scorecard.yaml b/.github/workflows/scorecard.yaml index 70a7596..c0bf00c 100644 --- a/.github/workflows/scorecard.yaml +++ b/.github/workflows/scorecard.yaml @@ -22,12 +22,12 @@ jobs: steps: - name: "Checkout code" - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 + uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 with: persist-credentials: false - name: "Run analysis" - uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # v2.3.1 + uses: ossf/scorecard-action@dc50aa9510b46c811795eb24b2f1ba02a914e534 # v2.3.3 with: results_file: results.sarif results_format: sarif @@ -45,6 +45,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard. - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@ccf74c947955fd1cf117aef6a0e4e66191ef6f61 # v3.25.4 + uses: github/codeql-action/upload-sarif@9fdb3e49720b44c48891d036bb502feb25684276 # v3.25.6 with: sarif_file: results.sarif diff --git a/.github/workflows/tag-and-release.yaml b/.github/workflows/tag-and-release.yaml index f21272c..21ad071 100644 --- a/.github/workflows/tag-and-release.yaml +++ b/.github/workflows/tag-and-release.yaml @@ -18,7 +18,7 @@ jobs: steps: - name: Create release tag id: tag - uses: google-github-actions/release-please-action@a37ac6e4f6449ce8b3f7607e4d97d0146028dc0b # v4.1.0 + 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 @@ -37,17 +37,17 @@ jobs: packages: write steps: - - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 + - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 - name: Environment setup - uses: defenseunicorns/uds-common/.github/actions/setup@b2e8b25930c953ef893e7c787fe350f0d8679ee2 # v0.4.2 + uses: defenseunicorns/uds-common/.github/actions/setup@6e6f60bef00842dffbde8409b466256e5a478e78 # v0.4.4 with: registry1Username: ${{ secrets.IRON_BANK_ROBOT_USERNAME }} registry1Password: ${{ secrets.IRON_BANK_ROBOT_PASSWORD }} ghToken: ${{ secrets.GITHUB_TOKEN }} - name: Login to GHCR - uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v3 + uses: docker/login-action@0d4c9c5ea7693da7b068278f7b52bda2a190a446 # v3 with: registry: ghcr.io username: dummy @@ -58,6 +58,6 @@ jobs: - name: Save logs if: always() - uses: defenseunicorns/uds-common/.github/actions/save-logs@b2e8b25930c953ef893e7c787fe350f0d8679ee2 # v0.4.2 + uses: defenseunicorns/uds-common/.github/actions/save-logs@6e6f60bef00842dffbde8409b466256e5a478e78 # v0.4.4 with: suffix: '${{ matrix.bundle }}-${{ matrix.flavor }}-${{ github.run_id }}-${{ github.run_attempt }}' diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 8a5d7e6..5ee3f0e 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -47,17 +47,17 @@ jobs: flavor: upstream steps: - name: Checkout repository - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 + uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 - name: Environment setup - uses: defenseunicorns/uds-common/.github/actions/setup@b2e8b25930c953ef893e7c787fe350f0d8679ee2 # v0.4.2 + uses: defenseunicorns/uds-common/.github/actions/setup@6e6f60bef00842dffbde8409b466256e5a478e78 # v0.4.4 with: registry1Username: ${{ secrets.IRON_BANK_ROBOT_USERNAME }} registry1Password: ${{ secrets.IRON_BANK_ROBOT_PASSWORD }} ghToken: ${{ secrets.GITHUB_TOKEN }} - name: Test - uses: defenseunicorns/uds-common/.github/actions/test@b2e8b25930c953ef893e7c787fe350f0d8679ee2 # v0.4.2 + uses: defenseunicorns/uds-common/.github/actions/test@6e6f60bef00842dffbde8409b466256e5a478e78 # v0.4.4 with: flavor: ${{ matrix.flavor }} type: ${{ matrix.type }} @@ -65,6 +65,6 @@ jobs: - name: Save logs if: always() - uses: defenseunicorns/uds-common/.github/actions/save-logs@b2e8b25930c953ef893e7c787fe350f0d8679ee2 # v0.4.2 + uses: defenseunicorns/uds-common/.github/actions/save-logs@6e6f60bef00842dffbde8409b466256e5a478e78 # v0.4.4 with: suffix: ${{ matrix.type }}-${{ matrix.bundle }}-${{ matrix.flavor }}-${{ github.run_id }}-${{ github.run_attempt }} diff --git a/.vscode/settings.json b/.vscode/settings.json index 0ff5ab7..3f7154f 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,15 +1,15 @@ { "yaml.schemas": { - "https://raw.githubusercontent.com/defenseunicorns/uds-cli/v0.10.4/uds.schema.json": [ + "https://raw.githubusercontent.com/defenseunicorns/uds-cli/v0.11.0/uds.schema.json": [ "**/uds-bundle.yaml" ], - "https://raw.githubusercontent.com/defenseunicorns/uds-cli/v0.10.4/tasks.schema.json": [ + "https://raw.githubusercontent.com/defenseunicorns/uds-cli/v0.11.0/tasks.schema.json": [ "tasks.yaml", "tasks/**/*.yaml", "src/**/validate.yaml" ], - "https://raw.githubusercontent.com/defenseunicorns/uds-cli/v0.10.4/zarf.schema.json": [ + "https://raw.githubusercontent.com/defenseunicorns/uds-cli/v0.11.0/zarf.schema.json": [ "**zarf.yaml" ] }, diff --git a/README.md b/README.md index 4d36ed0..c0e235a 100644 --- a/README.md +++ b/README.md @@ -76,7 +76,7 @@ Alternatively, you can deploy from OCI by running the following two commands: 1. Run the below command to deploy the `k3d-core-slim-dev` bundle: ```bash - uds deploy k3d-core-slim-dev:0.21.1 + uds deploy k3d-core-slim-dev:0.22.0 ``` 1. Run the below command to deploy the `swf-dev` bundle on top of the dev cluster: diff --git a/bundles/dev/uds-bundle.yaml b/bundles/dev/uds-bundle.yaml index 9e5a0db..5e06705 100644 --- a/bundles/dev/uds-bundle.yaml +++ b/bundles/dev/uds-bundle.yaml @@ -93,7 +93,7 @@ packages: - name: gitlab repository: ghcr.io/defenseunicorns/packages/uds/gitlab - ref: 16.11.1-uds.1-upstream + ref: 17.0.1-uds.1-upstream overrides: gitlab: uds-gitlab-config: @@ -202,11 +202,11 @@ packages: - name: gitlab-runner repository: ghcr.io/defenseunicorns/packages/uds/gitlab-runner - ref: 16.11.0-uds.0-upstream + ref: 17.0.0-uds.0-upstream - name: sonarqube repository: ghcr.io/defenseunicorns/packages/uds/sonarqube - ref: 9.9.2-uds.0-upstream + ref: 9.9.5-uds.0-upstream overrides: sonarqube: sonarqube: diff --git a/bundles/k3d-demo/uds-bundle.yaml b/bundles/k3d-demo/uds-bundle.yaml index 6fe650e..f448817 100644 --- a/bundles/k3d-demo/uds-bundle.yaml +++ b/bundles/k3d-demo/uds-bundle.yaml @@ -9,15 +9,15 @@ metadata: packages: - name: uds-k3d-dev repository: ghcr.io/defenseunicorns/packages/uds-k3d - ref: 0.6.0 + ref: 0.7.0 - name: init repository: ghcr.io/defenseunicorns/packages/init - ref: v0.33.1 + ref: v0.34.0 - name: uds-core #for now repository: ghcr.io/defenseunicorns/packages/uds/core - ref: "0.21.1-upstream" + ref: "0.22.0-upstream" - name: dev-minio repository: ghcr.io/defenseunicorns/packages/uds/dev-minio @@ -83,7 +83,7 @@ packages: - name: gitlab repository: ghcr.io/defenseunicorns/packages/uds/gitlab - ref: 16.11.1-uds.1-upstream + ref: 17.0.1-uds.1-upstream overrides: gitlab: uds-gitlab-config: @@ -192,11 +192,11 @@ packages: - name: gitlab-runner repository: ghcr.io/defenseunicorns/packages/uds/gitlab-runner - ref: 16.11.0-uds.0-upstream + ref: 17.0.0-uds.0-upstream - name: sonarqube repository: ghcr.io/defenseunicorns/packages/uds/sonarqube - ref: 9.9.2-uds.0-upstream + ref: 9.9.5-uds.0-upstream overrides: sonarqube: sonarqube: diff --git a/tasks.yaml b/tasks.yaml index 1aeb6c4..9da690f 100644 --- a/tasks.yaml +++ b/tasks.yaml @@ -1,9 +1,9 @@ includes: - - create: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.4.2/tasks/create.yaml - - lint: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.4.2/tasks/lint.yaml - - pull: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.4.2/tasks/pull.yaml - - deploy: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.4.2/tasks/deploy.yaml - - setup: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.4.2/tasks/setup.yaml + - create: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.4.4/tasks/create.yaml + - lint: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.4.4/tasks/lint.yaml + - pull: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.4.4/tasks/pull.yaml + - deploy: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.4.4/tasks/deploy.yaml + - setup: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.4.4/tasks/setup.yaml - dependencies: ./tasks/dependencies.yaml - test: ./tasks/test.yaml diff --git a/tasks/publish.yaml b/tasks/publish.yaml index 1173d6b..299ed6e 100644 --- a/tasks/publish.yaml +++ b/tasks/publish.yaml @@ -1,7 +1,7 @@ includes: - dependencies: ./dependencies.yaml - - create: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.4.2/tasks/create.yaml - - publish: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.4.2/tasks/publish.yaml + - create: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.4.4/tasks/create.yaml + - publish: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.4.4/tasks/publish.yaml tasks: - name: test-bundle From 779e7b093370cc8095404a7007922706d51faa78 Mon Sep 17 00:00:00 2001 From: Wayne Starr Date: Wed, 29 May 2024 16:34:50 -0600 Subject: [PATCH 2/2] add debug workflow and cleanup some deps / README wording --- .github/workflows/test.yaml | 4 ++++ .vscode/settings.json | 6 +++--- README.md | 32 +++++++++++++++++++++----------- renovate.json | 9 +++++++++ 4 files changed, 37 insertions(+), 14 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 5ee3f0e..e441dff 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -63,6 +63,10 @@ jobs: type: ${{ matrix.type }} options: "--set BUNDLE_PATH=bundles/${{ matrix.bundle }}" + - name: Debug Output + if: ${{ always() }} + uses: defenseunicorns/uds-common/.github/actions/debug-output@6e6f60bef00842dffbde8409b466256e5a478e78 # v0.4.4 + - name: Save logs if: always() uses: defenseunicorns/uds-common/.github/actions/save-logs@6e6f60bef00842dffbde8409b466256e5a478e78 # v0.4.4 diff --git a/.vscode/settings.json b/.vscode/settings.json index 3f7154f..0ff5ab7 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,15 +1,15 @@ { "yaml.schemas": { - "https://raw.githubusercontent.com/defenseunicorns/uds-cli/v0.11.0/uds.schema.json": [ + "https://raw.githubusercontent.com/defenseunicorns/uds-cli/v0.10.4/uds.schema.json": [ "**/uds-bundle.yaml" ], - "https://raw.githubusercontent.com/defenseunicorns/uds-cli/v0.11.0/tasks.schema.json": [ + "https://raw.githubusercontent.com/defenseunicorns/uds-cli/v0.10.4/tasks.schema.json": [ "tasks.yaml", "tasks/**/*.yaml", "src/**/validate.yaml" ], - "https://raw.githubusercontent.com/defenseunicorns/uds-cli/v0.11.0/zarf.schema.json": [ + "https://raw.githubusercontent.com/defenseunicorns/uds-cli/v0.10.4/zarf.schema.json": [ "**zarf.yaml" ] }, diff --git a/README.md b/README.md index c0e235a..10def99 100644 --- a/README.md +++ b/README.md @@ -14,12 +14,12 @@ Also note that the Software Factory team helps to manage the following shared UD - [Postgres Operator](https://github.com/defenseunicorns/uds-package-postgres-operator) - a Kubernetes operator to deploy PostgreSQL databases in a cluster - [UDS Common](https://github.com/defenseunicorns/uds-common) - a common repo to share actions, UDS tasks and more between package repositories -### tl;dr - [try it now](#quickstart) +### tl;dr - [try it now](#quickstart-demo-bundle) ## Bundles > [!NOTE] -> These UDS Bundles are intended for dev and test environments and should not be used for production. They also serve as examples to create custom bundles. +> These UDS Bundles are intended for dev and test environments and should not be used for production. They can however serve as examples to create custom bundles. This repository publishes multiple bundles for dev, test and demo purposes. They are located in sub-directories under `bundles`. @@ -37,17 +37,18 @@ This is a fairly large bundle and requires `16 CPUs and 64GB of memory` availabl --- -### Quickstart, Dev & Test Environments +### Quickstart (Demo Bundle) + +If you have the resources for it locally (see above), you can deploy the full Software Factory with full `uds-core` and `k3d` using the [uds-k3d-swf-demo bundle](./bundles/k3d-demo/README.md). #### Prerequisites -- [K3D](https://k3d.io/) for dev & test environments or any [CNCF Certified Kubernetes Cluster](https://www.cncf.io/training/certification/software-conformance/#logos) for production environments. - -- [UDS CLI](https://github.com/defenseunicorns/uds-cli?tab=readme-ov-file#install) v0.10.2 or later +- [Docker Compatible Runtime](https://docs.docker.com/engine/) necessary for running `k3d`. +- [UDS CLI](https://github.com/defenseunicorns/uds-cli?tab=readme-ov-file#install) v0.10.4 or later -#### Quickstart +> [!NOTE]: Apple users follow these [instructions](./docs/development.md) to properly set up your environment to deploy this bundle. -If you want to try out UDS Software Factory, you can use the [uds-k3d-swf-demo bundle](./bundles/k3d-demo/README.md) to create a local k3d cluster with full UDS Core and Software Factory installed. Note the [requirements](#k3d-swf-demo) mentioned above. +#### Deployment To deploy this bundle run the following command: @@ -59,11 +60,20 @@ uds deploy k3d-swf-demo:0.2.0 -Alternatively, you can deploy the [uds-k3d-swf-dev bundle](./bundles/dev/README.md), which is meant to be deployed on top of [k3d-core-slim-dev](https://github.com/defenseunicorns/uds-core/blob/main/bundles/k3d-slim-dev/README.md). This bundle includes all of Software Factory, but only utilizes part of the underlying uds-core baseline. This allows it to be run on a wider variety of hardware, particularly with local development in mind. +### Quickstart (Dev Bundle) + +Alternatively, you can deploy the [uds-k3d-swf-dev bundle](./bundles/dev/README.md), which is meant to be deployed on top of [k3d-core-slim-dev](https://github.com/defenseunicorns/uds-core/blob/main/bundles/k3d-slim-dev/README.md). This bundle includes all of Software Factory, but only utilizes part of the underlying `uds-core` baseline. This allows it to be run on a wider variety of hardware, particularly with local development in mind. + +#### Prerequisites + +- [K3D](https://k3d.io/) for dev & test environments or any [CNCF Certified Kubernetes Cluster](https://www.cncf.io/training/certification/software-conformance/#logos) for production environments. +- [UDS CLI](https://github.com/defenseunicorns/uds-cli?tab=readme-ov-file#install) v0.10.4 or later > [!NOTE]: Apple users follow these [instructions](./docs/development.md) to properly set up your environment to deploy this bundle. -When `swf-dev` you can have two options, build and deploy from source or deploy the artifacts from where they are hosted in the ghcr OCI registry. +#### Deployment + +For `swf-dev` you have two options, build and deploy from source or deploy the artifacts from where they are hosted in the ghcr OCI registry. To build and deploy from source you can utilize the UDS tasks in this repo by running: @@ -85,4 +95,4 @@ Alternatively, you can deploy from OCI by running the following two commands: ```bash uds deploy swf-dev:0.2.0 ``` - \ No newline at end of file + diff --git a/renovate.json b/renovate.json index ca8b7ba..579d887 100644 --- a/renovate.json +++ b/renovate.json @@ -31,6 +31,15 @@ ], "datasourceTemplate": "github-tags", "extractVersionTemplate": "^v(?.*)$" + }, + { + "depNameTemplate": "defenseunicorns/uds-cli", + "fileMatch": ["README\\.md"], + "matchStrings": [ + "UDS CLI[^\\s]*(?[^\\s]*)" + ], + "datasourceTemplate": "github-tags", + "extractVersionTemplate": "^v(?.*)$" } ] }