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: #284 #978

Merged
merged 1 commit into from
Aug 5, 2024

Conversation

magic-mirror-bot[bot]
Copy link

The stale cached decryption key detection logic was not 100% accurate, so
just use the controller-runtime cache every time.

Relates:
https://issues.redhat.com/browse/ACM-11497

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

openshift-ci bot commented Aug 5, 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 yiraechristinekim 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

@mprahl
Copy link
Contributor

mprahl commented Aug 5, 2024

/cherry-pick release-2.11

@openshift-cherrypick-robot

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

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.

Copy link

sonarqubecloud bot commented Aug 5, 2024

@magic-mirror-bot magic-mirror-bot bot merged commit 841fce0 into main Aug 5, 2024
14 of 15 checks passed
@magic-mirror-bot magic-mirror-bot bot deleted the magic-mirror-main-1722879276057 branch August 5, 2024 18:32
@openshift-cherrypick-robot

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

Applying: Use the controller-runtime cache to get the decryption key
Using index info to reconstruct a base tree...
M	controllers/configurationpolicy_controller.go
M	controllers/encryption.go
M	controllers/encryption_test.go
M	main.go
Falling back to patching base and 3-way merge...
Auto-merging main.go
Auto-merging controllers/encryption_test.go
CONFLICT (content): Merge conflict in controllers/encryption_test.go
Auto-merging controllers/encryption.go
CONFLICT (content): Merge conflict in controllers/encryption.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 Use the controller-runtime cache to get the decryption key
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.

2 participants