9 Commits

Author	SHA1	Message	Date
Katrina Verey	0fa010c7e7	Add missing boilerplate	2022-04-04 14:24:04 -04:00
monopole	aa5b4814d6	upgrade to helm 3.5.4 and imdario/mergo v0.3.12	2021-04-09 15:05:41 -07:00
monopole	6f6d41f17f	Remove dead merge conflict code.	2021-03-17 06:35:30 -07:00
monopole	123a5d6e56	Remove the wrappy layer.	2021-03-15 15:59:06 -07:00
Katrina Verey	a7000dd9c6	Update unpinned pluginator to new framework	2021-03-03 08:27:19 -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
Donny Xia	2f4c35347e	Get plugin config from data field	2020-11-19 13:11:47 -08:00
Donny Xia	2ae323bb26	move files into internal	2020-11-18 12:21:59 -08:00