Update kustomize to v5.7.0 and add regression test for multiple patch delete#1470
Merged
matheuscscp merged 2 commits intofluxcd:mainfrom Jun 29, 2025
Merged
Conversation
The v5.7.0 release fixes panic issues that occur when using multiple $patch: delete directives in a single strategic merge patch. This was causing kustomize build to fail with nil pointer dereference errors. This change updates: - sigs.k8s.io/kustomize/api from v0.19.0 to v0.20.0 - sigs.k8s.io/kustomize/kyaml from v0.19.0 to v0.20.0 - sigs.k8s.io/yaml from v1.4.0 to v1.5.0 (dependency update) Signed-off-by: cappyzawa <cappyzawa@gmail.com>
This test ensures that the controller properly handles multiple $patch: delete directives in strategic merge patches, which was causing panic errors in kustomize v5.6.0 but is now fixed in v5.7.0. The test includes two scenarios: - Multiple delete directives in a single patch (the main fix) - Multiple delete directives in separate patches (previously a workaround) Signed-off-by: cappyzawa <cappyzawa@gmail.com>
matheuscscp
approved these changes
Jun 29, 2025
Member
matheuscscp
left a comment
There was a problem hiding this comment.
LGTM! 🚀
Thanks very much @cappyzawa!
9 tasks
7 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Update kustomize dependency from v5.6.0 to v5.7.0 and add regression test for multiple
$patch: deletedirectives in strategic merge patches.Multiple
$patch: deletestrategic merge patches in a single patch file cause panic in kustomize v5.6.0. This has been fixed in v5.7.0.The regression test is based on #1466.
Resolves #1306
Part of fluxcd/flux2#5430