github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
58,417 Commits
32 Branches
881 Tags
633 MiB
Commit Graph

3 Commits (34a7b3dea8739abfc113c4e42935289ac1e89d64)

Author SHA1 Message Date
Phillip Wittrock 51d1da1e94 Support retainkeys strategy in new apply merge code 2017-11-02 10:00:56 -07:00
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