From 3939c5304b00c1d27556c22f25aa284edb685295 Mon Sep 17 00:00:00 2001 From: abikouo Date: Thu, 20 May 2021 11:45:35 +0200 Subject: [PATCH] fix --- plugins/module_utils/common.py | 4 ++-- plugins/modules/k8s.py | 2 ++ plugins/modules/k8s_info.py | 4 ++-- plugins/modules/k8s_rollback.py | 1 - 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/plugins/module_utils/common.py b/plugins/module_utils/common.py index db5ddc62..f65ae06b 100644 --- a/plugins/module_utils/common.py +++ b/plugins/module_utils/common.py @@ -242,7 +242,7 @@ class K8sAnsibleMixin(object): self.fail(msg='Failed to find exact match for {0}.{1} by [kind, name, singularName, shortNames]'.format(api_version, kind)) def kubernetes_facts(self, kind, api_version, name=None, namespace=None, label_selectors=None, field_selectors=None, - wait=False, wait_sleep=5, wait_timeout=120, state='present', condition=None, wait_property=None): + wait=False, wait_sleep=5, wait_timeout=120, state='present', condition=None, property=None): resource = self.find_resource(kind, api_version) api_found = bool(resource) if not api_found: @@ -298,7 +298,7 @@ class K8sAnsibleMixin(object): for resource_instance in resource_list: success, res, duration = self.wait(resource, resource_instance, sleep=wait_sleep, timeout=wait_timeout, - state=state, condition=condition, wait_property=wait_property) + state=state, condition=condition, property=property) if not success: self.fail(msg="Failed to gather information about %s(s) even" " after waiting for %s seconds" % (res.get('kind'), duration)) diff --git a/plugins/modules/k8s.py b/plugins/modules/k8s.py index 7fed71b7..9ee819d2 100644 --- a/plugins/modules/k8s.py +++ b/plugins/modules/k8s.py @@ -140,6 +140,7 @@ requirements: - "kubernetes >= 12.0.0" - "PyYAML >= 3.11" - "jsonpatch" + - "jmespath" ''' EXAMPLES = r''' @@ -249,6 +250,7 @@ EXAMPLES = r''' wait_condition: type: Progressing status: Unknown + reason: DeploymentPaused # Wait for this service to have acquired an External IP - name: Create ingress and wait for ip to be assigned diff --git a/plugins/modules/k8s_info.py b/plugins/modules/k8s_info.py index 31f587b8..b9911502 100644 --- a/plugins/modules/k8s_info.py +++ b/plugins/modules/k8s_info.py @@ -52,7 +52,7 @@ requirements: - "python >= 3.6" - "kubernetes >= 12.0.0" - "PyYAML >= 3.11" - - "jsonpath-rw" + - "jmespath" ''' EXAMPLES = r''' @@ -165,7 +165,7 @@ def execute_module(module, k8s_ansible_mixin): wait_sleep=module.params["wait_sleep"], wait_timeout=module.params["wait_timeout"], condition=module.params["wait_condition"], - wait_for=module.params["wait_for"] + property=module.params["wait_property"] ) module.exit_json(changed=False, **facts) diff --git a/plugins/modules/k8s_rollback.py b/plugins/modules/k8s_rollback.py index 2042fde4..f12d3da4 100644 --- a/plugins/modules/k8s_rollback.py +++ b/plugins/modules/k8s_rollback.py @@ -34,7 +34,6 @@ requirements: - "python >= 3.6" - "kubernetes >= 12.0.0" - "PyYAML >= 3.11" - - "jsonpath-rw" ''' EXAMPLES = r'''