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

bundle: Add csi-addons to the dependencies.yaml #221

Merged
merged 2 commits into from Jun 3, 2022

Conversation

iamniting
Copy link
Member

csi-addons resolution gets fail when user uses the custom catalog
source as it is not specified in the dependencies.yaml and the sub is
not created via OLM. The sub is created by the odf directly which does
not have a knowledge about the custom catalog source and it is still
pointing to the redhat-operators in the openshift-marketplace namespace.

Managing there own catalog source is seen very offently now a days as it
is MS and disconnected ENV usecase.

Signed-off-by: Nitin Goyal nigoyal@redhat.com

https://bugzilla.redhat.com/show_bug.cgi?id=2056697

@iamniting iamniting requested a review from jarrpa May 30, 2022 14:52
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 30, 2022
csi-addons resolution gets fail when user uses the custom catalog
source as it is not specified in the dependencies.yaml and the sub is
not created via OLM. The sub is created by the odf directly which does
not have a knowledge about the custom catalog source and it is still
pointing to the redhat-operators in the openshift-marketplace namespace.

Managing there own catalog source is seen very offently now a days as it
is MS and disconnected ENV usecase.

Signed-off-by: Nitin Goyal <nigoyal@redhat.com>
Add the Config to the subscription if it already exist.

Signed-off-by: Nitin Goyal <nigoyal@redhat.com>
@iamniting
Copy link
Member Author

/test odf-operator-bundle-e2e-aws

@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 30, 2022

@iamniting: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/odf-operator-bundle-e2e-aws cfa08d0 link false /test odf-operator-bundle-e2e-aws

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

@iamniting iamniting added backport-release-4.10 Indicate PR requires to be backported backport-release-4.11 Indicate PR requires to be backported labels Jun 1, 2022
@iamniting
Copy link
Member Author

/cherry-pick release-4.11

@openshift-cherrypick-robot

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

In response to this:

/cherry-pick release-4.11

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.

Copy link
Member

@agarwal-mudit agarwal-mudit left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jun 3, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 3, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: agarwal-mudit, iamniting

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 [agarwal-mudit,iamniting]

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

@openshift-merge-robot openshift-merge-robot merged commit 7d9c302 into red-hat-storage:main Jun 3, 2022
16 of 17 checks passed
@openshift-cherrypick-robot

@iamniting: new pull request created: #224

In response to this:

/cherry-pick release-4.11

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.

@iamniting
Copy link
Member Author

/cherry-pick release-4.10

@openshift-cherrypick-robot

@iamniting: #221 failed to apply on top of branch "release-4.10":

Applying: bundle: Add csi-addons to the dependencies.yaml
Using index info to reconstruct a base tree...
M	bundle/metadata/dependencies.yaml
Falling back to patching base and 3-way merge...
Auto-merging bundle/metadata/dependencies.yaml
CONFLICT (content): Merge conflict in bundle/metadata/dependencies.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 bundle: Add csi-addons to the dependencies.yaml
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.10

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. backport-release-4.10 Indicate PR requires to be backported backport-release-4.11 Indicate PR requires to be backported lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants