mirror of https://github.com/k3s-io/k3s
f165ad7cd2
Automatic merge from submit-queue (batch tested with PRs 60990, 60947, 45275, 60565, 61091). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. 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. **What this PR does / why we need it**: Apply is being rewritten under pkg/kubectl/apply/strategy based on visitor pattern. The new merge and replace code should check for conflicts between the recorded value and the remote value, and optionally return an error if they do not match with the field and details. A conflict is if the same field is specified in BOTH the recorded and the remote values of an object, but does not match. **Which issue(s) this PR fixes**: Fixes #60945 https://github.com/kubernetes/kubectl/issues/97 **Release note**: ```release-note NONE ``` |
||
|---|---|---|
| .. | ||
| parse | ||
| strategy | ||
| BUILD | ||
| doc.go | ||
| element.go | ||
| empty_element.go | ||
| error.go | ||
| list_element.go | ||
| map_element.go | ||
| primitive_element.go | ||
| type_element.go | ||
| visitor.go | ||