From 688bd0125a054ca6d17d633cd8a14e5a0a8567c4 Mon Sep 17 00:00:00 2001 From: "alvaro.gonzalez" Date: Wed, 28 Aug 2024 14:56:53 +0300 Subject: [PATCH 1/3] Fix: restartPolicy and limits - If restart_policy but restartPolicy does not, uses the former to populate the later - If limits is empty, uses requests so limits == requests --- src/tesk_core/taskmaster.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/tesk_core/taskmaster.py b/src/tesk_core/taskmaster.py index 4fd506d..1a38a61 100755 --- a/src/tesk_core/taskmaster.py +++ b/src/tesk_core/taskmaster.py @@ -25,6 +25,15 @@ 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 container['resources']['limits'] is None and \ + container['resources']['requests'] is not None: + container['resources']['limits'] = container['resources']['requests'] + if pvc is not None: mounts = spec['containers'][0].setdefault('volumeMounts', []) mounts.extend(pvc.volume_mounts) From c17fe8b999261776dd57b295c09f98e160935fbf Mon Sep 17 00:00:00 2001 From: "alvaro.gonzalez" Date: Wed, 28 Aug 2024 16:09:41 +0300 Subject: [PATCH 2/3] In case limits do not exists --- src/tesk_core/taskmaster.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/tesk_core/taskmaster.py b/src/tesk_core/taskmaster.py index 1a38a61..c7a7ee6 100755 --- a/src/tesk_core/taskmaster.py +++ b/src/tesk_core/taskmaster.py @@ -30,8 +30,11 @@ def run_executor(executor, namespace, pvc=None): 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 \ - container['resources']['requests'] is not None: + ('requests' in container['resources'].keys() and \ + container['resources']['requests'] is not None): container['resources']['limits'] = container['resources']['requests'] if pvc is not None: From 35d755179d44d98fdd57cbcb1f011ced620e6bbf Mon Sep 17 00:00:00 2001 From: "alvaro.gonzalez" Date: Thu, 29 Aug 2024 09:24:56 +0300 Subject: [PATCH 3/3] Upgrade urllib --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 7b6aa72..db7eacd 100644 --- a/setup.py +++ b/setup.py @@ -10,7 +10,7 @@ INSTALL_DEPS = ['kubernetes==9.0.0', 'requests>=2.20.0', - 'urllib3==1.26.18', + 'urllib3==1.26.19', 'boto3==1.16.18', ] TEST_DEPS = [ 'pytest',