6 Commits

Author	SHA1	Message	Date
Natasha Sarkar	722b0131f0	return error for duplicate keys rather than panicking	2021-03-03 12:13:24 -08:00
Natasha Sarkar	f71854a0c8	Refactored resource to store all previous names and namespaces	2021-02-03 12:01:09 -08:00
jregan	8b97274af3	More merge tests, clearer method names.	2020-12-22 17:26:12 -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	77b28a986f	Split reswrangler.go and test from resmap.go	2020-08-23 08:23:13 -07:00
jregan	1d91401772	Simplify use of the Merginator.	2020-08-22 08:07:57 -07:00