k8s_info: Add support for wait (#235)

Fixes: #18

plugins/modules/k8s.py

@@ -33,6 +33,7 @@ extends_documentation_fragment:
   - community.kubernetes.k8s_name_options
   - community.kubernetes.k8s_resource_options
   - community.kubernetes.k8s_auth_options
+  - community.kubernetes.k8s_wait_options
 
 notes:
   - If your OpenShift Python library is not 0.9.0 or newer and you are trying to
@@ -61,53 +62,6 @@ options:
     - strategic-merge
     type: list
     elements: str
-  wait:
-    description:
-    - Whether to wait for certain resource kinds to end up in the desired state. By default the module exits once Kubernetes has
-      received the request
-    - Implemented for C(state=present) for C(Deployment), C(DaemonSet) and C(Pod), and for C(state=absent) for all resource kinds.
-    - For resource kinds without an implementation, C(wait) returns immediately unless C(wait_condition) is set.
-    default: no
-    type: bool
-  wait_sleep:
-    description:
-    - Number of seconds to sleep between checks.
-    default: 5
-    type: int
-  wait_timeout:
-    description:
-    - How long in seconds to wait for the resource to end up in the desired state. Ignored if C(wait) is not set.
-    default: 120
-    type: int
-  wait_condition:
-    description:
-    - Specifies a custom condition on the status to wait for. Ignored if C(wait) is not set or is set to False.
-    suboptions:
-      type:
-        type: str
-        description:
-        - The type of condition to wait for. For example, the C(Pod) resource will set the C(Ready) condition (among others)
-        - Required if you are specifying a C(wait_condition). If left empty, the C(wait_condition) field will be ignored.
-        - The possible types for 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.
-      status:
-        type: str
-        description:
-        - The value of the status field in your desired condition.
-        - For example, if a C(Deployment) is paused, the C(Progressing) C(type) will have the C(Unknown) status.
-        choices:
-        - True
-        - False
-        - Unknown
-        default: "True"
-      reason:
-        type: str
-        description:
-        - The value of the reason field in your desired condition
-        - For example, if a C(Deployment) is paused, The C(Progressing) C(type) will have the C(DeploymentPaused) reason.
-        - 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
   validate:
     description:
       - how (if at all) to validate the resource definition against the kubernetes schema.
@@ -264,7 +218,7 @@ import copy
 
 from ansible.module_utils.basic import AnsibleModule
 from ansible_collections.community.kubernetes.plugins.module_utils.common import (
-    K8sAnsibleMixin, COMMON_ARG_SPEC, NAME_ARG_SPEC, RESOURCE_ARG_SPEC, AUTH_ARG_SPEC)
+    K8sAnsibleMixin, COMMON_ARG_SPEC, NAME_ARG_SPEC, RESOURCE_ARG_SPEC, AUTH_ARG_SPEC, WAIT_ARG_SPEC)
 
 
 class KubernetesModule(K8sAnsibleMixin):
@@ -277,25 +231,14 @@ class KubernetesModule(K8sAnsibleMixin):
             strict=dict(type='bool', default=True)
         )
 
-    @property
-    def condition_spec(self):
-        return dict(
-            type=dict(),
-            status=dict(default=True, choices=[True, False, "Unknown"]),
-            reason=dict()
-        )
-
     @property
     def argspec(self):
         argument_spec = copy.deepcopy(COMMON_ARG_SPEC)
         argument_spec.update(copy.deepcopy(NAME_ARG_SPEC))
         argument_spec.update(copy.deepcopy(RESOURCE_ARG_SPEC))
         argument_spec.update(copy.deepcopy(AUTH_ARG_SPEC))
+        argument_spec.update(copy.deepcopy(WAIT_ARG_SPEC))
         argument_spec['merge_type'] = dict(type='list', elements='str', choices=['json', 'merge', 'strategic-merge'])
-        argument_spec['wait'] = dict(type='bool', default=False)
-        argument_spec['wait_sleep'] = dict(type='int', default=5)
-        argument_spec['wait_timeout'] = dict(type='int', default=120)
-        argument_spec['wait_condition'] = dict(type='dict', default=None, options=self.condition_spec)
         argument_spec['validate'] = dict(type='dict', default=None, options=self.validate_spec)
         argument_spec['append_hash'] = dict(type='bool', default=False)
         argument_spec['apply'] = dict(type='bool', default=False)

plugins/modules/k8s_info.py

@@ -46,6 +46,7 @@ options:
 extends_documentation_fragment:
   - community.kubernetes.k8s_auth_options
   - community.kubernetes.k8s_name_options
+  - community.kubernetes.k8s_wait_options
 
 requirements:
   - "python >= 2.7"
@@ -99,6 +100,15 @@ EXAMPLES = r'''
   community.kubernetes.k8s_info:
     kind: MyCustomObject
     api_version: "stable.example.com/v1"
+
+- name: Wait till the Object is created
+  community.kubernetes.k8s_info:
+    kind: Pod
+    wait: yes
+    name: pod-not-yet-created
+    namespace: default
+    wait_sleep: 10
+    wait_timeout: 360
 '''
 
 RETURN = r'''
@@ -134,7 +144,7 @@ import copy
 
 from ansible.module_utils.basic import AnsibleModule
 from ansible_collections.community.kubernetes.plugins.module_utils.common import (
-    K8sAnsibleMixin, AUTH_ARG_SPEC)
+    K8sAnsibleMixin, AUTH_ARG_SPEC, WAIT_ARG_SPEC)
 
 
 class KubernetesInfoModule(K8sAnsibleMixin):
@@ -156,14 +166,19 @@ class KubernetesInfoModule(K8sAnsibleMixin):
         self.exit_json(changed=False,
                        **self.kubernetes_facts(self.params['kind'],
                                                self.params['api_version'],
-                                               self.params['name'],
-                                               self.params['namespace'],
-                                               self.params['label_selectors'],
-                                               self.params['field_selectors']))
+                                               name=self.params['name'],
+                                               namespace=self.params['namespace'],
+                                               label_selectors=self.params['label_selectors'],
+                                               field_selectors=self.params['field_selectors'],
+                                               wait=self.params['wait'],
+                                               wait_sleep=self.params['wait_sleep'],
+                                               wait_timeout=self.params['wait_timeout'],
+                                               condition=self.params['wait_condition']))
 
     @property
     def argspec(self):
         args = copy.deepcopy(AUTH_ARG_SPEC)
+        args.update(WAIT_ARG_SPEC)
         args.update(
             dict(
                 kind=dict(required=True),