Fix kyaml merge2: $patch directives ignored with ListPrepend - #6214
Fix kyaml merge2: $patch directives ignored with ListPrepend#6214saitejabandaru-in wants to merge 1 commit into
Conversation
|
|
Hi @saitejabandaru-in. 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 Regular contributors should join the org to skip this step. Once the patch is verified, the new status will be reflected by the I understand the commands that are listed here. DetailsInstructions 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. |
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: saitejabandaru-in The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
Fixes #6146.
When using
merge2.MergeStringswithListIncreaseDirection: MergeOptionsListPrepend, strategic merge patch directives ($patch: replace,$patch: delete) on individual list elements were silently ignored.The root cause was in
kyaml/yaml/walk/associative_sequence.gowhereappendListNode(itemsToBeAdded, dest, ...)was called. Becausedestcontained the original unmerged items, appendingdestintoitemsToBeAdded(which contained the correctly merged items) caused the merged elements to be overwritten by the original elements.This fix properly updates
destwithitemsToBeAdded(the merged items) first so that the patches are applied. Then it applies the fully patcheddesttoitemsToBeAddedto correctly prepend the new items while retaining the patch updates.