Skip to content

Conversation

@ralgozino
Copy link
Contributor

Hello!

Disclaimer: this is my first PR to Kustomize, even though I tried to follow the guidelines, please let me know if I missed anything / should change something.

This PR fixes the issue that I opened and triaged #5956: tl;dr pointing to empty patches files resulted in an error instead of ignoring the files.

As per guidelines, I first added a test that replicates the issue: TestEmptyPatchFilesShouldBeIgnored

Then the fix is pretty straightforward, call transformJson6902 only if there are json patches to apply.

Note: I also added a test to validate that patchesStrategicMerge still behaves the same and that I did not introduced a regression on a deprecated feature. Please let me know if this is ok.

Thanks for kustomize and for your time in reviewing this PR :-)

Add test to validate that empty files don't produce an error when using
the `path` option of the `patches` convenience.

Add test to validate that using the deprecated patchesStrategicMerge
still produces an error and no changes have been introduced in old
features.
@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

Details

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 k8s-ci-robot added do-not-merge/invalid-commit-message Indicates that a PR should not merge because it has an invalid commit message. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Oct 2, 2025
@k8s-ci-robot
Copy link
Contributor

Welcome @ralgozino!

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 Oct 2, 2025
@k8s-ci-robot
Copy link
Contributor

Hi @ralgozino. 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.

Details

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 k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Oct 2, 2025
@ralgozino ralgozino force-pushed the fix/allow-empty-strategicmerge-patches-files branch from a9cb5b6 to 21a5da1 Compare October 2, 2025 17:49
Call json6902 transformer only when there are patches to apply.

Addresses kubernetes-sigs#5956
@ralgozino ralgozino force-pushed the fix/allow-empty-strategicmerge-patches-files branch from 21a5da1 to 24ea1b9 Compare October 2, 2025 17:51
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/invalid-commit-message Indicates that a PR should not merge because it has an invalid commit message. label Oct 2, 2025
@ralgozino
Copy link
Contributor Author

Hello @koba1t and @varshaprasad96 , please let me know if anything is missing for this PR to be considered

Thanks 🙏

@koba1t
Copy link
Member

koba1t commented Nov 19, 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 Nov 19, 2025
@koba1t
Copy link
Member

koba1t commented Nov 19, 2025

Hi @ralgozino
Sorry to delay review.

I think this PR looks like good!
Thanks for your work!

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 19, 2025
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

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

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details 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 the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 19, 2025
@k8s-ci-robot k8s-ci-robot merged commit 311dbbf into kubernetes-sigs:master Nov 19, 2025
11 checks passed
@ralgozino
Copy link
Contributor Author

Thank you @koba1t for taking the time to review (and approve) the PR 🙏

@ralgozino ralgozino deleted the fix/allow-empty-strategicmerge-patches-files branch November 20, 2025 08:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants