Skip to content
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.

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

add option to choose prepend/append patch items to list in merge #3048

Merged
merged 2 commits into from
Oct 2, 2020

Conversation

Shell32-Natsu
Copy link
Contributor

@Shell32-Natsu Shell32-Natsu commented Sep 29, 2020

fix #2907

  • From v3.8.0, strategic merge patches are changed from prepending items to appending(Starting in v3.8.0, strategic merge patches append to arrays (earlier versions prepend) #2907). This PR is changing back to the original behavior for strategic merge patches. Other places that use kyaml.merge2.Merge are still keeping appending.
  • The API merge2.Merge and merge2.MergeStrings have a new parameter mergeOptions yaml.MergeOptions
    • yaml.MergeOptions has a member ListIncreaseDirection which can be MergeOptionsListAppend and MergeOptionsListPrepend.
    • If the ListIncreaseDirection is not set when create yaml.MergeOptions struct, it will be MergeOptionsListAppend by default.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Sep 29, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Shell32-Natsu

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

The pull request process is described here

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 approved Indicates a PR has been approved by an approver from all required OWNERS files. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Sep 29, 2020
@Shell32-Natsu
Copy link
Contributor Author

/cc @monopole

@monopole
Copy link
Contributor

monopole commented Oct 2, 2020

/lgtm

thanks!

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. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Starting in v3.8.0, strategic merge patches append to arrays (earlier versions prepend)
3 participants