diff options
| author | Will Thames <will@thames.id.au> | 2019-07-09 06:47:41 +1000 |
|---|---|---|
| committer | Jill R <4121322+jillr@users.noreply.github.com> | 2019-07-08 13:47:41 -0700 |
| commit | 446919de6f5fbbcff8706d7eff147595140547fb (patch) | |
| tree | f2165ae12d5301cc75ca8e836d28a533106c3531 /lib/ansible/modules/clustering | |
| parent | 105f60cf480572fb5547794cda1f9a05559ae636 (diff) | |
| download | ansible-446919de6f5fbbcff8706d7eff147595140547fb.tar.gz | |
Add apply to k8s module (#49053)
* Add apply to k8s module
Use apply method for updating k8s resources.
* Improve apply documentation
* k8s: Make apply and merge_type mutually exclusive
Diffstat (limited to 'lib/ansible/modules/clustering')
| -rw-r--r-- | lib/ansible/modules/clustering/k8s/k8s.py | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/lib/ansible/modules/clustering/k8s/k8s.py b/lib/ansible/modules/clustering/k8s/k8s.py index d50b6f02c6..88a95ac96a 100644 --- a/lib/ansible/modules/clustering/k8s/k8s.py +++ b/lib/ansible/modules/clustering/k8s/k8s.py @@ -59,6 +59,7 @@ options: - 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). + - mutually exclusive with C(apply) choices: - json - merge @@ -130,6 +131,15 @@ options: the generated hash and append_hash=no) type: bool version_added: "2.8" + apply: + description: + - C(apply) compares the desired resource definition with the previously supplied resource definition, + ignoring properties that are automatically generated + - C(apply) works better with Services than 'force=yes' + - C(apply) defaults to True if the openshift library is new enough to support it (0.9.0 or newer) + - mutually exclusive with C(merge_type) + type: bool + version_added: "2.9" requirements: - "python >= 2.7" |