Skip to content

Commit

Permalink
chore(deps): update minio-operator support dependencies (#32)
Browse files Browse the repository at this point in the history
* chore(deps): update minio-operator support dependencies

| datasource  | package                    | from    | to      |
| ----------- | -------------------------- | ------- | ------- |
| github-tags | defenseunicorns/uds-common | v1.3.0  | v1.5.1  |
| github-tags | defenseunicorns/zarf       | v0.43.1 | v0.44.0 |

* swap to releaser

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Wayne Starr <me@racer159.com>
  • Loading branch information
renovate[bot] and Racer159 authored Dec 11, 2024
1 parent 9826552 commit 3f6134a
Show file tree
Hide file tree
Showing 13 changed files with 41 additions and 79 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-docs-shim.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
matrix:
type: [install, upgrade]
flavor: [upstream, registry1, unicorn]
uses: defenseunicorns/uds-common/.github/workflows/callable-ci-docs-shim.yaml@164ce64c5cc775193a563db7e8ef9750ffefcdda # v1.3.0
uses: defenseunicorns/uds-common/.github/workflows/callable-ci-docs-shim.yaml@a94be6798ba20e2d23fe16afc6578e442e55fb0a # v1.5.1
with:
flavor: ${{ matrix.flavor }}
type: ${{ matrix.type }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/commitlint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ permissions:

jobs:
validate:
uses: defenseunicorns/uds-common/.github/workflows/callable-commitlint.yaml@164ce64c5cc775193a563db7e8ef9750ffefcdda # v1.3.0
uses: defenseunicorns/uds-common/.github/workflows/callable-commitlint.yaml@a94be6798ba20e2d23fe16afc6578e442e55fb0a # v1.5.1
4 changes: 2 additions & 2 deletions .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -15,5 +15,5 @@ permissions:

jobs:
validate:
uses: defenseunicorns/uds-common/.github/workflows/callable-lint.yaml@164ce64c5cc775193a563db7e8ef9750ffefcdda # v1.3.0
uses: defenseunicorns/uds-common/.github/workflows/callable-lint.yaml@a94be6798ba20e2d23fe16afc6578e442e55fb0a # v1.5.1
secrets: inherit
21 changes: 4 additions & 17 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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@164ce64c5cc775193a563db7e8ef9750ffefcdda # v1.3.0
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.
2 changes: 1 addition & 1 deletion .github/workflows/scorecard.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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@164ce64c5cc775193a563db7e8ef9750ffefcdda # v1.3.0
uses: defenseunicorns/uds-common/.github/workflows/callable-scorecard.yaml@a94be6798ba20e2d23fe16afc6578e442e55fb0a # v1.5.1
secrets: inherit
10 changes: 5 additions & 5 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -18,8 +18,7 @@ on:
- docs/**
- .gitignore
- renovate.json
- .release-please-config.json
- release-please-config.json
- releaser.yaml
- CODEOWNERS
- LICENSE
- CONTRIBUTING.md
Expand All @@ -44,7 +43,7 @@ jobs:
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

- name: test-flavor
uses: defenseunicorns/uds-common/.github/actions/test-flavor@164ce64c5cc775193a563db7e8ef9750ffefcdda # v1.3.0
uses: defenseunicorns/uds-common/.github/actions/test-flavor@a94be6798ba20e2d23fe16afc6578e442e55fb0a # v1.5.1
id: test-flavor
outputs:
upgrade-flavors: ${{ steps.test-flavor.outputs.upgrade-flavors }}
Expand All @@ -56,9 +55,10 @@ jobs:
matrix:
type: [install, upgrade]
flavor: [upstream, registry1, unicorn]
uses: defenseunicorns/uds-common/.github/workflows/callable-test.yaml@164ce64c5cc775193a563db7e8ef9750ffefcdda # v1.3.0
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.
3 changes: 0 additions & 3 deletions .release-please-manifest.json

This file was deleted.

8 changes: 2 additions & 6 deletions bundle/uds-bundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,12 @@ kind: UDSBundle
metadata:
name: minio-test
description: A UDS Bundle for minio operator (+tenant)
# x-release-please-start-version
version: 6.0.4-uds.2
# x-release-please-end
version: dev

packages:
- name: minio-operator
path: ../
# x-release-please-start-version
ref: 6.0.4-uds.2
# x-release-please-end
ref: dev
overrides:
minio-operator:
uds-minio-config:
Expand Down
2 changes: 1 addition & 1 deletion common/zarf.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright 2024 Defense Unicorns
# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial

# yaml-language-server: $schema=https://raw.githubusercontent.com/defenseunicorns/zarf/v0.43.1/zarf.schema.json
# yaml-language-server: $schema=https://raw.githubusercontent.com/defenseunicorns/zarf/v0.44.0/zarf.schema.json
kind: ZarfPackageConfig

metadata:
Expand Down
24 changes: 0 additions & 24 deletions release-please-config.json

This file was deleted.

13 changes: 13 additions & 0 deletions releaser.yaml
Original file line number Diff line number Diff line change
@@ -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=quay.io/minio/operator extractVersion=^v?(?<version>\d+\.\d+\.\d+)$
version: 6.0.4-uds.3
- name: registry1
# renovate-uds: datasource=docker depName=registry1.dso.mil/ironbank/opensource/minio/operator extractVersion=^v?(?<version>\d+\.\d+\.\d+)$
version: 6.0.4-uds.3
- name: unicorn
# renovate-uds: datasource=docker depName=cgr.dev/du-uds-defenseunicorns/minio-operator-fips
version: 6.0.4-uds.3
24 changes: 10 additions & 14 deletions tasks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@

includes:
- test: ./tasks/test.yaml
- create: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.3.0/tasks/create.yaml
- publish: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.3.0/tasks/publish.yaml
- lint: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.3.0/tasks/lint.yaml
- pull: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.3.0/tasks/pull.yaml
- deploy: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.3.0/tasks/deploy.yaml
- setup: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.3.0/tasks/setup.yaml
- actions: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.3.0/tasks/actions.yaml
- badge: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.3.0/tasks/badge.yaml
- upgrade: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.3.0/tasks/upgrade.yaml
- compliance: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.3.0/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
Expand Down Expand Up @@ -75,7 +75,3 @@ tasks:
- task: create-deploy-test-bundle
- description: Publish the package
task: publish:package
with:
# x-release-please-start-version
version: "6.0.4-uds.2"
# x-release-please-end
5 changes: 1 addition & 4 deletions zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,7 @@ kind: ZarfPackageConfig
metadata:
name: minio-operator
description: "UDS Minio Operator Package"
# x-release-please-start-version
version: "6.0.4-uds.2"
# x-release-please-end

version: "dev"

variables:
- name: TENANT
Expand Down

0 comments on commit 3f6134a

Please sign in to comment.