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

[release-2.9] Cherry-pick: Fix handling of undefined fields for mustonlyhave #801

Merged

Conversation

dhaiducek
Copy link
Contributor

The function the code was put in was refactored, but I think I found where it was refactored from...

Manual cherry-pick of commit from:

Signed-off-by: Dale Haiducek <19750917+dhaiducek@users.noreply.github.com>
(cherry picked from commit 7c98e1d57b3b88f781e177e7a7571d6bdca35fb1)
@dhaiducek
Copy link
Contributor Author

This cherry-pick also isn't mandatory per se since the Jira was never actually attached to the support case for 2.9, but might as well do my due diligence?

@mprahl
Copy link
Contributor

mprahl commented Apr 15, 2024

@dhaiducek could you please fix the linting error?

mprahl
mprahl previously approved these changes Apr 15, 2024
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: Dale Haiducek <19750917+dhaiducek@users.noreply.github.com>
@openshift-ci openshift-ci bot added the lgtm label Apr 15, 2024
Copy link

openshift-ci bot commented Apr 15, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dhaiducek, mprahl

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

Copy link

sonarcloud bot commented Apr 15, 2024

@openshift-merge-bot openshift-merge-bot bot merged commit 13b0f4b into stolostron:release-2.9 Apr 15, 2024
13 checks passed
@dhaiducek dhaiducek deleted the cherry-pick-mustnothave branch April 15, 2024 14:57
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.

None yet

2 participants