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: #279, #283 #974

Merged
merged 8 commits into from
Aug 2, 2024

Conversation

dhaiducek and others added 8 commits August 2, 2024 20:41
Signed-off-by: Dale Haiducek <[email protected]>
(cherry picked from commit 654baf3)
Signed-off-by: Dale Haiducek <[email protected]>
(cherry picked from commit 40c4a77)
Includes:
- `wait=false` to skip waiting for finalizers
- `ignore-not-found` to ignore not found errors

Signed-off-by: Dale Haiducek <[email protected]>
(cherry picked from commit 396361c)
Does the compliance check directly, providing
the status message on failure.

Signed-off-by: Dale Haiducek <[email protected]>
(cherry picked from commit 611e94e)
Signed-off-by: Dale Haiducek <[email protected]>
(cherry picked from commit 053a944)
Signed-off-by: Dale Haiducek <[email protected]>
(cherry picked from commit 0a0193e)
Signed-off-by: mprahl <[email protected]>
(cherry picked from commit ee76c2f)
If no namespace or namespace selector was specified and a new namespace
was later created, the NamespaceSelectorReconciler would erroneously
update its namespace selector cache for that policy to be all
namespaces.

Signed-off-by: mprahl <[email protected]>
(cherry picked from commit e150fdc)
Copy link

sonarcloud bot commented Aug 2, 2024

Copy link

openshift-ci bot commented Aug 2, 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 Aug 2, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit 82082e6 into main Aug 2, 2024
15 checks passed
@openshift-merge-bot openshift-merge-bot bot deleted the magic-mirror-main-1722631285406 branch August 2, 2024 21:49
@mprahl
Copy link
Contributor

mprahl commented Aug 5, 2024

/cherry-pick release-2.11

@openshift-cherrypick-robot

@mprahl: #974 failed to apply on top of branch "release-2.11":

Applying: Remove unused `Pause()` util function
Applying: Add missing cleanup commands
Applying: Add `KubectlDelete()` with common flags
Using index info to reconstruct a base tree...
M	test/e2e/case12_list_compare_test.go
M	test/e2e/case13_templatization_test.go
M	test/e2e/case26_user_error_metric_test.go
M	test/e2e/case27_showupdateinstatus_test.go
M	test/e2e/case37_no_name_test.go
M	test/e2e/case38_install_operator_test.go
M	test/e2e/case39_diff_generation_test.go
M	test/e2e/case8_status_check_test.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/case8_status_check_test.go
Auto-merging test/e2e/case39_diff_generation_test.go
Auto-merging test/e2e/case38_install_operator_test.go
Auto-merging test/e2e/case37_no_name_test.go
Auto-merging test/e2e/case27_showupdateinstatus_test.go
Auto-merging test/e2e/case26_user_error_metric_test.go
CONFLICT (content): Merge conflict in test/e2e/case26_user_error_metric_test.go
Auto-merging test/e2e/case13_templatization_test.go
Auto-merging test/e2e/case12_list_compare_test.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0003 Add `KubectlDelete()` with common flags
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.11

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: #279, #283
3 participants