From eee4058c7e6ef47c639467f39f102e957a5647b3 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Fri, 17 Jul 2020 17:36:59 -0400 Subject: [PATCH] k8s: update openshift requirements in documentation (#70479) Backport of https://github.com/ansible-collections/community.kubernetes/pull/153 --- changelogs/fragments/k8s-requirements-doc-update.yml | 2 ++ lib/ansible/modules/clustering/k8s/k8s.py | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 changelogs/fragments/k8s-requirements-doc-update.yml diff --git a/changelogs/fragments/k8s-requirements-doc-update.yml b/changelogs/fragments/k8s-requirements-doc-update.yml new file mode 100644 index 00000000000..58090de7c78 --- /dev/null +++ b/changelogs/fragments/k8s-requirements-doc-update.yml @@ -0,0 +1,2 @@ +minor_changes: + - k8s - update openshift requirements in documentation diff --git a/lib/ansible/modules/clustering/k8s/k8s.py b/lib/ansible/modules/clustering/k8s/k8s.py index e61b29b874b..b7ed969a324 100644 --- a/lib/ansible/modules/clustering/k8s/k8s.py +++ b/lib/ansible/modules/clustering/k8s/k8s.py @@ -114,7 +114,7 @@ options: validate: description: - how (if at all) to validate the resource definition against the kubernetes schema. - Requires the kubernetes-validate python module + Requires the kubernetes-validate python module and openshift >= 0.8.0 suboptions: fail_on_error: description: whether to fail on validation errors. @@ -135,6 +135,7 @@ options: - The full definition of an object is needed to generate the hash - this means that deleting an object created with append_hash will only work if the same object is passed with state=absent (alternatively, just use state=absent with the name including the generated hash and append_hash=no) + - Requires openshift >= 0.7.2 type: bool version_added: "2.8" apply: @@ -142,6 +143,7 @@ options: - 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' + - Requires openshift >= 0.9.2 - mutually exclusive with C(merge_type) type: bool version_added: "2.9"