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/governance-policy-propagator: #180 #566

Merged
merged 2 commits into from
Feb 15, 2024

Conversation

magic-mirror-bot[bot]
Copy link
Contributor

Signed-off-by: Dale Haiducek <[email protected]>
(cherry picked from commit 78839d2)
With a PlacementBinding containing an invalid
placementRef, the propagator was returning an
error and endlessly re-reconciling. This occurs
even if the PlacementBinding was not bound to the
Policy.

ref: https://issues.redhat.com/browse/ACM-9930

Signed-off-by: Dale Haiducek <[email protected]>
(cherry picked from commit 41176f2)
Copy link

openshift-ci bot commented Feb 15, 2024

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: magic-mirror-bot[bot]
Once this PR has been reviewed and has the lgtm label, please assign gparvin for approval. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found 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

Copy link

@magic-mirror-bot magic-mirror-bot bot merged commit b79890f into main Feb 15, 2024
17 of 18 checks passed
@magic-mirror-bot magic-mirror-bot bot deleted the magic-mirror-main-1707961944467 branch February 15, 2024 02:17
@dhaiducek
Copy link
Contributor

/cherry-pick release-2.9

@openshift-cherrypick-robot

@dhaiducek: #566 failed to apply on top of branch "release-2.9":

Applying: Update PlacementBinding messages to use ns/name
Using index info to reconstruct a base tree...
M	controllers/common/common.go
M	controllers/common/common_status_update.go
Falling back to patching base and 3-way merge...
Auto-merging controllers/common/common_status_update.go
Auto-merging controllers/common/common.go
Applying: Fix status update with faulty PlacementBinding
Using index info to reconstruct a base tree...
M	controllers/common/common.go
M	controllers/common/common_status_update.go
M	test/e2e/case2_aggregation_test.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/case2_aggregation_test.go
CONFLICT (content): Merge conflict in test/e2e/case2_aggregation_test.go
Auto-merging controllers/common/common_status_update.go
CONFLICT (content): Merge conflict in controllers/common/common_status_update.go
Auto-merging controllers/common/common.go
CONFLICT (content): Merge conflict in controllers/common/common.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 Fix status update with faulty PlacementBinding
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.9

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.

2 participants