From bc391218a4887b4ca167f615329c3ac8cec2fa90 Mon Sep 17 00:00:00 2001 From: Mike Graves Date: Fri, 15 Oct 2021 14:29:21 -0400 Subject: [PATCH] common/_wait_for: ensure label_selectors is optional (#239) (#256) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [backport/2.2] common/_wait_for: ensure label_selectors is optional (#239) Depends-On: ansible/ansible-zuul-jobs#1170 Depends-On: ansible/ansible-zuul-jobs#1169 Depends-On: ansible/ansible-zuul-jobs#1171 common/_wait_for: ensure label_selectors is optional The label_selectors is a new parameter for _wait_for that was introduced in #158. The value is new and it can be set to None to make it optional. It should not be mandatory a non optional parameter. Reviewed-by: None Reviewed-by: Alina Buzachis Reviewed-by: None (cherry picked from commit 938f7e1) Reviewed-by: None Reviewed-by: Gonéri Le Bouder Reviewed-by: None --- changelogs/fragments/_wait_for_label_selector_optional.yaml | 3 +++ plugins/module_utils/common.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 changelogs/fragments/_wait_for_label_selector_optional.yaml diff --git a/changelogs/fragments/_wait_for_label_selector_optional.yaml b/changelogs/fragments/_wait_for_label_selector_optional.yaml new file mode 100644 index 00000000..fffd1283 --- /dev/null +++ b/changelogs/fragments/_wait_for_label_selector_optional.yaml @@ -0,0 +1,3 @@ +--- +bugfixes: +- common - Ensure the label_selectors parameter of _wait_for method is optional. diff --git a/plugins/module_utils/common.py b/plugins/module_utils/common.py index 1326a4fb..37884589 100644 --- a/plugins/module_utils/common.py +++ b/plugins/module_utils/common.py @@ -365,7 +365,7 @@ class K8sAnsibleMixin(object): def fail(self, msg=None): self.fail_json(msg=msg) - def _wait_for(self, resource, name, namespace, predicate, sleep, timeout, state, label_selectors): + def _wait_for(self, resource, name, namespace, predicate, sleep, timeout, state, label_selectors=None): start = datetime.now() def _wait_for_elapsed():