Skip to content

kyaml: fix $patch directives ignored with ListPrepend merge#6147

Open
rm3l wants to merge 1 commit into
kubernetes-sigs:masterfrom
rm3l:fix/kyaml-listprepend-patch-replace
Open

kyaml: fix $patch directives ignored with ListPrepend merge#6147
rm3l wants to merge 1 commit into
kubernetes-sigs:masterfrom
rm3l:fix/kyaml-listprepend-patch-replace

Conversation

@rm3l

@rm3l rm3l commented May 12, 2026

Copy link
Copy Markdown

Summary

Fixes #6146

  • $patch: replace and $patch: delete directives on individual associative list elements were silently ignored when ListIncreaseDirection was set to MergeOptionsListPrepend
  • Root cause: in setAssociativeSequenceElements, the ListPrepend path called appendListNode(itemsToBeAdded, dest, ...) with swapped arguments, causing ElementSetter to overwrite already-merged items with unmerged originals from dest
  • Fix: introduce appendMissingListNode that only appends elements not already present in the destination, preserving merged results

NOTE:
I've created a branch in the repro repo using the patched kyaml from this PR, and it seems to be fixing the issue: https://github.com/rm3l/kyaml-listprepend-bug/tree/fix/use-patched-kyaml

@k8s-ci-robot k8s-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label May 12, 2026
@k8s-ci-robot

Copy link
Copy Markdown
Contributor

Welcome @rm3l!

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

Copy link
Copy Markdown
Contributor

Hi @rm3l. 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 needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels May 12, 2026
@k8s-ci-robot

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: rm3l
Once this PR has been reviewed and has the lgtm label, please assign varshaprasad96 for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found 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 size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label May 12, 2026
@rm3l
rm3l force-pushed the fix/kyaml-listprepend-patch-replace branch from 886e32b to de5a438 Compare May 12, 2026 11:45
When merging associative lists with ListIncreaseDirection set to
MergeOptionsListPrepend, strategic merge patch directives ($patch:
replace, $patch: delete) on individual list elements were silently
ignored. The root cause was that appendListNode was called with
swapped arguments for the prepend case, causing original dest
elements to overwrite already-merged results in itemsToBeAdded.

Replace appendListNode with a new appendMissingListNode function
in the prepend path. This function only appends elements from dest
that are not already present in the merged results, preserving
$patch directive outcomes.

Signed-off-by: Armel Soro <asoro@redhat.com>
@rm3l
rm3l force-pushed the fix/kyaml-listprepend-patch-replace branch from de5a438 to ec4d22f Compare May 12, 2026 11:48
@rm3l rm3l changed the title kyaml: fix $patch directives ignored with ListPrepend merge kyaml: fix $patch directives ignored with ListPrepend merge May 12, 2026
@rm3l
rm3l marked this pull request as ready for review May 12, 2026 11:59
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label May 12, 2026
@k8s-ci-robot
k8s-ci-robot requested a review from sarab97 May 12, 2026 11:59
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. needs-ok-to-test Indicates a PR that requires an org member to verify it 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.

kyaml merge2: $patch directives on list elements ignored with ListPrepend

2 participants