cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

kubevirt_rs: new wait logic (#54726)

Browse source
This commit is contained in:
Mariusz Mazur 2019-04-02 16:42:33 +02:00 committed by ansibot
parent 2c169e0baf
commit 7ea01da38f
1 changed files with 23 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
lib/ansible/modules/cloud/kubevirt/kubevirt_rs.py
View file

@ -113,12 +113,6 @@ import traceback
from ansible.module_utils.k8s.common import AUTH_ARG_SPEC from ansible.module_utils.k8s.common import AUTH_ARG_SPEC
try:
from openshift.dynamic.client import ResourceInstance
except ImportError:
# Handled in module_utils
pass
from ansible.module_utils.kubevirt import ( from ansible.module_utils.kubevirt import (
virtdict, virtdict,
KubeVirtRawModule, KubeVirtRawModule,
@ -143,25 +137,19 @@ class KubeVirtVMIRS(KubeVirtRawModule):
argument_spec.update(copy.deepcopy(VMIR_ARG_SPEC)) argument_spec.update(copy.deepcopy(VMIR_ARG_SPEC))
return argument_spec return argument_spec
def _read_stream(self, resource, watcher, stream, name, replicas): def wait_for_replicas(self, replicas):
""" Wait for ready_replicas to equal the requested number of replicas. """ """ Wait for ready_replicas to equal the requested number of replicas. """
if self.params.get('state') == 'absent': resource = self.find_supported_resource(KIND)
# TODO: Wait for absent
return
return_obj = None return_obj = None
for event in stream:
if event.get('object'): for event in resource.watch(namespace=self.namespace, timeout=self.params.get('wait_timeout')):
obj = ResourceInstance(resource, event['object']) entity = event['object']
if obj.metadata.name == name and hasattr(obj, 'status'): if entity.metadata.name != self.name:
if replicas == 0: continue
if not hasattr(obj.status, 'readyReplicas') or not obj.status.readyReplicas: status = entity.get('status', {})
return_obj = obj readyReplicas = status.get('readyReplicas', 0)
watcher.stop() if readyReplicas == replicas:
break return_obj = entity
if hasattr(obj.status, 'readyReplicas') and obj.status.readyReplicas == replicas:
return_obj = obj
watcher.stop()
break break
if not return_obj: if not return_obj:
@ -173,16 +161,6 @@ class KubeVirtVMIRS(KubeVirtRawModule):
"the wait_timeout period.".format(return_obj.status.ready_replicas, replicas)) "the wait_timeout period.".format(return_obj.status.ready_replicas, replicas))
return return_obj.to_dict() return return_obj.to_dict()
def wait_for_replicas(self):
namespace = self.params.get('namespace')
wait_timeout = self.params.get('wait_timeout')
replicas = self.params.get('replicas')
name = self.name
resource = self.find_supported_resource(KIND)
w, stream = self._create_stream(resource, namespace, wait_timeout)
return self._read_stream(resource, w, stream, name, replicas)
def execute_module(self): def execute_module(self):
# Parse parameters specific for this module: # Parse parameters specific for this module:
definition = virtdict() definition = virtdict()
@ -202,10 +180,17 @@ class KubeVirtVMIRS(KubeVirtRawModule):
changed = result_crud['changed'] changed = result_crud['changed']
result = result_crud.pop('result') result = result_crud.pop('result')
# Wait for the replicas: # When creating a new VMIRS object without specifying `replicas`, assume it's '1' to make the
wait = self.params.get('wait') # wait logic work correctly
if wait: if changed and result_crud['method'] == 'create' and replicas is None:
result = self.wait_for_replicas() replicas = 1
# Wait for the new number of ready replicas after a CRUD update
# Note1: doesn't work correctly when reducing number of replicas due to how VMIRS works (as of kubevirt 1.5.0)
# Note2: not the place to wait for the VMIs to get deleted when deleting the VMIRS object; that *might* be
# achievable in execute_crud(); keywords: orphanDependents, propagationPolicy, DeleteOptions
if self.params.get('wait') and replicas is not None and self.params.get('state') == 'present':
result = self.wait_for_replicas(replicas)
# Return from the module: # Return from the module:
self.exit_json(**{ self.exit_json(**{