scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-12-05 07:35:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
c8a0f52d5d85ece66cf74e7960aee5afb22c32b4
kubernetes/pkg/kubectl/apply/strategy/replace_visitor.go
fanzhangio 0299a2403f Add conflict detection feature to apply strategy 
- Add DetectConflictor interface on Element level. Implemented it for particular elements.
- If Options.FailOnConflict is enabled, Merge will detect conflict by invoking doConflictDecect for particular element,
  returning ConflictError with details.
- Add tests, including use case examples and illustration. For example: list, map, and complicated combination.
2018-03-23 01:56:20 -07:00

3.5 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink