chore: Use the generated CSV manifest under bundle/rhdh as source of truth for RHDH [RHIDP-2387]
#617
+506
−685
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: 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 |
rm3l
force-pushed
the
RHIDP-2387--generate-bundle-csv-for-rhdh
branch
from
a3a4dcd to
5a541e2
Compare
gazarenkov
reviewed
Jan 4, 2025
gazarenkov
reviewed
Jan 4, 2025
gazarenkov
reviewed
Jan 4, 2025
rm3l
force-pushed
the
RHIDP-2387--generate-bundle-csv-for-rhdh
branch
from
95fca4c to
a92a26c
Compare
rm3l
force-pushed
the
RHIDP-2387--generate-bundle-csv-for-rhdh
branch
from
a92a26c to
8997860
Compare
rm3l
force-pushed
the
RHIDP-2387--generate-bundle-csv-for-rhdh
branch
from
6e92c61 to
34d51a1
Compare
rm3l
force-pushed
the
RHIDP-2387--generate-bundle-csv-for-rhdh
branch
from
34d51a1 to
7fdcdd7
Compare
rm3l
force-pushed
the
RHIDP-2387--generate-bundle-csv-for-rhdh
branch
from
7fdcdd7 to
6cff745
Compare
… under .rhdh/manifests as much as possible
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]>
It is PROJECT_NAME.VERSION by default, but for RHDH, it should be rhdh-operator.VERSION
The Workflow (executed in the context of the base branch) expects the VERSION variable to be declared differently in the Makefile [1] https://github.com/redhat-developer/rhdh-operator/actions/runs/12674100282/job/35321993883?pr=617
rm3l
force-pushed
the
RHIDP-2387--generate-bundle-csv-for-rhdh
branch
from
7f89c22 to
527572e
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
We had a bunch of CSVs related to RHDH, which could cause confusion (especially the ones under
.rhdhandbundle/rhdh):This PR makes the one under
bundle/rhdhthe source of truth and removes the one under.rhdh.To do this, it tries to rely solely on
make bundle, so that the resulting CSV and metadata underbundle/rhdhare close enough to what we previously had under.rhdh/bundle.To ensure the result is identical for non-OLM deployments, it tries to move as many things as possible into the Kustomize manifests, and also as marker comments in the code. This ensures that
make bundleis the single entrypoint to generate the bundles.Only some slight renaming is done specifically for the RHDH profile at the end of the
bundleMakefile target, to change the CSV metadata.name from the defaultbackstage-operatorintorhdh-operator.NOTE: To ensure this doesn't break the downstream pipelines, here is a corresponding MR to test this before eventually merging it: https://gitlab.cee.redhat.com/rhidp/rhdh/-/merge_requests/118
So let's keep an eye out on the build outcome in Konflux.
Which issue(s) does this PR fix or relate to
PR acceptance criteria
If the bundle manifests have been updated, make sure to review therhdh-operator.clusterserviceversion.yamlfile accordinglyHow to test changes / Special notes to the reviewer
Diffs
For your convenience:
bundle/rhdh/metadata:metadata/annotations diff
bundle/rhdh/manifests:CSV diff
Note that the images have been switched to
quay.ioby default, so that this can be easily work out of the box on non-OCP clusters and in our CI (since we are ultimately using the same Kustomize manifests for both OLM and non-OLM deployments). The images will be replaced toregistry.redhat.ioin the downstream pipelines.Testing
make test-e2e test-e2e-upgradeshould pass.To test the downstream bundle:
operator-sdk:The bundle should be deployed and the operator should be running:
Logs