7 Commits

Author	SHA1	Message	Date
monopole	6f6d41f17f	Remove dead merge conflict code.	2021-03-17 06:35:30 -07:00
monopole	235101a614	Drop uses of 'unstructured' terminology.	2021-03-15 15:59:06 -07:00
monopole	123a5d6e56	Remove the wrappy layer.	2021-03-15 15:59:06 -07:00
monopole	839fd2b971	Remove branching on kyaml enablement	2021-03-09 14:29:27 -08:00
monopole	3ae1aa7cd7	Delete dependence on k8s.io/...	2021-02-09 14:15:54 -08:00
jregan	f66e5bb923	Extract conflict detection to it's own interface. ... This PR - defines a patch conflict detector interface, - extracts implementations of the interface from the merginator code, making the merginator code independent of --enable_kyaml. - injects those implementations into kustomize as a function of --enable_kyaml. So, instead of using different merginators to combine resmaps, this pr allows the use of a single patch merge code path that uses different conflict detectors. So instead of debating how to merge, we're now only considering whether to warn on conflict detection in one transformer. This PR is in service of #3304, eliminating seven instances where --enable_kyaml was consulted. These were cases where conflict detection wasn't an issue (but merging patches was).	2020-12-06 08:38:45 -08:00
jregan	a5f3d5c823	Use DepProvider in tests to access kyaml impls.	2020-11-21 14:49:44 -08:00