2 Commits (3ebb8ddd8a21b4b8eca05c0e4a01c91617bd245f)

Author	SHA1	Message	Date
Phillip Wittrock	1fef312102	Small refactorings for kubectl/apply merge packages ... - move strings into constants - remove unnecessary interface - fix documentation - improve error messaging	2017-11-01 13:10:13 -07:00
Phillip Wittrock	df5fc7a2df	Beginning of rewrite apply merge-logic using visitor pattern. ... Major changes: - Don't generate a patch, instead generate the merged object so it can be used with PUT - Separate tree parsing logic to collate items in a list from the delete / merge / replace / add logic when merging - Use openapi for merge strategy metadata so it works with extensions and version skew - Support multi-field mergekeys when merging lists - Support replace strategy for maps - Reduce complexity of generating order when merging lists - keep the locally defined order and append remote only-items Continue to support: - Explicitly setting fields to null - Merging lists of primitives - Don't randomize ordering when merging lists TODO: - Retain keys - Conflict detection	2017-10-02 14:37:32 -07:00