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

fix: Don't panic on multiple $patch: delete strategic merge patches in a single patch file #5859

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

tdemin
Copy link

@tdemin tdemin commented Feb 8, 2025

Fixes #5552.

Removing a resource entirely with a $patch: delete patch internally yields a resource that has no content (and hence no GVKNN), so calls to (*resource.Resource).CurId() would panic.

@k8s-ci-robot
Copy link
Contributor

This PR has multiple commits, and the default merge method is: merge.
You can request commits to be squashed using the label: tide/merge-method-squash

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

linux-foundation-easycla bot commented Feb 8, 2025

CLA Signed


The committers listed above are authorized under a signed CLA.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. label Feb 8, 2025
@k8s-ci-robot
Copy link
Contributor

Welcome @tdemin!

It looks like this is your first PR to kubernetes-sigs/kustomize 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes-sigs/kustomize has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Feb 8, 2025
@k8s-ci-robot
Copy link
Contributor

Hi @tdemin. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: tdemin
Once this PR has been reviewed and has the lgtm label, please assign knverey for approval. For more information see the 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

@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Feb 8, 2025
@tdemin tdemin changed the title fix: Don't panic on multiple $patch: delete strategic merge patches in one patch file fix: Don't panic on multiple $patch: delete strategic merge patches in a single patch file Feb 8, 2025
@tdemin

This comment was marked as resolved.

@k8s-ci-robot k8s-ci-robot removed the request for review from ncapps February 12, 2025 17:27
@tdemin

This comment was marked as resolved.

@k8s-ci-robot k8s-ci-robot requested a review from koba1t February 12, 2025 17:27
@koba1t
Copy link
Member

koba1t commented Feb 16, 2025

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Feb 16, 2025
@koba1t koba1t added the tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. label Feb 16, 2025
@koba1t
Copy link
Member

koba1t commented Feb 16, 2025

Hi @tdemin
I appreciate for taking the problem that was abandoned for a long time!

So, According to the test in my local PC, func TestSinglePatchWithMultiplePatchDeleteDirectives(t *testing.T) was passed even if there were no modifications to the code.
Could you rewrite the test case to detect regression to prevent this bug from recurring?

FYI, This sentence might be helpful.
https://github.com/kubernetes-sigs/kustomize/blob/master/CONTRIBUTING.md#reviewer-guide

- The PR should have two distinct commits:
  - The first commit should add a test demonstrating incorrect behavior
  - The second commit should include the bug fix

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

patches cause an error with $patch:delete in files with multiple patches
3 participants