chore: Use the generated CSV manifest under bundle/rhdh as source of truth for RHDH [RHIDP-2387]
#617
Conversation
rm3l
force-pushed
the
RHIDP-2387--generate-bundle-csv-for-rhdh
branch
from
a3a4dcd to
5a541e2
Compare
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
Co-authored-by: Gennady Azarenkov <[email protected]>
…r Deployment It does not seem relevant for non-OLM deployments. Co-authored-by: Gennady Azarenkov <[email protected]>
This hopefully makes it more legible and easier to maintain. Co-authored-by: Gennady Azarenkov <[email protected]>
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: gazarenkov The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
The "PR Bundle Diff checker" CI Workflow is failing (https://github.com/redhat-developer/rhdh-operator/actions/runs/12764513880/job/35576833816?pr=617): This Workflow runs in the context of the base branch. But the file that it is trying to use (.rhdh/bundle/manifests/rhdh-operator.clusterserviceversion.yaml) has been removed in this PR. The workflow has been updated accordingly as part of this PR. /override "PR Bundle Diff" |
|
@rm3l: Overrode contexts on behalf of rm3l: PR Bundle Diff In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. |
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-upgrade IMG=quay.io/rhdh-community/operator:0.5.0-pr-617-ae1e657should pass.To test the downstream bundle:
operator-sdk:The bundle should be deployed and the operator should be running:
Logs