diff --git a/tesk/services/taskmaster.py b/tesk/services/taskmaster.py index a5ca08b..a0dcacb 100755 --- a/tesk/services/taskmaster.py +++ b/tesk/services/taskmaster.py @@ -28,19 +28,19 @@ def run_executor(executor, namespace, pvc=None): if os.environ.get('EXECUTOR_BACKOFF_LIMIT') is not None: executor['spec'].update( {'backoffLimit': int(os.environ['EXECUTOR_BACKOFF_LIMIT'])} - ) - - if 'restartPolicy' not in spec.keys() and \ - 'restart_policy' in spec.keys(): - spec['restartPolicy'] = spec['restart_policy'] - - for container in spec['containers']: - if 'limits' not in container['resources'].keys(): - container['resources']['limits'] = None - if container['resources']['limits'] is None and \ - ('requests' in container['resources'].keys() and \ - container['resources']['requests'] is not None): - container['resources']['limits'] = container['resources']['requests'] + ) + + if 'restartPolicy' not in spec.keys() and \ + 'restart_policy' in spec.keys(): + spec['restartPolicy'] = spec['restart_policy'] + + for container in spec['containers']: + if 'limits' not in container['resources'].keys(): + container['resources']['limits'] = None + if container['resources']['limits'] is None and \ + ('requests' in container['resources'].keys() and \ + container['resources']['requests'] is not None): + container['resources']['limits'] = container['resources']['requests'] if pvc is not None: mounts = spec['containers'][0].setdefault('volumeMounts', [])