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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

馃 Sync from open-cluster-management-io/config-policy-controller: #223, #226 #797

Merged
merged 3 commits into from
Apr 11, 2024

Conversation

dhaiducek and others added 3 commits April 11, 2024 16:45
Signed-off-by: Dale Haiducek <19750917+dhaiducek@users.noreply.github.com>
(cherry picked from commit 7c98e1d57b3b88f781e177e7a7571d6bdca35fb1)
If a field exists in the object but wasn't defined
for a mustonlyhave policy, we need to check the
existing object's fields and set them accordingly,
particularly to set them to null.

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

Co-authored-by: Matt Prahl <mprahl@users.noreply.github.com>
Signed-off-by: Dale Haiducek <19750917+dhaiducek@users.noreply.github.com>
(cherry picked from commit 5f1d26aa4093c5e24112123eab01354930d943db)
Signed-off-by: mprahl <mprahl@users.noreply.github.com>
(cherry picked from commit c7624121c0d12c79934a8f115695ce080e69ccac)
Copy link

sonarcloud bot commented Apr 11, 2024

Copy link

openshift-ci bot commented Apr 11, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: JustinKuli, 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-merge-bot openshift-merge-bot bot merged commit 2d235e2 into main Apr 11, 2024
14 checks passed
@openshift-merge-bot openshift-merge-bot bot deleted the magic-mirror-main-1712853899140 branch April 11, 2024 17:22
@mprahl
Copy link
Contributor

mprahl commented Apr 11, 2024

/cherry-pick release-2.10

@openshift-cherrypick-robot

@mprahl: new pull request created: #800

In response to this:

/cherry-pick release-2.10

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.

馃樋 Failed to sync the upstream PRs: #223, #226 馃樋 Failed to sync the upstream PRs: #223, #226
4 participants