mirror of
https://github.com/ansible-collections/community.general.git
synced 2025-07-24 13:50:22 -07:00
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.
This commit is contained in:
parent
ab133def0b
commit
1463c2e4a8
10 changed files with 139 additions and 57 deletions
|
@ -50,6 +50,9 @@ options:
|
|||
- See U(https://kubernetes.io/docs/tasks/run-application/update-api-object-kubectl-patch/#use-a-json-merge-patch-to-update-a-deployment)
|
||||
- Requires openshift >= 0.6.2
|
||||
- If more than one merge_type is given, the merge_types will be tried in order
|
||||
- If openshift >= 0.6.2, this defaults to C(['strategic-merge', 'merge']), which is ideal for using the same parameters
|
||||
on resource kinds that combine Custom Resources and built-in resources. For openshift < 0.6.2, the default
|
||||
is simply C(strategic-merge).
|
||||
choices:
|
||||
- json
|
||||
- merge
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue