bundle: remove rook as a dependency to allow upgrades from 4.15 to 4.16

[iamniting]

In older clusters, upgrading the odf channel from 4.15 to 4.16 tries to bring the rook-operator, leading to conflicts with ocs-operator 4.15, which already contains all Rook components in its 4.15 CSV. This conflict results in upgrade failures.

To address this issue, the Rook dependency is removed from the odf-operator and added to the ocs-operator. This solution ensures a smooth upgrade process, as changing the ocs-operator channel will now bring Rook along with ocs-operator 4.16 without encountering conflicts.

This commit should be reverted in 4.17 as 4.16 will feature different CSVs. In 4.17, reintroducing Rook as a dependency in odf should facilitate smooth installations and upgrades.

Signed-off-by: Nitin Goyal [email protected]

Bugs:
https://bugzilla.redhat.com/show_bug.cgi?id=2275456
https://bugzilla.redhat.com/show_bug.cgi?id=2275484

[iamniting]

/test odf-operator-e2e-aws

[iamniting]

/cherry-pick release-4.16

[openshift-cherrypick-robot]

@iamniting: once the present PR merges, I will cherry-pick it on top of release-4.16 in a new PR and assign it to you.

In response to this:

/cherry-pick release-4.16

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/test-infra repository.

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: iamniting, malayparida2000

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:

• OWNERS [iamniting]

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

[openshift-cherrypick-robot]

@iamniting: #399 failed to apply on top of branch "release-4.16":

Applying: bundle: remove rook as a dependency to allow upgrades from 4.15 to 4.16
Applying: makefile: update rook-ceph-operator bundle image
Using index info to reconstruct a base tree...
A	catalog/rook.yaml
M	hack/make-bundle-vars.mk
Falling back to patching base and 3-way merge...
Auto-merging hack/make-bundle-vars.mk
CONFLICT (modify/delete): catalog/rook.yaml deleted in HEAD and modified in makefile: update rook-ceph-operator bundle image. Version makefile: update rook-ceph-operator bundle image of catalog/rook.yaml left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 makefile: update rook-ceph-operator bundle image
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-4.16

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/test-infra repository.