chore(deps): update swf bundle dependencies (#78)

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [defenseunicorns/uds-common](https://togithub.com/defenseunicorns/uds-common) | | patch | `v0.8.0` -> `v0.8.1` | | [defenseunicorns/uds-common](https://togithub.com/defenseunicorns/uds-common) | action | patch | `v0.8.0` -> `v0.8.1` | | [defenseunicorns/uds-core](https://togithub.com/defenseunicorns/uds-core) | | patch | `0.24.0` -> `0.24.1` | | [docker/login-action](https://togithub.com/docker/login-action) | action | digest | `0d4c9c5` -> `9780b0c` | | ghcr.io/defenseunicorns/packages/init | | patch | `v0.36.0` -> `v0.36.1` | | ghcr.io/defenseunicorns/packages/uds-k3d | | minor | `0.7.0` -> `0.8.0` | | ghcr.io/defenseunicorns/packages/uds/core | | patch | `0.24.0-upstream` -> `0.24.1-upstream` | | ghcr.io/defenseunicorns/packages/uds/gitlab | | patch | `17.1.1-uds.1-upstream` -> `17.1.2-uds.0-upstream` | | ghcr.io/defenseunicorns/packages/uds/valkey | | patch | `7.2.5-uds.1-upstream` -> `7.2.5-uds.2-upstream` | | [github/codeql-action](https://togithub.com/github/codeql-action) | action | patch | `v3.25.12` -> `v3.25.13` | --- ### Release Notes <details> <summary>defenseunicorns/uds-common (defenseunicorns/uds-common)</summary> ### [`v0.8.1`](https://togithub.com/defenseunicorns/uds-common/releases/tag/v0.8.1) [Compare Source](https://togithub.com/defenseunicorns/uds-common/compare/v0.8.0...v0.8.1) ##### Miscellaneous - add cgr identity assume to setup action ([#180](https://togithub.com/defenseunicorns/uds-common/issues/180)) ([2ec74fb](https://togithub.com/defenseunicorns/uds-common/commit/2ec74fbe496c5cdcc88cd3f424951f11271fe5d6)) - fix version matching for UDS packages ([#176](https://togithub.com/defenseunicorns/uds-common/issues/176)) ([e068b6a](https://togithub.com/defenseunicorns/uds-common/commit/e068b6a255cc856e313485826a2140a3977c6b03)) </details> <details> <summary>defenseunicorns/uds-core (defenseunicorns/uds-core)</summary> ### [`v0.24.1`](https://togithub.com/defenseunicorns/uds-core/blob/HEAD/CHANGELOG.md#0241-2024-07-22) [Compare Source](https://togithub.com/defenseunicorns/uds-core/compare/v0.24.0...v0.24.1) ##### Bug Fixes - **ci:** snapshot release publish, passthrough test on upgrade ([#575](https://togithub.com/defenseunicorns/uds-core/issues/575)) ([d4afe00](https://togithub.com/defenseunicorns/uds-core/commit/d4afe0065b76ec7c44e9d00b1f95b46b189043f0)) - **ci:** workflow permissions ([cacf1b5](https://togithub.com/defenseunicorns/uds-core/commit/cacf1b5d8bccd16a8c2381fbd0912715a78a22c2)) - only allow istio gateways to set x509 client certificate header ([#572](https://togithub.com/defenseunicorns/uds-core/issues/572)) ([5c62279](https://togithub.com/defenseunicorns/uds-core/commit/5c622795b9becb7ef6f65b807486ade0fd44bea1)) - **sso:** delete orphaned SSO secrets ([#578](https://togithub.com/defenseunicorns/uds-core/issues/578)) ([5a6b9ef](https://togithub.com/defenseunicorns/uds-core/commit/5a6b9effca83f4f19344c813cf96d474ff5fdeb4)) - unicorn flavor proxy image reference ([#590](https://togithub.com/defenseunicorns/uds-core/issues/590)) ([db081fa](https://togithub.com/defenseunicorns/uds-core/commit/db081fa41c0db6557c3b66bbfa0b5064dc7226e3)) - update monitor mutation to not overwrite explicitly defined scrape class ([#582](https://togithub.com/defenseunicorns/uds-core/issues/582)) ([7e550d3](https://togithub.com/defenseunicorns/uds-core/commit/7e550d3577546d73e32a62dac018e048972d46eb)) ##### Miscellaneous - **deps:** update grafana chart + sidecar image ([#567](https://togithub.com/defenseunicorns/uds-core/issues/567)) ([85b6de4](https://togithub.com/defenseunicorns/uds-core/commit/85b6de4b140a2076cdc72626bce2d24aab90c26c)) - **deps:** update pepr to v0.32.7 ([#556](https://togithub.com/defenseunicorns/uds-core/issues/556)) ([e594f13](https://togithub.com/defenseunicorns/uds-core/commit/e594f1366bb6a920a9cd7a945bc41ae39382f8b8)) - **deps:** update uds-identity-config to v0.5.1 ([#591](https://togithub.com/defenseunicorns/uds-core/issues/591)) ([b9c5bd3](https://togithub.com/defenseunicorns/uds-core/commit/b9c5bd34c75b6fe7063d8bf4bd15496f73e87861)) - **deps:** update uds-k3d to v0.8.0 ([#581](https://togithub.com/defenseunicorns/uds-core/issues/581)) ([fab8919](https://togithub.com/defenseunicorns/uds-core/commit/fab89198a9118f51e372b589e02fca89d6db4112)) - **loki:** default query settings, config as secret ([#579](https://togithub.com/defenseunicorns/uds-core/issues/579)) ([5fa889c](https://togithub.com/defenseunicorns/uds-core/commit/5fa889c51a59786330fd4f7b914b532b4c56b1b3)) - **oscal:** begin integration of composed oscal with validations ([#496](https://togithub.com/defenseunicorns/uds-core/issues/496)) ([047fd30](https://togithub.com/defenseunicorns/uds-core/commit/047fd3041a8eecc29c8f61e1f3c2c70622ec9e88)) </details> <details> <summary>github/codeql-action (github/codeql-action)</summary> ### [`v3.25.13`](https://togithub.com/github/codeql-action/compare/v3.25.12...v3.25.13) [Compare Source](https://togithub.com/github/codeql-action/compare/v3.25.12...v3.25.13) </details> --- ### Configuration 📅 **Schedule**: Branch creation - "after 7am and before 9am every weekday" in timezone America/New_York, Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://togithub.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View the [repository job log](https://developer.mend.io/github/defenseunicorns/uds-software-factory).  --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Wayne Starr <me@racer159.com>
defenseunicorns · Jul 22, 2024 · 6684e97 · 6684e97
1 parent 11774e8
commit 6684e97
Show file tree

Hide file tree

Showing 12 changed files with 54 additions and 38 deletions.
diff --git 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@172a905901cb9bd76d096d2850bf31af5c5a4fa1 # v0.8.0
+    uses: defenseunicorns/uds-common/.github/workflows/commitlint.yaml@a7549ad75a9bbd8e71ce2236ec17c1e33ec4df61 # v0.8.1
diff --git 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@172a905901cb9bd76d096d2850bf31af5c5a4fa1 # v0.8.0
+        uses: defenseunicorns/uds-common/.github/actions/setup@a7549ad75a9bbd8e71ce2236ec17c1e33ec4df61 # v0.8.1
         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
@@ -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@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12
+        uses: github/codeql-action/upload-sarif@2d790406f505036ef40ecba973cc774a50395aac # v3.25.13
         with:
           sarif_file: results.sarif
diff --git a/.github/workflows/tag-and-release.yaml b/.github/workflows/tag-and-release.yaml
@@ -42,14 +42,14 @@ jobs:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
       - name: Environment setup
-        uses: defenseunicorns/uds-common/.github/actions/setup@172a905901cb9bd76d096d2850bf31af5c5a4fa1 # v0.8.0
+        uses: defenseunicorns/uds-common/.github/actions/setup@a7549ad75a9bbd8e71ce2236ec17c1e33ec4df61 # v0.8.1
         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
@@ -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@a7549ad75a9bbd8e71ce2236ec17c1e33ec4df61 # v0.8.1
 
       - 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@a7549ad75a9bbd8e71ce2236ec17c1e33ec4df61 # v0.8.1
         with:
           suffix: '${{ matrix.bundle }}-${{ matrix.flavor }}-${{ matrix.architecture }}-${{ github.run_id }}-${{ github.run_attempt }}'
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -50,25 +50,25 @@ jobs:
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
       - name: Environment setup
-        uses: defenseunicorns/uds-common/.github/actions/setup@172a905901cb9bd76d096d2850bf31af5c5a4fa1 # v0.8.0
+        uses: defenseunicorns/uds-common/.github/actions/setup@a7549ad75a9bbd8e71ce2236ec17c1e33ec4df61 # v0.8.1
         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@a7549ad75a9bbd8e71ce2236ec17c1e33ec4df61 # v0.8.1
         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@a7549ad75a9bbd8e71ce2236ec17c1e33ec4df61 # v0.8.1
 
       - 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@a7549ad75a9bbd8e71ce2236ec17c1e33ec4df61 # v0.8.1
         with:
           suffix: ${{ matrix.type }}-${{ matrix.bundle }}-${{ matrix.flavor }}-${{ github.run_id }}-${{ github.run_attempt }}
diff --git a/README.md b/README.md
@@ -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.24.1
     ```
 
 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
@@ -70,7 +70,7 @@ packages:
 
   - name: valkey
     repository: ghcr.io/defenseunicorns/packages/uds/valkey
-    ref: 7.2.5-uds.1-upstream
+    ref: 7.2.5-uds.2-upstream
     overrides:
       valkey:
         uds-valkey-config:
@@ -110,7 +110,7 @@ packages:
 
   - name: gitlab
     repository: ghcr.io/defenseunicorns/packages/uds/gitlab
-    ref: 17.1.1-uds.1-upstream
+    ref: 17.1.2-uds.0-upstream
     overrides:
       gitlab:
         uds-gitlab-config:
@@ -132,6 +132,14 @@ packages:
             - name: GITLAB_SSO_ENABLED
               description: "Boolean to enable or disable sso things"
               path: "global.appConfig.omniauth.enabled"
+            - name: GITLAB_PAGES_ENABLED
+              description: "Boolean to enable or disable sso things"
+              path: "global.pages.enabled"
+              default: true
+            - name: DISABLE_REGISTRY_REDIRECT
+              description: "Gitlab Registry Disable Redirect"
+              path: "registry.storage.redirect.disable"
+              default: true
             - name: MIGRATIONS_RESOURCES
               description: "Gitlab Migrations Resources"
               path: "gitlab.migrations.resources"
@@ -197,10 +205,6 @@ packages:
               description: "Gitlab Registry Min Replicas"
               path: "registry.hpa.minReplicas"
               default: 1
-            - name: DISABLE_REGISTRY_REDIRECT
-              description: "Gitlab Registry Disable Redirect"
-              path: "registry.storage.redirect.disable"
-              default: "true"
             - name: SHELL_REPLICAS
               description: "Gitlab Shell Min Replicas"
               path: "gitlab.gitlab-shell.minReplicas"

diff --git 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.7.0
+    ref: 0.8.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.24.1-upstream"
     overrides:
       keycloak:
         keycloak:
@@ -89,7 +89,7 @@ packages:
 
   - name: valkey
     repository: ghcr.io/defenseunicorns/packages/uds/valkey
-    ref: 7.2.5-uds.1-upstream
+    ref: 7.2.5-uds.2-upstream
     overrides:
       valkey:
         uds-valkey-config:
@@ -129,7 +129,7 @@ packages:
 
   - name: gitlab
     repository: ghcr.io/defenseunicorns/packages/uds/gitlab
-    ref: 17.1.1-uds.1-upstream
+    ref: 17.1.2-uds.0-upstream
     overrides:
       gitlab:
         uds-gitlab-config:
@@ -151,6 +151,14 @@ packages:
             - name: GITLAB_SSO_ENABLED
               description: "Boolean to enable or disable sso things"
               path: "global.appConfig.omniauth.enabled"
+            - name: GITLAB_PAGES_ENABLED
+              description: "Boolean to enable or disable sso things"
+              path: "global.pages.enabled"
+              default: true
+            - name: DISABLE_REGISTRY_REDIRECT
+              description: "Gitlab Registry Disable Redirect"
+              path: "registry.storage.redirect.disable"
+              default: true
             - name: MIGRATIONS_RESOURCES
               description: "Gitlab Migrations Resources"
               path: "gitlab.migrations.resources"
@@ -216,10 +224,6 @@ packages:
               description: "Gitlab Registry Min Replicas"
               path: "registry.hpa.minReplicas"
               default: 1
-            - name: DISABLE_REGISTRY_REDIRECT
-              description: "Gitlab Registry Disable Redirect"
-              path: "registry.storage.redirect.disable"
-              default: "true"
             - name: SHELL_REPLICAS
               description: "Gitlab Shell Min Replicas"
               path: "gitlab.gitlab-shell.minReplicas"

diff --git a/renovate.json b/renovate.json
@@ -40,6 +40,14 @@
         ],
         "datasourceTemplate": "github-tags",
         "extractVersionTemplate": "^v(?<version>.*)$"
+      },
+      {
+        "fileMatch": [".*(\\.ya?ml|\\.json)$"],
+        "matchStrings": [
+            "https:\\/\\/raw\\.githubusercontent\\.com\\/(?<depName>[^\\/]+\\/[^\\/]+)\\/(?<currentValue>[^\\/]+)"
+        ],
+        "versioningTemplate": "regex:^v?(?<major>\\d+)(\\.(?<minor>\\d+))?(\\.(?<patch>\\d+))?(-uds\\.(?<build>\\d))?(-(?<compatibility>\\w+)?)?(.*?)?$",
+        "datasourceTemplate": "github-tags"
       }
     ]
 }

diff --git a/tasks.yaml b/tasks.yaml
@@ -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/v0.8.1/tasks/create.yaml
+  - lint: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.8.1/tasks/lint.yaml
+  - pull: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.8.1/tasks/pull.yaml
+  - deploy: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.8.1/tasks/deploy.yaml
+  - setup: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.8.1/tasks/setup.yaml
   - dependencies: ./tasks/dependencies.yaml
   - test: ./tasks/test.yaml
 

diff --git a/tasks/publish.yaml b/tasks/publish.yaml
@@ -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/v0.8.1/tasks/create.yaml
+  - publish: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.8.1/tasks/publish.yaml
 
 tasks:
   - name: build-bundle

diff --git a/tasks/test.yaml b/tasks/test.yaml
@@ -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/v9.9.1-uds.0/tasks/test.yaml
+  - gl: https://raw.githubusercontent.com/defenseunicorns/uds-package-gitlab/v17.1.2-uds.0/tasks/test.yaml
+  - sq: https://raw.githubusercontent.com/defenseunicorns/uds-package-sonarqube/v9.9.5-uds.1/tasks/test.yaml
+  - glr: https://raw.githubusercontent.com/defenseunicorns/uds-package-gitlab-runner/v17.0.0-uds.1/tasks/test.yaml
 
 tasks:
   - name: test-swf-bundle