feat(cwl_reana): pass K8s requests/limits to job controller (#292)

Closes reanahub/reana#883

Author: Alputer

AUTHORS.md

@@ -4,6 +4,7 @@ The list of contributors in alphabetical order:
 
 - [Adelina Lintuluoto](https://orcid.org/0000-0002-0726-1452)
 - [Agisilaos Kounelis](https://orcid.org/0000-0001-9312-3189)
+- [Alp Tuna](https://orcid.org/0009-0001-1915-3993)
 - [Anton Khodak](https://orcid.org/0000-0003-3263-4553)
 - [Audrius Mecionis](https://orcid.org/0000-0002-3759-1663)
 - [Camila Diaz](https://orcid.org/0000-0001-5543-797X)

reana_workflow_engine_cwl/cwl_reana.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # This file is part of REANA.
-# Copyright (C) 2018, 2019, 2020, 2021, 2022 CERN.
+# Copyright (C) 2018, 2019, 2020, 2021, 2022, 2025 CERN.
 #
 # REANA is free software; you can redistribute it and/or modify it
 # under the terms of the MIT License; see LICENSE file for more details.
@@ -268,6 +268,9 @@ def shouldquote(x):
         slurm_partition = self._get_hint("slurm_partition")
         slurm_time = self._get_hint("slurm_time")
         kubernetes_uid = self._get_hint("kubernetes_uid")
+        kubernetes_cpu_request = self._get_hint("kubernetes_cpu_request")
+        kubernetes_cpu_limit = self._get_hint("kubernetes_cpu_limit")
+        kubernetes_memory_request = self._get_hint("kubernetes_memory_request")
         kubernetes_memory_limit = self._get_hint("kubernetes_memory_limit")
         kubernetes_job_timeout = self._get_hint("kubernetes_job_timeout")
         c4p_cpu_cores = self._get_hint("c4p_cpu_cores")
@@ -289,6 +292,9 @@ def shouldquote(x):
             "htcondor_max_runtime": htcondor_max_runtime,
             "htcondor_accounting_group": htcondor_accounting_group,
             "kubernetes_uid": kubernetes_uid,
+            "kubernetes_cpu_request": kubernetes_cpu_request,
+            "kubernetes_cpu_limit": kubernetes_cpu_limit,
+            "kubernetes_memory_request": kubernetes_memory_request,
             "kubernetes_memory_limit": kubernetes_memory_limit,
             "kubernetes_job_timeout": kubernetes_job_timeout,
             "slurm_partition": slurm_partition,

requirements.txt

@@ -8,12 +8,12 @@ amqp==5.2.0               # via kombu
 appdirs==1.4.4            # via fs
 argcomplete==3.2.2        # via cwltool
 attrs==23.2.0             # via jsonschema
-backports-zoneinfo[tzdata]==0.2.1  # via backports-zoneinfo, kombu
+backports-zoneinfo[tzdata]==0.2.1  # via kombu
 bagit==1.8.1              # via cwltool
 bracex==2.4               # via wcmatch
 bravado==10.3.2           # via reana-commons
 bravado-core==6.1.0       # via bravado, reana-commons
-cachecontrol[filecache]==0.13.1  # via cachecontrol, schema-salad
+cachecontrol[filecache]==0.13.1  # via schema-salad
 certifi==2024.2.2         # via requests
 charset-normalizer==3.3.2  # via requests
 checksumdir==1.1.9        # via reana-commons
@@ -48,7 +48,7 @@ python-dateutil==2.9.0    # via bravado, bravado-core, prov
 pytz==2024.1              # via bravado-core
 pyyaml==6.0.1             # via bravado, bravado-core, reana-commons, swagger-spec-validator
 rdflib==5.0.0             # via cwltool, prov, schema-salad
-reana-commons[cwl]==0.9.9	# via reana-workflow-engine-cwl (setup.py)
+reana-commons[cwl]==0.9.11  # via reana-workflow-engine-cwl (setup.py)
 requests==2.31.0          # via bravado, bravado-core, cachecontrol, cwltool, schema-salad
 rfc3987==1.3.8            # via jsonschema
 ruamel-yaml==0.17.10      # via cwltool, schema-salad

setup.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # This file is part of REANA.
-# Copyright (C) 2017, 2018, 2019, 2020, 2021, 2022 CERN.
+# Copyright (C) 2017, 2018, 2019, 2020, 2021, 2022, 2025 CERN.
 #
 # REANA is free software; you can redistribute it and/or modify it
 # under the terms of the MIT License; see LICENSE file for more details.
@@ -43,7 +43,7 @@
 ]
 
 install_requires = [
-    "reana-commons[cwl]>=0.9.9,<0.10.0",
+    "reana-commons[cwl]>=0.9.11,<0.10.0",
 ]
 
 packages = find_packages()