Merge pull request #798 from MetaCell/feature/CH-182

CH-182 add default toleration to all workflows

Author: filippomc

libraries/cloudharness-common/cloudharness/workflows/operations.py

@@ -2,6 +2,8 @@
 from collections.abc import Iterable
 from typing import List, Union
 
+import argo.workflows
+import argo.workflows.client
 import yaml
 
 from cloudharness import log
@@ -10,6 +12,7 @@
 from . import argo
 from .tasks import Task, SendResultTask, CustomTask
 from .utils import PodExecutionContext, affinity_spec, is_accounts_present, name_from_path, volume_mount_template
+from argo.workflows.client import V1Toleration
 
 POLLING_WAIT_SECONDS = 1
 SERVICE_ACCOUNT = 'argo-workflows'
@@ -120,6 +123,7 @@ def spec(self):
             'entrypoint': self.entrypoint,
             'ttlStrategy': self.ttl_strategy,
             'templates': [self.modify_template(template) for template in self.templates],
+            'tolerations': [V1Toleration(key='cloudharness/temporary-job', operator='Equal', value='true').to_dict()],
             'serviceAccountName': SERVICE_ACCOUNT,
             'imagePullSecrets': [{'name': config.CloudharnessConfig.get_registry_secret()}],
             'volumes': [{

libraries/cloudharness-common/tests/test_workflow.py

@@ -122,6 +122,10 @@ def test_single_task_shared():
     accounts_offset = 1 if is_accounts_present() else 0
     assert len(op.volumes) == 1
     assert len(wf['spec']['volumes']) == 2 + accounts_offset
+    assert wf['spec']['tolerations'], "Tolerations should be added to the workflow"
+    assert wf['spec']['tolerations'][0]['key'] == 'cloudharness/temporary-job'
+    assert wf['spec']['tolerations'][0]['operator'] == 'Equal'
+    assert wf['spec']['tolerations'][0]['value'] == 'true'
     assert wf['spec']['volumes'][1 + accounts_offset]['persistentVolumeClaim']['claimName'] == 'myclaim'
     if accounts_offset == 1:
         assert wf['spec']['volumes'][1]['secret']['secretName'] == 'accounts'