chore(deps): update support-deps to v1.5.1 (#85)

This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [defenseunicorns/uds-common](https://redirect.github.com/defenseunicorns/uds-common) | | minor | `v1.2.2` -> `v1.5.1` | | [defenseunicorns/uds-common](https://redirect.github.com/defenseunicorns/uds-common) | action | minor | `v1.2.2` -> `v1.5.1` | --- ### Release Notes <details> <summary>defenseunicorns/uds-common (defenseunicorns/uds-common)</summary> ### [`v1.5.1`](https://redirect.github.com/defenseunicorns/uds-common/releases/tag/v1.5.1) [Compare Source](https://redirect.github.com/defenseunicorns/uds-common/compare/v1.5.0...v1.5.1) ##### Miscellaneous - add a renovate rule for handling uds versions from upstream ones ([#359](https://redirect.github.com/defenseunicorns/uds-common/issues/359)) ([34dfed1](https://redirect.github.com/defenseunicorns/uds-common/commit/34dfed162e220d6cdbb13b8910a78ff3d00d1f08)) - fix the upgrade task ([#361](https://redirect.github.com/defenseunicorns/uds-common/issues/361)) ([c74070d](https://redirect.github.com/defenseunicorns/uds-common/commit/c74070d7ba7a3cb5a503cc7632748b115a208115)) ### [`v1.5.0`](https://redirect.github.com/defenseunicorns/uds-common/releases/tag/v1.5.0) [Compare Source](https://redirect.github.com/defenseunicorns/uds-common/compare/v1.4.0...v1.5.0) ##### ⚠ BREAKING CHANGES - fix the release process permissions (contents: write) ([#355](https://redirect.github.com/defenseunicorns/uds-common/issues/355)) - **deps:** update uds common support dependencies (ubuntu-latest can no longer be used) ([#354](https://redirect.github.com/defenseunicorns/uds-common/issues/354)) ##### Features - provide uds-releaser option for publishing uds packages ([#341](https://redirect.github.com/defenseunicorns/uds-common/issues/341)) ([62f8c28](https://redirect.github.com/defenseunicorns/uds-common/commit/62f8c28b2db62a0fbcbad5a7a639c65de2359696)) ##### Bug Fixes - check tests directories in renovate updates ([#351](https://redirect.github.com/defenseunicorns/uds-common/issues/351)) ([61385c2](https://redirect.github.com/defenseunicorns/uds-common/commit/61385c2fc0463e125e1914d59c4d7288976c5628)) - quote conditional and add use chkpt false ([#357](https://redirect.github.com/defenseunicorns/uds-common/issues/357)) ([4cda4d9](https://redirect.github.com/defenseunicorns/uds-common/commit/4cda4d94ca965781e57e36000a8b7159197533be)) ##### Miscellaneous - fix the release process permissions ([#355](https://redirect.github.com/defenseunicorns/uds-common/issues/355)) ([517932c](https://redirect.github.com/defenseunicorns/uds-common/commit/517932c890e0be62a87ef3f44ce88f9f3f587d5b)) - **deps:** update uds common package dependencies to v1.27.3 ([#349](https://redirect.github.com/defenseunicorns/uds-common/issues/349)) ([4fbe49f](https://redirect.github.com/defenseunicorns/uds-common/commit/4fbe49f520cfa2c8ca38a39b829a7b2c782bae47)) - **deps:** update uds common support dependencies ([#348](https://redirect.github.com/defenseunicorns/uds-common/issues/348)) ([4430e46](https://redirect.github.com/defenseunicorns/uds-common/commit/4430e46bcd30092cb25e24bc278b54602602c3fb)) - **deps:** update uds common support dependencies ([#354](https://redirect.github.com/defenseunicorns/uds-common/issues/354)) ([511d894](https://redirect.github.com/defenseunicorns/uds-common/commit/511d8940991eaba185dd52d11a3d37efa7defcd8)) ### [`v1.4.0`](https://redirect.github.com/defenseunicorns/uds-common/releases/tag/v1.4.0) [Compare Source](https://redirect.github.com/defenseunicorns/uds-common/compare/v1.3.0...v1.4.0) ##### Features - login to ghcr from gitlab for upgrade tests and avoiding rate limiting ([#343](https://redirect.github.com/defenseunicorns/uds-common/issues/343)) ([e299d1c](https://redirect.github.com/defenseunicorns/uds-common/commit/e299d1c9b6c8d1cb9af3f087e62a98ba2793bbd9)) ##### Miscellaneous - **deps:** update uds common support dependencies ([#344](https://redirect.github.com/defenseunicorns/uds-common/issues/344)) ([9365b36](https://redirect.github.com/defenseunicorns/uds-common/commit/9365b36350a93b263a7248c41229684241959691)) - **deps:** update uds common support dependencies to v0.32.0 ([#347](https://redirect.github.com/defenseunicorns/uds-common/issues/347)) ([14f4841](https://redirect.github.com/defenseunicorns/uds-common/commit/14f48411704c4df466f3f5c47f6cb90e84a592fb)) - fix broken links and change name of package integration guide ([#346](https://redirect.github.com/defenseunicorns/uds-common/issues/346)) ([c470dea](https://redirect.github.com/defenseunicorns/uds-common/commit/c470dea2c0dc108164ceab9acb7b567af703a48e)) - update uds-package-requirements with new CODEOWNERS reqs ([#339](https://redirect.github.com/defenseunicorns/uds-common/issues/339)) ([462b7e9](https://redirect.github.com/defenseunicorns/uds-common/commit/462b7e9d45bcfdf5fae54b09cd51e112a713214a)) ### [`v1.3.0`](https://redirect.github.com/defenseunicorns/uds-common/releases/tag/v1.3.0) [Compare Source](https://redirect.github.com/defenseunicorns/uds-common/compare/v1.2.2...v1.3.0) ##### Features - allow keycloak_group to be specified as input in create-doug-user task ([#332](https://redirect.github.com/defenseunicorns/uds-common/issues/332)) ([cf7cbdd](https://redirect.github.com/defenseunicorns/uds-common/commit/cf7cbddefc1abf96bab238fa185908eab1da194c)) ##### Bug Fixes - add git reset in upgrade-test directory for better local devx ([#337](https://redirect.github.com/defenseunicorns/uds-common/issues/337)) ([2c0ca17](https://redirect.github.com/defenseunicorns/uds-common/commit/2c0ca174540f4a138648c56058e5a1216d62c617)) - gitlab publish being broken due to bash weirdness ([#329](https://redirect.github.com/defenseunicorns/uds-common/issues/329)) ([e7a3c69](https://redirect.github.com/defenseunicorns/uds-common/commit/e7a3c6969cb77c1560da2ae93f48cb5759a002f2)) - update UDS Opeator link in guide.md ([#336](https://redirect.github.com/defenseunicorns/uds-common/issues/336)) ([66cbe6f](https://redirect.github.com/defenseunicorns/uds-common/commit/66cbe6f63597d1eeeb9c177084067bc90aa0d469)) - use flavor from inputs instead of $FLAVOR variable ([#335](https://redirect.github.com/defenseunicorns/uds-common/issues/335)) ([398bbe5](https://redirect.github.com/defenseunicorns/uds-common/commit/398bbe58d5eac6f365b705a8fad80a7eb920202b)) ##### Miscellaneous - **deps:** update uds common support dependencies ([#334](https://redirect.github.com/defenseunicorns/uds-common/issues/334)) ([d95aafa](https://redirect.github.com/defenseunicorns/uds-common/commit/d95aafabbc53c6f3c6034c71bdee28f4841733eb)) </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), 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. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/defenseunicorns/uds-package-postgres-operator).  --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Wayne Starr <me@racer159.com>
defenseunicorns · Dec 10, 2024 · 6311fe5 · 6311fe5
1 parent b87dd9a
commit 6311fe5
Show file tree

Hide file tree

Showing 13 changed files with 40 additions and 78 deletions.
diff --git a/.github/workflows/ci-docs-shim.yaml b/.github/workflows/ci-docs-shim.yaml
@@ -18,7 +18,7 @@ jobs:
       matrix:
         type: [install, upgrade]
         flavor: [upstream, registry1]
-    uses: defenseunicorns/uds-common/.github/workflows/callable-ci-docs-shim.yaml@d59b1c601730bfa7ab76439643242358e529603e # v1.2.2
+    uses: defenseunicorns/uds-common/.github/workflows/callable-ci-docs-shim.yaml@a94be6798ba20e2d23fe16afc6578e442e55fb0a # v1.5.1
     with:
       flavor: ${{ matrix.flavor }}
       type: ${{ matrix.type }}

diff --git a/.github/workflows/commitlint.yaml b/.github/workflows/commitlint.yaml
@@ -15,4 +15,4 @@ permissions:
 
 jobs:
   validate:
-    uses: defenseunicorns/uds-common/.github/workflows/callable-commitlint.yaml@d59b1c601730bfa7ab76439643242358e529603e # v1.2.2
+    uses: defenseunicorns/uds-common/.github/workflows/callable-commitlint.yaml@a94be6798ba20e2d23fe16afc6578e442e55fb0a # v1.5.1
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -6,7 +6,7 @@ name: Lint
 on:
   # This workflow is triggered on pull requests to the main branch.
   pull_request:
-    # 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).
+    # milestoned is added here as a way to retrigger workflows that are stuck or otherwise didn't run correctly
     types: [milestoned, opened, reopened, synchronize]
 
 # Permissions for the GITHUB_TOKEN used by the workflow.
@@ -15,5 +15,5 @@ permissions:
 
 jobs:
   validate:
-    uses: defenseunicorns/uds-common/.github/workflows/callable-lint.yaml@d59b1c601730bfa7ab76439643242358e529603e # v1.2.2
+    uses: defenseunicorns/uds-common/.github/workflows/callable-lint.yaml@a94be6798ba20e2d23fe16afc6578e442e55fb0a # v1.5.1
     secrets: inherit
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -15,34 +15,21 @@ permissions:
   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.
+      contents: write # 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, unicorn]
         architecture: [amd64, arm64]
         exclude:
           - flavor: registry1
             architecture: arm64
-    uses: defenseunicorns/uds-common/.github/workflows/callable-publish.yaml@d59b1c601730bfa7ab76439643242358e529603e # v1.2.2
+    uses: defenseunicorns/uds-common/.github/workflows/callable-publish.yaml@a94be6798ba20e2d23fe16afc6578e442e55fb0a # v1.5.1
     with:
       flavor: ${{ matrix.flavor }}
-      runsOn: ${{ matrix.architecture == 'arm64' && 'uds-swf-ubuntu-arm64-4-core' || 'ubuntu-latest' }}
+      runsOn: ${{ matrix.architecture == 'arm64' && 'uds-swf-ubuntu-arm64-4-core' || 'uds-swf-ubuntu-big-boy-4-core' }}
+      uds-releaser: true
     secrets: inherit # Inherits all secrets from the parent workflow.
diff --git a/.github/workflows/scorecard.yaml b/.github/workflows/scorecard.yaml
@@ -32,5 +32,5 @@ jobs:
       security-events: write
       # Used to receive a badge.
       id-token: write
-    uses: defenseunicorns/uds-common/.github/workflows/callable-scorecard.yaml@d59b1c601730bfa7ab76439643242358e529603e # v1.2.2
+    uses: defenseunicorns/uds-common/.github/workflows/callable-scorecard.yaml@a94be6798ba20e2d23fe16afc6578e442e55fb0a # v1.5.1
     secrets: inherit
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -6,7 +6,7 @@ name: Test
 on:
   # This workflow is triggered on pull requests to the main branch.
   pull_request:
-    # 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).
+    # milestoned is added here as a way to retrigger workflows that are stuck or otherwise didn't run correctly
     types: [milestoned, opened, reopened, synchronize]
     paths-ignore:
       - "**.md"
@@ -18,8 +18,7 @@ on:
       - docs/**
       - .gitignore
       - renovate.json
-      - .release-please-config.json
-      - release-please-config.json
+      - releaser.yaml
       - CODEOWNERS
       - LICENSE
       - CONTRIBUTING.md
@@ -44,7 +43,7 @@ jobs:
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: test-flavor
-        uses: defenseunicorns/uds-common/.github/actions/test-flavor@d59b1c601730bfa7ab76439643242358e529603e # v1.2.2
+        uses: defenseunicorns/uds-common/.github/actions/test-flavor@a94be6798ba20e2d23fe16afc6578e442e55fb0a # v1.5.1
         id: test-flavor
     outputs:
       upgrade-flavors: ${{ steps.test-flavor.outputs.upgrade-flavors }}
@@ -56,9 +55,10 @@ jobs:
       matrix:
         type: [install, upgrade]
         flavor: [upstream, registry1, unicorn]
-    uses: defenseunicorns/uds-common/.github/workflows/callable-test.yaml@d59b1c601730bfa7ab76439643242358e529603e # v1.2.2
+    uses: defenseunicorns/uds-common/.github/workflows/callable-test.yaml@a94be6798ba20e2d23fe16afc6578e442e55fb0a # v1.5.1
     with:
       upgrade-flavors: ${{ needs.check-flavor.outputs.upgrade-flavors }}
       flavor: ${{ matrix.flavor }}
       type: ${{ matrix.type }}
+      runsOn: uds-swf-ubuntu-big-boy-4-core
     secrets: inherit # Inherits all secrets from the parent workflow.
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
diff --git a/bundle/uds-bundle.yaml b/bundle/uds-bundle.yaml
@@ -5,16 +5,12 @@ kind: UDSBundle
 metadata:
   name: postgres-operator-test
   description: A UDS bundle for deploying Zalando Postgres Operator and on a development cluster
-  # x-release-please-start-version
-  version: 1.13.0-uds.5
-  # x-release-please-end
+  version: dev
 
 packages:
   - name: postgres-operator
     path: ../
-    # x-release-please-start-version
-    ref: 1.13.0-uds.5
-    # x-release-please-end
+    ref: dev
     overrides:
       postgres-operator:
         uds-postgres-config:

diff --git a/release-please-config.json b/release-please-config.json
diff --git a/releaser.yaml b/releaser.yaml
@@ -0,0 +1,13 @@
+# Copyright 2024 Defense Unicorns
+# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial
+
+flavors:
+  - name: upstream
+    # renovate-uds: datasource=docker depName=ghcr.io/zalando/postgres-operator extractVersion=^v?(?<version>\d+\.\d+\.\d+)$
+    version: 1.13.0-uds.6
+  - name: registry1
+    # renovate-uds: datasource=docker depName=registry1.dso.mil/ironbank/opensource/zalando/postgres-operator extractVersion=^v?(?<version>\d+\.\d+\.\d+)$
+    version: 1.13.0-uds.6
+  - name: unicorn
+    # renovate-uds: datasource=docker depName=cgr.dev/du-uds-defenseunicorns/postgres-operator-fips
+    version: 1.13.0-uds.6
diff --git a/tasks.yaml b/tasks.yaml
@@ -3,16 +3,16 @@
 
 includes:
   - test: ./tasks/test.yaml
-  - create: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.2.2/tasks/create.yaml
-  - publish: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.2.2/tasks/publish.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
+  - create: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.5.1/tasks/create.yaml
+  - publish: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.5.1/tasks/publish.yaml
+  - lint: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.5.1/tasks/lint.yaml
+  - pull: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.5.1/tasks/pull.yaml
+  - deploy: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.5.1/tasks/deploy.yaml
+  - setup: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.5.1/tasks/setup.yaml
+  - actions: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.5.1/tasks/actions.yaml
+  - badge: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.5.1/tasks/badge.yaml
+  - upgrade: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.5.1/tasks/upgrade.yaml
+  - compliance: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.5.1/tasks/compliance.yaml
 
 tasks:
   - name: default
@@ -75,7 +75,3 @@ tasks:
       - task: create-deploy-test-bundle
       - description: Publish the package
         task: publish:package
-        with:
-          # x-release-please-start-version
-          version: "1.13.0-uds.5"
-          # x-release-please-end
diff --git a/version.txt b/version.txt
diff --git a/zarf.yaml b/zarf.yaml
@@ -6,9 +6,7 @@ metadata:
   name: postgres-operator
   description: "A deployment of zalando postgres operator"
   url: https://github.com/zalando/postgres-operator
-  # x-release-please-start-version
-  version: "1.13.0-uds.5"
-  # x-release-please-end
+  version: "dev"
 
 components:
   # CRD lifecycle is managed outside of the main chart to support upgrades