Skip to content

Fix kyaml merge2: $patch directives ignored with ListPrepend #6214

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
saitejabandaru-in wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −2
Open

Fix kyaml merge2: $patch directives ignored with ListPrepend #6214

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions kyaml/yaml/walk/associative_sequence.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,8 +231,12 @@ func (l *Walker) setAssociativeSequenceElements(valuesList [][]string, keys []st
var err error
if len(valuesList) > 0 {
if l.MergeOptions.ListIncreaseDirection == yaml.MergeOptionsListPrepend {
// items from patches are needed to be prepended. so we append the
// dest to itemsToBeAdded
// First update dest with the patched items so that patches are not overwritten
dest, err = appendListNode(dest, itemsToBeAdded, validKeys)
if err != nil {
return nil, err
}
// Then use itemsToBeAdded to establish the prepended order
dest, err = appendListNode(itemsToBeAdded, dest, validKeys)
} else {
// append the items
Expand Down