Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): update swf bundle dependencies #3

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/commitlint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ on:
jobs:
validate:
name: Validate
uses: defenseunicorns/uds-common/.github/workflows/commitlint.yaml@172a905901cb9bd76d096d2850bf31af5c5a4fa1 # v0.8.0
uses: defenseunicorns/uds-common/.github/workflows/commitlint.yaml@f0164622ffc2007e96a0e1deaa3f5064db04b148 # v1.1.0
4 changes: 2 additions & 2 deletions .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
with:
fetch-depth: 0

- name: Environment setup
uses: defenseunicorns/uds-common/.github/actions/setup@172a905901cb9bd76d096d2850bf31af5c5a4fa1 # v0.8.0
uses: defenseunicorns/uds-common/.github/actions/setup@f0164622ffc2007e96a0e1deaa3f5064db04b148 # v1.1.0
with:
registry1Username: ${{ secrets.IRON_BANK_ROBOT_USERNAME }}
registry1Password: ${{ secrets.IRON_BANK_ROBOT_PASSWORD }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/scorecard.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ jobs:

steps:
- name: "Checkout code"
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
with:
persist-credentials: false

- name: "Run analysis"
uses: ossf/scorecard-action@dc50aa9510b46c811795eb24b2f1ba02a914e534 # v2.3.3
uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.4.0
with:
results_file: results.sarif
results_format: sarif
Expand All @@ -37,14 +37,14 @@ jobs:
# 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@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
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@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12
uses: github/codeql-action/upload-sarif@c36620d31ac7c881962c3d9dd939c40ec9434f2b # v3.26.12
with:
sarif_file: results.sarif
10 changes: 5 additions & 5 deletions .github/workflows/tag-and-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,17 +39,17 @@ jobs:
packages: write

steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1

- name: Environment setup
uses: defenseunicorns/uds-common/.github/actions/setup@172a905901cb9bd76d096d2850bf31af5c5a4fa1 # v0.8.0
uses: defenseunicorns/uds-common/.github/actions/setup@f0164622ffc2007e96a0e1deaa3f5064db04b148 # v1.1.0
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@0d4c9c5ea7693da7b068278f7b52bda2a190a446 # v3
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3
with:
registry: ghcr.io
username: dummy
Expand All @@ -67,10 +67,10 @@ jobs:

- name: Debug Output
if: ${{ always() }}
uses: defenseunicorns/uds-common/.github/actions/debug-output@172a905901cb9bd76d096d2850bf31af5c5a4fa1 # v0.8.0
uses: defenseunicorns/uds-common/.github/actions/debug-output@f0164622ffc2007e96a0e1deaa3f5064db04b148 # v1.1.0

- name: Save logs
if: always()
uses: defenseunicorns/uds-common/.github/actions/save-logs@172a905901cb9bd76d096d2850bf31af5c5a4fa1 # v0.8.0
uses: defenseunicorns/uds-common/.github/actions/save-logs@f0164622ffc2007e96a0e1deaa3f5064db04b148 # v1.1.0
with:
suffix: '${{ matrix.bundle }}-${{ matrix.flavor }}-${{ matrix.architecture }}-${{ github.run_id }}-${{ github.run_attempt }}'
10 changes: 5 additions & 5 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,28 +47,28 @@ jobs:
flavor: upstream
steps:
- name: Checkout repository
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1

- name: Environment setup
uses: defenseunicorns/uds-common/.github/actions/setup@172a905901cb9bd76d096d2850bf31af5c5a4fa1 # v0.8.0
uses: defenseunicorns/uds-common/.github/actions/setup@f0164622ffc2007e96a0e1deaa3f5064db04b148 # v1.1.0
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@172a905901cb9bd76d096d2850bf31af5c5a4fa1 # v0.8.0
uses: defenseunicorns/uds-common/.github/actions/test@f0164622ffc2007e96a0e1deaa3f5064db04b148 # v1.1.0
with:
flavor: ${{ matrix.flavor }}
type: ${{ matrix.type }}
options: "--set BUNDLE_PATH=bundles/${{ matrix.bundle }}"

- name: Debug Output
if: ${{ always() }}
uses: defenseunicorns/uds-common/.github/actions/debug-output@172a905901cb9bd76d096d2850bf31af5c5a4fa1 # v0.8.0
uses: defenseunicorns/uds-common/.github/actions/debug-output@f0164622ffc2007e96a0e1deaa3f5064db04b148 # v1.1.0

- name: Save logs
if: always()
uses: defenseunicorns/uds-common/.github/actions/save-logs@172a905901cb9bd76d096d2850bf31af5c5a4fa1 # v0.8.0
uses: defenseunicorns/uds-common/.github/actions/save-logs@f0164622ffc2007e96a0e1deaa3f5064db04b148 # v1.1.0
with:
suffix: ${{ matrix.type }}-${{ matrix.bundle }}-${{ matrix.flavor }}-${{ github.run_id }}-${{ github.run_attempt }}
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ Alternatively, you can deploy from OCI by running the following two commands:
> [!NOTE]: You can append `--set INSECURE_ADMIN_PASSWORD_GENERATION=true` to the below command to enable a default keycloak admin. This is useful for development and testing of the SWF stack and enables the ability to run `uds run setup:create-doug-user` to create a user to test with using the username `doug` and the password `unicorn123!@#`.

```bash
uds deploy k3d-core-slim-dev:0.24.0
uds deploy k3d-core-slim-dev:0.29.0
```

1. Run the below command to deploy the `swf-dev` bundle on top of the dev cluster:
Expand Down
12 changes: 6 additions & 6 deletions bundles/dev/uds-bundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ packages:

- name: postgres-operator
repository: ghcr.io/defenseunicorns/packages/uds/postgres-operator
ref: 1.12.2-uds.1-upstream
ref: 1.13.0-uds.2-upstream
overrides:
postgres-operator:
uds-postgres-config:
Expand Down Expand Up @@ -70,7 +70,7 @@ packages:

- name: valkey
repository: ghcr.io/defenseunicorns/packages/uds/valkey
ref: 7.2.5-uds.1-upstream
ref: 7.2.6-uds.0-upstream
overrides:
valkey:
uds-valkey-config:
Expand Down Expand Up @@ -110,7 +110,7 @@ packages:

- name: gitlab
repository: ghcr.io/defenseunicorns/packages/uds/gitlab
ref: 17.1.1-uds.1-upstream
ref: 17.2.7-uds.2-upstream
overrides:
gitlab:
uds-gitlab-config:
Expand Down Expand Up @@ -208,11 +208,11 @@ packages:

- name: gitlab-runner
repository: ghcr.io/defenseunicorns/packages/uds/gitlab-runner
ref: 17.0.0-uds.1-upstream
ref: 17.2.1-uds.2-upstream

- name: sonarqube
repository: ghcr.io/defenseunicorns/packages/uds/sonarqube
ref: 9.9.5-uds.1-upstream
ref: 10.7.0-uds.0-upstream
overrides:
sonarqube:
sonarqube:
Expand All @@ -236,7 +236,7 @@ packages:

- name: mattermost
repository: ghcr.io/defenseunicorns/packages/uds/mattermost
ref: 9.9.1-uds.0-upstream
ref: 10.0.0-uds.1-upstream
imports:
- name: ACCESS_KEY
package: dev-secrets
Expand Down
18 changes: 9 additions & 9 deletions bundles/k3d-demo/uds-bundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ metadata:
packages:
- name: uds-k3d-dev
repository: ghcr.io/defenseunicorns/packages/uds-k3d
ref: 0.7.0
ref: 0.9.0

- name: init
repository: ghcr.io/defenseunicorns/packages/init
ref: v0.36.0
ref: v0.36.1

- name: uds-core
repository: ghcr.io/defenseunicorns/packages/uds/core
ref: "0.24.0-upstream"
ref: "0.29.0-upstream"
overrides:
keycloak:
keycloak:
Expand Down Expand Up @@ -59,7 +59,7 @@ packages:

- name: postgres-operator
repository: ghcr.io/defenseunicorns/packages/uds/postgres-operator
ref: 1.12.2-uds.1-upstream
ref: 1.13.0-uds.2-upstream
overrides:
postgres-operator:
uds-postgres-config:
Expand Down Expand Up @@ -89,7 +89,7 @@ packages:

- name: valkey
repository: ghcr.io/defenseunicorns/packages/uds/valkey
ref: 7.2.5-uds.1-upstream
ref: 7.2.6-uds.0-upstream
overrides:
valkey:
uds-valkey-config:
Expand Down Expand Up @@ -129,7 +129,7 @@ packages:

- name: gitlab
repository: ghcr.io/defenseunicorns/packages/uds/gitlab
ref: 17.1.1-uds.1-upstream
ref: 17.2.7-uds.2-upstream
overrides:
gitlab:
uds-gitlab-config:
Expand Down Expand Up @@ -227,11 +227,11 @@ packages:

- name: gitlab-runner
repository: ghcr.io/defenseunicorns/packages/uds/gitlab-runner
ref: 17.0.0-uds.1-upstream
ref: 17.2.1-uds.2-upstream

- name: sonarqube
repository: ghcr.io/defenseunicorns/packages/uds/sonarqube
ref: 9.9.5-uds.1-upstream
ref: 10.7.0-uds.0-upstream
overrides:
sonarqube:
sonarqube:
Expand All @@ -255,7 +255,7 @@ packages:

- name: mattermost
repository: ghcr.io/defenseunicorns/packages/uds/mattermost
ref: 9.9.1-uds.0-upstream
ref: 10.0.0-uds.1-upstream
imports:
- name: ACCESS_KEY
package: dev-secrets
Expand Down
10 changes: 5 additions & 5 deletions tasks.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
includes:
- create: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.8.0/tasks/create.yaml
- lint: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.8.0/tasks/lint.yaml
- pull: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.8.0/tasks/pull.yaml
- deploy: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.8.0/tasks/deploy.yaml
- setup: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.8.0/tasks/setup.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
- dependencies: ./tasks/dependencies.yaml
- test: ./tasks/test.yaml

Expand Down
4 changes: 2 additions & 2 deletions tasks/publish.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
includes:
- dependencies: ./dependencies.yaml
- test: ./tasks/test.yaml
- create: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.8.0/tasks/create.yaml
- publish: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.8.0/tasks/publish.yaml
- create: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.1.0/tasks/create.yaml
- publish: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.1.0/tasks/publish.yaml

tasks:
- name: build-bundle
Expand Down
8 changes: 4 additions & 4 deletions tasks/test.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
includes:
- mm: https://raw.githubusercontent.com/defenseunicorns/uds-package-mattermost/v9.4.1-uds.2/tasks/test.yaml
- gl: https://raw.githubusercontent.com/defenseunicorns/uds-package-gitlab/v16.10.1-uds.0/tasks/test.yaml
- sq: https://raw.githubusercontent.com/defenseunicorns/uds-package-sonarqube/v8.0.3-uds.6/tasks/test.yaml
- glr: https://raw.githubusercontent.com/defenseunicorns/uds-package-gitlab-runner/v16.10.0-uds.0/tasks/test.yaml
- mm: https://raw.githubusercontent.com/defenseunicorns/uds-package-mattermost/v10.0.0-uds.1/tasks/test.yaml
- gl: https://raw.githubusercontent.com/defenseunicorns/uds-package-gitlab/v17.2.7-uds.2/tasks/test.yaml
- sq: https://raw.githubusercontent.com/defenseunicorns/uds-package-sonarqube/v10.7.0-uds.0/tasks/test.yaml
- glr: https://raw.githubusercontent.com/defenseunicorns/uds-package-gitlab-runner/v17.2.1-uds.2/tasks/test.yaml

tasks:
- name: test-swf-bundle
Expand Down
Loading