Closed coleenquadros closed 1 month ago
[APPROVALNOTIFIER] This PR is APPROVED
This pull-request has been approved by: coleenquadros, subbarao-meduri
The full list of commands accepted by this bot can be found here.
The pull request process is described here
/retest
New changes are detected. LGTM label has been removed.
Issues
3 New issues
0 Accepted issues
Measures
0 Security Hotspots
96.6% Coverage on New Code
0.0% Duplication on New Code
/retest
/retest
/retest
/retest
/retest
/retest
/test test-e2e
/test test-e2e
/cherrypick release-2.11
/cherrypick release-2.10
/cherrypick release-2.11
@coleenquadros: new pull request created: #1640
/cherrypick release-2.10
@coleenquadros: #1637 failed to apply on top of branch "release-2.10":
Applying: make sure local cluster is part of list all the time
Using index info to reconstruct a base tree...
M operators/multiclusterobservability/controllers/placementrule/placementrule_controller.go
M operators/multiclusterobservability/controllers/placementrule/predicate_func.go
Falling back to patching base and 3-way merge...
Auto-merging operators/multiclusterobservability/controllers/placementrule/predicate_func.go
Auto-merging operators/multiclusterobservability/controllers/placementrule/placementrule_controller.go
CONFLICT (content): Merge conflict in operators/multiclusterobservability/controllers/placementrule/placementrule_controller.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 make sure local cluster is part of list all the time
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".
managedcluster
list and not depend on the CRUD events of the Managedcluster resource because whendisableHubSelfManagement: true
, the resource for local-cluster will not be created.