Revert "k8s ability to wait on arbitrary property (ansible-collection…

…s#105)" (ansible-collections#133)

This reverts commit 4ccb15d.

molecule/default/tasks/waiter.yml

@@ -364,93 +364,6 @@
         that:
           - short_wait_remove_pod is failed
 
-    - name: add a simple crashing pod and wait until container is running
-      k8s:
-        definition:
-          apiVersion: v1
-          kind: Pod
-          metadata:
-            name: pod-crash-0
-            namespace: "{{ wait_namespace }}"
-          spec:
-            containers:
-              - name: crashing-container
-                image: busybox
-                command: ['/dummy/dummy-shell', '-c', 'sleep 2000']
-        wait: yes
-        wait_timeout: 10
-        wait_property:
-          property: status.containerStatuses[*].state.running
-      ignore_errors: true
-      register: crash_pod
-
-    - name: assert that task failed
-      assert:
-        that:
-          - crash_pod is failed
-          - crash_pod is changed
-          - '"Resource creation timed out" in crash_pod.msg'
-
-    - name: add a valid pod and wait until container is running
-      k8s:
-        definition:
-          apiVersion: v1
-          kind: Pod
-          metadata:
-            name: pod-valid-0
-            namespace: "{{ wait_namespace }}"
-          spec:
-            containers:
-              - name: crashing-container
-                image: busybox
-                command: ['/bin/sh', '-c', 'sleep 10000']
-        wait: yes
-        wait_timeout: 10
-        wait_property:
-          property: status.containerStatuses[*].state.running
-      ignore_errors: true
-      register: valid_pod
-
-    - name: assert that task failed
-      assert:
-        that:
-          - valid_pod is successful
-          - valid_pod.changed
-          - valid_pod.result.status.containerStatuses[0].state.running is defined
-
-    - name: create pod (waiting for container.ready set to false)
-      k8s:
-        definition:
-          apiVersion: v1
-          kind: Pod
-          metadata:
-            name: redis-pod
-            namespace: "{{ wait_namespace }}"
-          spec:
-            containers:
-              - name: redis-container
-                image: redis
-                volumeMounts:
-                  - name: test
-                    mountPath: "/etc/test"
-                    readOnly: true
-            volumes:
-              - name: test
-                configMap:
-                  name: redis-config
-        wait: yes
-        wait_timeout: 10
-        wait_property:
-          property: status.containerStatuses[0].ready
-          value: "false"
-      register: wait_boolean
-
-    - name: assert that pod was created but not running
-      assert:
-        that:
-          - wait_boolean.changed
-          - wait_boolean.result.status.phase == 'Pending'
-
   always:
     - name: Remove namespace
       k8s:

plugins/doc_fragments/k8s_wait_options.py

@@ -64,22 +64,4 @@ class ModuleDocFragment(object):
         - The possible reasons in a condition are specific to each resource type in Kubernetes.
         - See the API documentation of the status field for a given resource to see possible choices.
     type: dict
-  wait_property:
-    description:
-    - Specifies a property on the resource to wait for.
-    - Ignored if C(wait) is not set or is set to I(False).
-    type: dict
-    version_added: '2.1.0'
-    suboptions:
-      property:
-        type: str
-        required: True
-        description:
-        - The property name to wait for.
-      value:
-        type: str
-        description:
-        - The expected value of the C(property).
-        - The value is not case-sensitive.
-        - If this is missing, we will check only that the attribute C(property) is present.
 '''

plugins/module_utils/args_common.py

@@ -70,14 +70,6 @@ def list_dict_str(value):
             status=dict(default=True, choices=[True, False, "Unknown"]),
             reason=dict()
         )
-    ),
-    wait_property=dict(
-        type='dict',
-        default=None,
-        options=dict(
-            property=dict(required=True),
-            value=dict()
-        )
     )
 )
 

plugins/module_utils/common.py

@@ -29,15 +29,13 @@
 
 from ansible_collections.kubernetes.core.plugins.module_utils.args_common import (AUTH_ARG_MAP, AUTH_ARG_SPEC, AUTH_PROXY_HEADERS_SPEC)
 from ansible_collections.kubernetes.core.plugins.module_utils.hashes import generate_hash
-from ansible_collections.kubernetes.core.plugins.module_utils.jsonpath_extractor import validate_with_jsonpath
 
 from ansible.module_utils.basic import missing_required_lib
 from ansible.module_utils.six import iteritems, string_types
 from ansible.module_utils._text import to_native, to_bytes, to_text
 from ansible.module_utils.common.dict_transformations import dict_merge
 from ansible.module_utils.parsing.convert_bool import boolean
 
-
 K8S_IMP_ERR = None
 try:
     import kubernetes
@@ -232,7 +230,7 @@ def find_resource(self, kind, api_version, fail=False):
                 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, property=None):
+                         wait=False, wait_sleep=5, wait_timeout=120, state='present', condition=None):
         resource = self.find_resource(kind, api_version)
         api_found = bool(resource)
         if not api_found:
@@ -288,7 +286,7 @@ def _elapsed():
             for resource_instance in resource_list:
                 success, res, duration = self.wait(resource, resource_instance,
                                                    sleep=wait_sleep, timeout=wait_timeout,
-                                                   state=state, condition=condition, property=property)
+                                                   state=state, condition=condition)
                 if not success:
                     self.fail(msg="Failed to gather information about %s(s) even"
                                   " after waiting for %s seconds" % (res.get('kind'), duration))
@@ -351,7 +349,7 @@ def diff_objects(self, existing, new):
     def fail(self, msg=None):
         self.fail_json(msg=msg)
 
-    def _wait_for(self, resource, name, namespace, predicates, sleep, timeout, state):
+    def _wait_for(self, resource, name, namespace, predicate, sleep, timeout, state):
         start = datetime.now()
 
         def _wait_for_elapsed():
@@ -361,7 +359,7 @@ def _wait_for_elapsed():
         while _wait_for_elapsed() < timeout:
             try:
                 response = resource.get(name=name, namespace=namespace)
-                if all([predicate(response) for predicate in predicates]):
+                if predicate(response):
                     if response:
                         return True, response.to_dict(), _wait_for_elapsed()
                     return True, {}, _wait_for_elapsed()
@@ -373,7 +371,7 @@ def _wait_for_elapsed():
             response = response.to_dict()
         return False, response, _wait_for_elapsed()
 
-    def wait(self, resource, definition, sleep, timeout, state='present', condition=None, property=None):
+    def wait(self, resource, definition, sleep, timeout, state='present', condition=None):
 
         def _deployment_ready(deployment):
             # FIXME: frustratingly bool(deployment.status) is True even if status is empty
@@ -424,29 +422,19 @@ def _custom_condition(resource):
         def _resource_absent(resource):
             return not resource
 
-        def _wait_for_property(resource):
-            return validate_with_jsonpath(self, resource.to_dict(), property.get('property'), property.get('value', None))
-
         waiter = dict(
             Deployment=_deployment_ready,
             DaemonSet=_daemonset_ready,
             Pod=_pod_ready
         )
         kind = definition['kind']
-        predicates = []
-        if state == 'present':
-            if condition is None and property is None:
-                predicates.append(waiter.get(kind, lambda x: x))
-            else:
-                if condition:
-                    # add waiter on custom condition
-                    predicates.append(_custom_condition)
-                if property:
-                    # json path predicate
-                    predicates.append(_wait_for_property)
+        if state == 'present' and not condition:
+            predicate = waiter.get(kind, lambda x: x)
+        elif state == 'present' and condition:
+            predicate = _custom_condition
         else:
-            predicates = [_resource_absent]
-        return self._wait_for(resource, definition['metadata']['name'], definition['metadata'].get('namespace'), predicates, sleep, timeout, state)
+            predicate = _resource_absent
+        return self._wait_for(resource, definition['metadata']['name'], definition['metadata'].get('namespace'), predicate, sleep, timeout, state)
 
     def set_resource_definitions(self, module):
         resource_definition = module.params.get('resource_definition')
@@ -589,7 +577,6 @@ def perform_action(self, resource, definition):
         continue_on_error = self.params.get('continue_on_error')
         if self.params.get('wait_condition') and self.params['wait_condition'].get('type'):
             wait_condition = self.params['wait_condition']
-        wait_property = self.params.get('wait_property')
 
         def build_error_msg(kind, name, msg):
             return "%s %s: %s" % (kind, name, msg)
@@ -699,8 +686,7 @@ def build_error_msg(kind, name, msg):
                 success = True
                 result['result'] = k8s_obj
                 if wait and not self.check_mode:
-                    success, result['result'], result['duration'] = self.wait(resource, definition, wait_sleep, wait_timeout,
-                                                                              condition=wait_condition, property=wait_property)
+                    success, result['result'], result['duration'] = self.wait(resource, definition, wait_sleep, wait_timeout, condition=wait_condition)
                 if existing:
                     existing = existing.to_dict()
                 else:
@@ -760,8 +746,7 @@ def build_error_msg(kind, name, msg):
                 success = True
                 result['result'] = k8s_obj
                 if wait and not self.check_mode:
-                    success, result['result'], result['duration'] = self.wait(resource, definition, wait_sleep, wait_timeout,
-                                                                              condition=wait_condition, property=wait_property)
+                    success, result['result'], result['duration'] = self.wait(resource, definition, wait_sleep, wait_timeout, condition=wait_condition)
                 result['changed'] = True
                 result['method'] = 'create'
                 if not success:
@@ -796,8 +781,7 @@ def build_error_msg(kind, name, msg):
                 success = True
                 result['result'] = k8s_obj
                 if wait and not self.check_mode:
-                    success, result['result'], result['duration'] = self.wait(resource, definition, wait_sleep, wait_timeout,
-                                                                              condition=wait_condition, property=wait_property)
+                    success, result['result'], result['duration'] = self.wait(resource, definition, wait_sleep, wait_timeout, condition=wait_condition)
                 match, diffs = self.diff_objects(existing.to_dict(), result['result'])
                 result['changed'] = not match
                 result['method'] = 'replace'
@@ -831,8 +815,7 @@ def build_error_msg(kind, name, msg):
             success = True
             result['result'] = k8s_obj
             if wait and not self.check_mode:
-                success, result['result'], result['duration'] = self.wait(resource, definition, wait_sleep, wait_timeout,
-                                                                          condition=wait_condition, property=wait_property)
+                success, result['result'], result['duration'] = self.wait(resource, definition, wait_sleep, wait_timeout, condition=wait_condition)
             match, diffs = self.diff_objects(existing.to_dict(), result['result'])
             result['changed'] = not match
             result['method'] = 'patch'