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: #115 #460

Merged
merged 1 commit into from
Apr 3, 2023

Conversation

Signed-off-by: Yi Rae Kim <yikim@redhat.com>
(cherry picked from commit d360337)
@openshift-ci
Copy link

openshift-ci bot commented Apr 3, 2023

[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 justinkuli 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

@sonarcloud
Copy link

sonarcloud bot commented Apr 3, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

100.0% 100.0% Coverage
0.0% 0.0% Duplication

@magic-mirror-bot magic-mirror-bot bot merged commit a196ea8 into main Apr 3, 2023
@magic-mirror-bot magic-mirror-bot bot deleted the magic-mirror-main-1680541369568 branch April 3, 2023 18:09
@yiraeChristineKim
Copy link
Contributor

/cherry-pick release-2.7

@openshift-cherrypick-robot

@yiraeChristineKim: new pull request created: #461

In response to this:

/cherry-pick release-2.7

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.

@yiraeChristineKim
Copy link
Contributor

/cherry-pick release-2.6

@openshift-cherrypick-robot

@yiraeChristineKim: #460 failed to apply on top of branch "release-2.6":

Applying: rebase
Using index info to reconstruct a base tree...
M	controllers/configurationpolicy_controller.go
M	controllers/configurationpolicy_controller_test.go
M	controllers/configurationpolicy_utils.go
M	test/e2e/case20_delete_objects_test.go
M	test/e2e/e2e_suite_test.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/e2e_suite_test.go
Auto-merging test/e2e/case20_delete_objects_test.go
CONFLICT (content): Merge conflict in test/e2e/case20_delete_objects_test.go
Auto-merging controllers/configurationpolicy_utils.go
Auto-merging controllers/configurationpolicy_controller_test.go
CONFLICT (content): Merge conflict in controllers/configurationpolicy_controller_test.go
Auto-merging controllers/configurationpolicy_controller.go
CONFLICT (content): Merge conflict in controllers/configurationpolicy_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 rebase
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.6

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