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

tdemin · 2025-02-08T19:42:12Z

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 · 2025-02-08T19:42:15Z

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.

linux-foundation-easycla · 2025-02-08T19:42:17Z

The committers listed above are authorized under a signed CLA.

✅ login: tdemin / name: Timur Demin (bc2ac2c, 640f31f)

k8s-ci-robot · 2025-02-08T19:42:21Z

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 · 2025-02-08T19:42:22Z

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.

koba1t · 2025-02-16T00:53:21Z

/ok-to-test

koba1t · 2025-02-16T21:24:14Z

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

tdemin · 2025-03-09T16:14:41Z

@koba1t sorry for taking a while to get back to this 🫠

Apparently patchesStrategicMerge (which is what makeCommonFilesForMultiplePatchTests yields) doesn't reproduce the issue, but patches does. I rewrote the test to generate a Kustomization with patches.

I also reordered the commits and rebased against the current master.

stormqueen1990

/lgtm

koba1t · 2025-03-28T12:53:19Z

@tdemin
I reproduced the test failure.
Looks good to me!

Thanks for your contribution!

/approve

k8s-ci-robot · 2025-03-28T12:53:31Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: koba1t, tdemin

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:

~~OWNERS~~ [koba1t]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

This MR contains the following updates: | Package | Update | Change | |---|---|---| | [kubernetes-sigs/kustomize](https://github.com/kubernetes-sigs/kustomize) | minor | `v5.6.0` -> `v5.7.0` | MR created with the help of [el-capitano/tools/renovate-bot](https://gitlab.com/el-capitano/tools/renovate-bot). **Proposed changes to behavior should be submitted there as MRs.** --- ### Release Notes <details> <summary>kubernetes-sigs/kustomize (kubernetes-sigs/kustomize)</summary> ### [`v5.7.0`](https://github.com/kubernetes-sigs/kustomize/releases/tag/kustomize/v5.7.0) [Compare Source](kubernetes-sigs/kustomize@kustomize/v5.6.0...kustomize/v5.7.0) #### Feature kubernetes-sigs/kustomize#5630: Add static value source for replacement kubernetes-sigs/kustomize#5921: feat: Add images suport for Image Volumes kubernetes-sigs/kustomize#5771: fix: Allow patches with empty files with multiple newlines or comments kubernetes-sigs/kustomize#5865: feat(helm): allow the use of devel alias for helmcharts #### fix kubernetes-sigs/kustomize#5846: fix: Get version from the BuildInfo.Main.Version if not found in deps and build flag kubernetes-sigs/kustomize#5859: fix: Don't panic on multiple $patch: delete strategic merge patches in a single patch file kubernetes-sigs/kustomize#5877: fix: make private one field in replacements transformer struct that had a missing JSON tag #### Dependencies [#5847](kubernetes-sigs/kustomize#5847): replace deplecated package github.com/google/shlex with github.com/carapace-sh/carapace-shlex [#5873](kubernetes-sigs/kustomize#5873): Bump to github.com/spf13/viper v1.20.0 [#5931](kubernetes-sigs/kustomize#5931): Drop usage of forked copies of goyaml.v2 and goyaml.v3 #### chore kubernetes-sigs/kustomize#5882: Set Git messages to English for TestRemoteLoad\_LocalProtocol [#5934](kubernetes-sigs/kustomize#5934): Update kyaml to v0.20.0 [#5935](kubernetes-sigs/kustomize#5935): Update cmd/config to v0.20.0 [#5936](kubernetes-sigs/kustomize#5936): Update api to v0.20.0 </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever MR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this MR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this MR, check this box --- This MR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).

…n a single patch file (kubernetes-sigs#5859) * chore: add test for multiple $patch: delete patches not panicking * fix: don't panic on multiple deletion SM patches

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 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 requested review from ncapps and stormqueen1990 February 8, 2025 19:42

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 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

This comment was marked as resolved.

Sign in to view

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

This comment was marked as resolved.

Sign in to view

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

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 added the tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. label Feb 16, 2025

tdemin force-pushed the master branch from 7165d72 to 9f7b463 Compare March 9, 2025 16:08

tdemin added 2 commits March 9, 2025 21:08

chore: add test for multiple $patch: delete patches not panicking

640f31f

fix: don't panic on multiple deletion SM patches

bc2ac2c

tdemin force-pushed the master branch from 9f7b463 to bc2ac2c Compare March 9, 2025 16:08

stormqueen1990 reviewed Mar 16, 2025

View reviewed changes

k8s-ci-robot assigned stormqueen1990 Mar 16, 2025

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 16, 2025

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 28, 2025

k8s-ci-robot merged commit dd08aec into kubernetes-sigs:master Mar 28, 2025
11 checks passed

mauri870 mentioned this pull request May 24, 2025

Kustomize panics with multiple patches in file kubernetes/kubernetes#131939

Closed

cappyzawa mentioned this pull request Jun 29, 2025

Update kustomize dependency to v5.7.0 across Flux repositories fluxcd/flux2#5430

Closed

9 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

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

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

Uh oh!

tdemin commented Feb 8, 2025

Uh oh!

k8s-ci-robot commented Feb 8, 2025

Uh oh!

linux-foundation-easycla bot commented Feb 8, 2025 •

edited

Loading

Uh oh!

k8s-ci-robot commented Feb 8, 2025

Uh oh!

k8s-ci-robot commented Feb 8, 2025

Uh oh!

This comment was marked as resolved.

This comment was marked as resolved.

koba1t commented Feb 16, 2025

Uh oh!

koba1t commented Feb 16, 2025

Uh oh!

tdemin commented Mar 9, 2025

Uh oh!

stormqueen1990 left a comment

Uh oh!

koba1t commented Mar 28, 2025

Uh oh!

k8s-ci-robot commented Mar 28, 2025

Uh oh!

Uh oh!

Uh oh!

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

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

Uh oh!

Conversation

tdemin commented Feb 8, 2025

Uh oh!

k8s-ci-robot commented Feb 8, 2025

Uh oh!

linux-foundation-easycla bot commented Feb 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

k8s-ci-robot commented Feb 8, 2025

Uh oh!

k8s-ci-robot commented Feb 8, 2025

Uh oh!

This comment was marked as resolved.

This comment was marked as resolved.

koba1t commented Feb 16, 2025

Uh oh!

koba1t commented Feb 16, 2025

Uh oh!

tdemin commented Mar 9, 2025

Uh oh!

stormqueen1990 left a comment

Choose a reason for hiding this comment

Uh oh!

koba1t commented Mar 28, 2025

Uh oh!

k8s-ci-robot commented Mar 28, 2025

Uh oh!

Uh oh!

Uh oh!

linux-foundation-easycla bot commented Feb 8, 2025 •

edited

Loading