e74a681337
* 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.
(cherry picked from commit
|
||
|---|---|---|
| .. | ||
| host_vars | ||
| targets | ||
| cloud-config-aws.yml.template | ||
| cloud-config-azure.yml.template | ||
| cloud-config-cs.ini.template | ||
| cloud-config-gcp.yml.template | ||
| cloud-config-opennebula.yml.template | ||
| cloud-config-openshift.kubeconfig.template | ||
| cloud-config-tower.cfg.template | ||
| integration.cfg | ||
| integration_config.yml | ||
| inventory | ||
| inventory.networking.template | ||
| inventory.remote.template | ||
| inventory.winrm.template | ||
| network-integration.cfg | ||
| target-prefixes.network | ||
| windows-integration.cfg | ||