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 all dependencies #42

Merged
merged 14 commits into from
May 10, 2024
Merged
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@5e4414dc25302739063bb58aa96b8afef5be9851 # v0.3.10
uses: defenseunicorns/uds-common/.github/workflows/commitlint.yaml@b2e8b25930c953ef893e7c787fe350f0d8679ee2 # v0.4.2
9 changes: 5 additions & 4 deletions .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,16 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
with:
fetch-depth: 0

- name: Environment setup
uses: defenseunicorns/uds-common/.github/actions/setup@5e4414dc25302739063bb58aa96b8afef5be9851 # v0.3.10
uses: defenseunicorns/uds-common/.github/actions/setup@b2e8b25930c953ef893e7c787fe350f0d8679ee2 # v0.4.2
with:
username: ${{ secrets.IRON_BANK_ROBOT_USERNAME }}
password: ${{ secrets.IRON_BANK_ROBOT_PASSWORD }}
registry1Username: ${{ secrets.IRON_BANK_ROBOT_USERNAME }}
registry1Password: ${{ secrets.IRON_BANK_ROBOT_PASSWORD }}
ghToken: ${{ secrets.GITHUB_TOKEN }}

- name: Install lint deps
run: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/scorecard.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:

steps:
- name: "Checkout code"
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
with:
persist-credentials: false

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@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.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@3ab4101902695724f9365a384f86c1074d94e18c # v3.24.7
uses: github/codeql-action/upload-sarif@ccf74c947955fd1cf117aef6a0e4e66191ef6f61 # v3.25.4
with:
sarif_file: results.sarif
11 changes: 6 additions & 5 deletions .github/workflows/tag-and-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,14 @@ jobs:
packages: write

steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5

- name: Environment setup
uses: defenseunicorns/uds-common/.github/actions/setup@5e4414dc25302739063bb58aa96b8afef5be9851 # v0.3.10
uses: defenseunicorns/uds-common/.github/actions/setup@b2e8b25930c953ef893e7c787fe350f0d8679ee2 # v0.4.2
with:
username: ${{secrets.IRON_BANK_ROBOT_USERNAME}}
password: ${{secrets.IRON_BANK_ROBOT_PASSWORD}}
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
Expand All @@ -57,6 +58,6 @@ jobs:

- name: Save logs
if: always()
uses: defenseunicorns/uds-common/.github/actions/save-logs@5e4414dc25302739063bb58aa96b8afef5be9851 # v0.3.10
uses: defenseunicorns/uds-common/.github/actions/save-logs@b2e8b25930c953ef893e7c787fe350f0d8679ee2 # v0.4.2
with:
suffix: '${{ matrix.bundle }}-${{ matrix.flavor }}-${{ github.run_id }}-${{ github.run_attempt }}'
13 changes: 7 additions & 6 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,23 +47,24 @@ jobs:
flavor: upstream
steps:
- name: Checkout repository
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5

- name: Environment setup
uses: defenseunicorns/uds-common/.github/actions/setup@5e4414dc25302739063bb58aa96b8afef5be9851 # v0.3.10
uses: defenseunicorns/uds-common/.github/actions/setup@b2e8b25930c953ef893e7c787fe350f0d8679ee2 # v0.4.2
with:
username: ${{secrets.IRON_BANK_ROBOT_USERNAME}}
password: ${{secrets.IRON_BANK_ROBOT_PASSWORD}}
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@5e4414dc25302739063bb58aa96b8afef5be9851 # v0.3.10
uses: defenseunicorns/uds-common/.github/actions/test@b2e8b25930c953ef893e7c787fe350f0d8679ee2 # v0.4.2
with:
flavor: ${{ matrix.flavor }}
type: ${{ matrix.type }}
options: "--set BUNDLE_PATH=bundles/${{ matrix.bundle }}"

- name: Save logs
if: always()
uses: defenseunicorns/uds-common/.github/actions/save-logs@5e4414dc25302739063bb58aa96b8afef5be9851 # v0.3.10
uses: defenseunicorns/uds-common/.github/actions/save-logs@b2e8b25930c953ef893e7c787fe350f0d8679ee2 # v0.4.2
with:
suffix: ${{ matrix.type }}-${{ matrix.bundle }}-${{ matrix.flavor }}-${{ github.run_id }}-${{ github.run_attempt }}
6 changes: 3 additions & 3 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"yaml.schemas": {
"https://raw.githubusercontent.com/defenseunicorns/uds-cli/v0.9.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.9.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.9.0/zarf.schema.json": [
"https://raw.githubusercontent.com/defenseunicorns/uds-cli/v0.10.4/zarf.schema.json": [
"**zarf.yaml"
]
},
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.18.0
uds deploy k3d-core-slim-dev:0.21.1
```

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

- name: dev-minio
repository: ghcr.io/defenseunicorns/packages/uds/dev-minio
ref: 0.0.1
ref: 0.0.2
overrides:
minio:
minio:
Expand Down Expand Up @@ -69,7 +69,7 @@ packages:

- name: dev-redis
repository: ghcr.io/defenseunicorns/packages/uds/dev-redis
ref: 0.0.1
ref: 0.0.2
overrides:
redis:
redis:
Expand All @@ -90,23 +90,17 @@ packages:
exports:
- name: ACCESS_KEY
- name: SECRET_KEY
- name: DB_PASSWORD

- name: gitlab
repository: ghcr.io/defenseunicorns/packages/uds/gitlab
ref: 16.10.1-uds.1-upstream
ref: 16.11.1-uds.1-upstream
overrides:
gitlab:
uds-gitlab-config:
variables:
- name: GITLAB_SSO_ENABLED
description: "Boolean to enable or disable sso things"
path: "sso"
uds-gitlab-sso:
variables:
- name: GITLAB_SSO_ENABLED
description: "Boolean to enable or disable sso things"
path: "sso"
path: "sso.enabled"
gitlab:
variables:
- name: GITLAB_SSO_ENABLED
Expand Down Expand Up @@ -164,6 +158,15 @@ packages:
requests:
cpu: 50m
memory: 625M
- name: PAGES_RESOURCES
description: "GitLab Pages Resources"
path: "gitlab.gitlab-pages.resources"
default:
limits:
memory: 1.5G
requests:
cpu: 50m
memory: 625M
- name: REGISTRY_REPLICAS
description: "Gitlab Registry Min Replicas"
path: "registry.hpa.minReplicas"
Expand Down Expand Up @@ -199,11 +202,11 @@ packages:

- name: gitlab-runner
repository: ghcr.io/defenseunicorns/packages/uds/gitlab-runner
ref: 16.10.0-uds.0-upstream
ref: 16.11.0-uds.0-upstream

- name: sonarqube
repository: ghcr.io/defenseunicorns/packages/uds/sonarqube
ref: 8.0.3-uds.4-upstream-ce
ref: 9.9.2-uds.0-upstream
overrides:
sonarqube:
sonarqube:
Expand All @@ -227,14 +230,12 @@ packages:

- name: mattermost
repository: ghcr.io/defenseunicorns/packages/uds/mattermost
ref: 9.6.1-uds.0-upstream
ref: 9.7.2-uds.1-upstream
imports:
- name: ACCESS_KEY
package: dev-secrets
- name: SECRET_KEY
package: dev-secrets
- name: DB_PASSWORD
package: dev-secrets
overrides:
mattermost:
uds-mattermost-config:
Expand Down
1 change: 1 addition & 0 deletions bundles/dev/uds-config.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# TODO (@WSTARR): We can remove this after the next bundle update
variables:
postgres-operator:
postgresql:
Expand Down
39 changes: 20 additions & 19 deletions bundles/k3d-demo/uds-bundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,19 @@ metadata:
packages:
- name: uds-k3d-dev
repository: ghcr.io/defenseunicorns/packages/uds-k3d
ref: 0.3.1
ref: 0.6.0

- name: init
repository: ghcr.io/defenseunicorns/packages/init
ref: v0.32.3
ref: v0.33.1

- name: uds-core #for now
repository: oci://ghcr.io/defenseunicorns/packages/uds/core
ref: "0.18.0-upstream"
repository: ghcr.io/defenseunicorns/packages/uds/core
ref: "0.21.1-upstream"

- name: dev-minio
repository: ghcr.io/defenseunicorns/packages/uds/dev-minio
ref: 0.0.1
ref: 0.0.2

# Namespaces are deployed prior to the packages to faciliate use of the postgres-operator cross namespace secret creation
- name: dev-namespaces
Expand Down Expand Up @@ -59,7 +59,7 @@ packages:

- name: dev-redis
repository: ghcr.io/defenseunicorns/packages/uds/dev-redis
ref: 0.0.1
ref: 0.0.2
overrides:
redis:
redis:
Expand All @@ -80,23 +80,17 @@ packages:
exports:
- name: ACCESS_KEY
- name: SECRET_KEY
- name: DB_PASSWORD

- name: gitlab
repository: ghcr.io/defenseunicorns/packages/uds/gitlab
ref: 16.10.1-uds.1-upstream
ref: 16.11.1-uds.1-upstream
overrides:
gitlab:
uds-gitlab-config:
variables:
- name: GITLAB_SSO_ENABLED
description: "Boolean to enable or disable sso things"
path: "sso"
uds-gitlab-sso:
variables:
- name: GITLAB_SSO_ENABLED
description: "Boolean to enable or disable sso things"
path: "sso"
path: "sso.enabled"
gitlab:
variables:
- name: GITLAB_SSO_ENABLED
Expand Down Expand Up @@ -154,6 +148,15 @@ packages:
requests:
cpu: 50m
memory: 625M
- name: PAGES_RESOURCES
description: "GitLab Pages Resources"
path: "gitlab.gitlab-pages.resources"
default:
limits:
memory: 1.5G
requests:
cpu: 50m
memory: 625M
- name: REGISTRY_REPLICAS
description: "Gitlab Registry Min Replicas"
path: "registry.hpa.minReplicas"
Expand Down Expand Up @@ -189,11 +192,11 @@ packages:

- name: gitlab-runner
repository: ghcr.io/defenseunicorns/packages/uds/gitlab-runner
ref: 16.10.0-uds.0-upstream
ref: 16.11.0-uds.0-upstream

- name: sonarqube
repository: ghcr.io/defenseunicorns/packages/uds/sonarqube
ref: 8.0.3-uds.4-upstream-ce
ref: 9.9.2-uds.0-upstream
overrides:
sonarqube:
sonarqube:
Expand All @@ -217,14 +220,12 @@ packages:

- name: mattermost
repository: ghcr.io/defenseunicorns/packages/uds/mattermost
ref: 9.6.1-uds.0-upstream
ref: 9.7.2-uds.1-upstream
imports:
- name: ACCESS_KEY
package: dev-secrets
- name: SECRET_KEY
package: dev-secrets
- name: DB_PASSWORD
package: dev-secrets
overrides:
mattermost:
uds-mattermost-config:
Expand Down
1 change: 1 addition & 0 deletions bundles/k3d-demo/uds-config.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# TODO (@WSTARR): We can remove this after the next bundle update
variables:
postgres-operator:
postgresql:
Expand Down
2 changes: 1 addition & 1 deletion docs/development.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ exit

## Linux users

Depending on your linux distrobution and how it is configured you may need to run the following steps to be able to properly deploy SWF and/or UDS Core:
Depending on your linux distribution and how it is configured you may need to run the following steps to be able to properly deploy SWF and/or UDS Core:

```bash
sudo sysctl -w vm.max_map_count=1524288
Expand Down
25 changes: 25 additions & 0 deletions renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,31 @@
"group:all",
"replacements:all",
"workarounds:all"
],
"packageRules": [
{
"groupName": "SWF Support Dependencies",
"labels": ["support-deps"],
"commitMessageTopic": "support-deps",
"packagePatterns": ["*"]
},
{
"groupName": "SWF Bundle Dependencies",
"labels": ["bundle-deps"],
"commitMessageTopic": "bundle-deps",
"matchDatasources": ["docker", "helm", "git-tags", "github-tags"]
}
],
"regexManagers":[
{
"depNameTemplate": "defenseunicorns/uds-core",
"fileMatch": ["README\\.md"],
"matchStrings": [
"k3d-core-slim-dev:(?<currentValue>.*)"
],
"datasourceTemplate": "github-tags",
"extractVersionTemplate": "^v(?<version>.*)$"
}
]
}

8 changes: 0 additions & 8 deletions src/dev-secrets/postgres-secret.yaml

This file was deleted.

Loading