Skip to content
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
9 changes: 9 additions & 0 deletions .github/workflows/nightly-upgrade-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,10 @@ jobs:
from_version:
- 1.3
- 1.4
- 1.5
to_branch:
- main
- release-1.5
- release-1.4
- release-1.3
exclude:
Expand All @@ -28,6 +30,13 @@ jobs:
- from_version: 1.4
to_branch: release-1.4

- from_version: 1.5
to_branch: release-1.3
- from_version: 1.5
to_branch: release-1.4
- from_version: 1.5
to_branch: release-1.5

name: 'E2E Upgrade: ${{ matrix.from_version }} => ${{ matrix.to_branch }}'
concurrency:
group: '${{ github.workflow }}-${{ matrix.to_branch }}-${{ matrix.from_version }}'
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/nightly.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ jobs:
matrix:
branch:
- main
- release-1.5
- release-1.4
- release-1.3
name: 'E2E Tests on ${{ matrix.branch }}'
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/pr-bundle-diff-checks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,12 @@ jobs:
- name: Check for outdated bundle or manifests
id: manifests-diff-checker
run: |
make bundles
make bundles build-installers
git status --porcelain
# Since operator-sdk 1.26.0, `make bundle` changes the `createdAt` field from the bundle every time we run it.
# The `git diff` below checks if only the createdAt field has changed. If is the only change, it is ignored.
# Inspired from https://github.com/operator-framework/operator-sdk/issues/6285#issuecomment-1415350333
echo "MANIFESTS_CHANGED=$(if git diff --quiet -I'^ createdAt: ' bundle config; then echo "false"; else echo "true"; fi)" >> $GITHUB_OUTPUT
echo "MANIFESTS_CHANGED=$(if git diff --quiet -I'^ createdAt: ' bundle config dist; then echo "false"; else echo "true"; fi)" >> $GITHUB_OUTPUT

- name: Commit any manifest changes
if: ${{ steps.manifests-diff-checker.outputs.MANIFESTS_CHANGED == 'true' }}
Expand All @@ -66,11 +66,11 @@ jobs:
git pull --rebase --autostash
git add -A .
git commit \
-m "Regenerate bundle manifests" \
-m "Regenerate bundle/installer manifests" \
-m "Co-authored-by: $GITHUB_ACTOR <$GITHUB_ACTOR@users.noreply.github.com>"
git push

- name: Comment on PR if bundle manifests were updated
- name: Comment on PR if manifests were updated
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7
if: ${{ !cancelled() && steps.manifests-diff-checker.outputs.MANIFESTS_CHANGED == 'true' }}
continue-on-error: true
Expand All @@ -82,5 +82,5 @@ jobs:
issue_number: context.issue.number,
owner: context.repo.owner,
repo: context.repo.repo,
body: '⚠️ <b>Files changed in bundle generation!</b><br/><br/>Those changes to the operator bundle manifests should have been pushed automatically to your PR branch.'
body: '⚠️ <b>Files changed in bundle and installer generation!</b><br/><br/>Those changes to the operator bundle/installer manifests should have been pushed automatically to your PR branch.'
})
10 changes: 8 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,12 @@ docker-buildx: ## Build and push docker image for the manager for cross-platform
- $(CONTAINER_TOOL) buildx rm project-v3-builder
rm -f Dockerfile.cross

.PHONY: build-installers
build-installers: ## Generate a consolidated YAML with CRDs and deployment for all available profiles.
@for profile in $(PROFILES); do \
$(MAKE) build-installer PROFILE=$$profile; \
done

.PHONY: build-installer
build-installer: manifests generate kustomize ## Generate a consolidated YAML with CRDs and deployment.
mkdir -p dist/$(PROFILE)
Expand All @@ -265,8 +271,8 @@ build-installer: manifests generate kustomize ## Generate a consolidated YAML wi

.PHONY: deployment-manifest
deployment-manifest: build-installer ## Generate manifest to deploy operator. Deprecated. Use 'make build-installer' instead.
cp -f dist/$(PROFILE)/install.yaml rhdh-operator-${VERSION}.yaml
@echo "Generated operator script rhdh-operator-${VERSION}.yaml"
cp -f dist/$(PROFILE)/install.yaml $(PROFILE)-operator-${VERSION}.yaml
@echo "Generated operator script $(PROFILE)-operator-${VERSION}.yaml"


# A comma-separated list of bundle images (e.g. make catalog-build BUNDLE_IMGS=example.com/operator-bundle:v0.1.0,example.com/operator-bundle:v0.2.0).
Expand Down
2 changes: 1 addition & 1 deletion api/v1alpha1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion api/v1alpha2/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion api/v1alpha3/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ metadata:
}
}
]
createdAt: "2025-02-11T17:40:38Z"
createdAt: "2025-02-17T10:12:56Z"
description: Backstage Operator
operators.operatorframework.io/builder: operator-sdk-v1.37.0
operators.operatorframework.io/project_layout: go.kubebuilder.io/v4
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ metadata:
categories: Developer Tools
certified: "true"
containerImage: registry.redhat.io/rhdh/rhdh-rhel9-operator:1.5
createdAt: "2025-02-11T17:40:40Z"
createdAt: "2025-02-17T10:12:59Z"
description: Red Hat Developer Hub is a Red Hat supported version of Backstage.
It comes with pre-built plug-ins and configuration settings, supports use of
an external database, and can help streamline the process of setting up a self-managed
Expand Down
Loading