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

[WIP] chore: Align the CSV manifest under bundle/rhdh with the one in .rhdh and remove the latter [RHIDP-2387] #617

Draft
wants to merge 26 commits into
base: main
Choose a base branch
from

Conversation

rm3l
Copy link
Member

@rm3l rm3l commented Jan 3, 2025

Description

We had a bunch of CSVs related to RHDH, which could cause confusion. This PR makes the one under bundle/rhdh the source of truth (generated using make bundle) and removes the one under .rhdh.

TODO: We need to update the downstream pipelines to use the CSV under bundle/rhdh.

Which issue(s) does this PR fix or relate to

PR acceptance criteria

How to test changes / Special notes to the reviewer

TODO

Copy link

openshift-ci bot commented Jan 3, 2025

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please ask for approval from rm3l. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@rm3l rm3l force-pushed the RHIDP-2387--generate-bundle-csv-for-rhdh branch from a3a4dcd to 5a541e2 Compare January 3, 2025 22:50
Makefile Outdated Show resolved Hide resolved
Makefile Outdated Show resolved Hide resolved
Makefile Outdated
@sed -i 's/-controller-manager/-operator/g' ./bundle/$(PROFILE)/manifests/*.yaml
@sed -i 's/: controller-manager/: $(PROFILE_SHORT)-operator/g' ./bundle/$(PROFILE)/manifests/*.yaml
@sed -i 's/backstage-operator/$(PROFILE_SHORT)-operator/g' ./bundle/$(PROFILE)/manifests/*.yaml
@mv -f ./bundle/$(PROFILE)/manifests/backstage-operator.clusterserviceversion.yaml ./bundle/$(PROFILE)/manifests/$(PROFILE)-operator.clusterserviceversion.yaml
Copy link
Member

@gazarenkov gazarenkov Jan 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it really necessary to concatenate the file name with $(PROFILE), like: $(PROFILE)-operator.clusterserviceversion.yaml , maybe better leave it predefined as operator.clusterserviceversion.yaml (for example), same way as for other files? Can we do it?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, we can do that. No strong opinion. Let me look into that.

rm3l and others added 18 commits January 6, 2025 23:31
That is, RHDH 1.5.0 corresponds to the 0.5.0 version of this project
For now, the diff against the CSV under .rhdh is kept,
but it should ultimately be dropped.
…layName}` fields in the RHDH CSV

Ideally, this should be generated from the //+operator-sdk:csv:customresourcedefinitions marker comments (via the "$(OPERATOR_SDK) generate kustomize manifests" command), but it doesn't seem possible as our custom CSV file is supposed to contain a lot more data.
Co-authored-by: Gennady Azarenkov <[email protected]>
@rm3l rm3l force-pushed the RHIDP-2387--generate-bundle-csv-for-rhdh branch from 95fca4c to a92a26c Compare January 7, 2025 13:29
@rm3l rm3l force-pushed the RHIDP-2387--generate-bundle-csv-for-rhdh branch from a92a26c to 8997860 Compare January 7, 2025 13:47
@rm3l rm3l force-pushed the RHIDP-2387--generate-bundle-csv-for-rhdh branch from 6e92c61 to 34d51a1 Compare January 7, 2025 16:48
@rm3l rm3l force-pushed the RHIDP-2387--generate-bundle-csv-for-rhdh branch from 34d51a1 to 7fdcdd7 Compare January 7, 2025 16:56
@rm3l rm3l force-pushed the RHIDP-2387--generate-bundle-csv-for-rhdh branch from 7fdcdd7 to 6cff745 Compare January 7, 2025 17:08
It is PROJECT_NAME.VERSION by default, but for RHDH, it should be rhdh-operator.VERSION
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants