3 commits

Author	SHA1	Message	Date
Matt Clay	b25a37bb38	Convert k8s test to role and fix virtulenv usage. (#53883)	2019-03-15 12:37:46 -07:00
Will Thames	1463c2e4a8	Use a sensible default for k8s merge_type (#45284) ... * Use a sensible default for k8s merge_type The sensible default for merge_type is `['strategic-merge', 'merge']. However, we can't make this the default default, as we need to support users who are using openshift 0.6.0, where the merge_type parameter is unsupported. * Refactor k8s test suite for merge_type tests Allow tests with pre-merge-type openshift and post-merge-type openshift.	2018-09-08 10:08:09 +10:00
Will Thames	ce110ff081	K8s retry merge (#44821) ... * Make merge_type a list and apply merge_type in order Allow use case of preferring strategic-merge and failing back to merge, or just preferring a different merge type * Improve k8s module test coverage	2018-08-30 20:42:47 -04:00