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

🤖 Sync from open-cluster-management-io/config-policy-controller: #259 #886

Merged
merged 1 commit into from
Jun 1, 2024

Conversation

magic-mirror-bot[bot]
Copy link

@magic-mirror-bot magic-mirror-bot bot commented May 31, 2024

Always having a clusterwide watch is incompatible with hosted mode and
does not match ConfigurationPolicy.

Related:
https://issues.redhat.com/browse/ACM-11952

Signed-off-by: mprahl <mprahl@users.noreply.github.com>
(cherry picked from commit 324a374)
@mprahl
Copy link
Contributor

mprahl commented May 31, 2024

/cherry-pick release-2.10

@openshift-cherrypick-robot

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

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-sigs/prow repository.

Copy link

openshift-ci bot commented Jun 1, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dhaiducek, magic-mirror-bot[bot]

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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved label Jun 1, 2024
Copy link

sonarcloud bot commented Jun 1, 2024

@openshift-merge-bot openshift-merge-bot bot merged commit 82d77c4 into main Jun 1, 2024
13 checks passed
@openshift-merge-bot openshift-merge-bot bot deleted the magic-mirror-main-1717189092218 branch June 1, 2024 17:49
@openshift-cherrypick-robot

@mprahl: #886 failed to apply on top of branch "release-2.10":

Applying: Limit the OperatorPolicy watches to the managed cluster namespace
Using index info to reconstruct a base tree...
M	main.go
M	test/e2e/case38_install_operator_test.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/case38_install_operator_test.go
CONFLICT (content): Merge conflict in test/e2e/case38_install_operator_test.go
Auto-merging main.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Limit the OperatorPolicy watches to the managed cluster namespace
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-sigs/prow 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.

😿 Failed to sync the upstream PRs: #259
3 participants