Skip to content

Fix OperatorPolicy cleanup commands #743

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

Merged
merged 1 commit into from
Mar 4, 2024

Conversation

dhaiducek
Copy link
Contributor

@openshift-ci openshift-ci bot requested review from gparvin and JustinKuli March 4, 2024 15:07
@openshift-ci openshift-ci bot added the approved label Mar 4, 2024
@dhaiducek dhaiducek force-pushed the olm-cleanup branch 2 times, most recently from 21668fc to 7510748 Compare March 4, 2024 15:53
@dhaiducek dhaiducek changed the title Clean up all CSV for clusterwide operator Fix OperatorPolicy cleanup commands Mar 4, 2024
Signed-off-by: Dale Haiducek <19750917+dhaiducek@users.noreply.github.com>
Copy link

openshift-ci bot commented Mar 4, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dhaiducek, gparvin, mprahl

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 [dhaiducek,gparvin,mprahl]

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

@openshift-merge-bot openshift-merge-bot bot merged commit 1dcc9c3 into stolostron:main Mar 4, 2024
@zyjjay
Copy link
Contributor

zyjjay commented Mar 21, 2024

/cherry-pick release-2.10

@openshift-cherrypick-robot

@zyjjay: #743 failed to apply on top of branch "release-2.10":

Applying: Specify full path for Operator subscription
Using index info to reconstruct a base tree...
A	test/integration/policy_install_operator_test.go
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): test/integration/policy_install_operator_test.go deleted in HEAD and modified in Specify full path for Operator subscription. Version Specify full path for Operator subscription of test/integration/policy_install_operator_test.go 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 0001 Specify full path for Operator subscription
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-2.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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants