ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-07-23 21:30:22 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

K8s retry merge (#44821)

Browse source 
* 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
This commit is contained in:
Will Thames 2018-08-31 10:42:47 +10:00 • committed by ansibot
commit ce110ff081
6 changed files with 433 additions and 270 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/modules/clustering/k8s/k8s.py
View file

@ -49,10 +49,12 @@ options:
want to use C(merge) if you see "strategic merge patch format is not supported"
- 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
choices:
- json
- merge
- strategic-merge
type: list
version_added: "2.7"
requirements: