From 5a79359e6744f68501e4be870884637bcbecd988 Mon Sep 17 00:00:00 2001
From: Miguel Caballer <micafer1@upv.es>
Date: Mon, 28 Oct 2024 08:28:28 +0100
Subject: [PATCH] Add dask worker options

---
 artifacts/openeo_k8s.yml |  8 +++++++-
 templates/openeo.yaml    | 14 ++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/artifacts/openeo_k8s.yml b/artifacts/openeo_k8s.yml
index c3ac828..8107230 100644
--- a/artifacts/openeo_k8s.yml
+++ b/artifacts/openeo_k8s.yml
@@ -7,7 +7,9 @@
     oidc_organisation: "{{ openeo_oidc_organisation | default('egi') }}"
     oidc_roles: "{{ openeo_oidc_roles | default(['']) }}"
     executor_version: "{{ openeo_executor_version | default('2024.9.2') }}"
-    api_version: "{{ openeo_api_version | default('2024.10.1') }}"
+    api_version: "{{ openeo_api_version | default('2024.10.2') }}"
+    dask_worker_cores: "{{ openeo_dask_worker_cores | default(1) }}"
+    dask_worker_memory: "{{ openeo_dask_worker_memory | default(2) }}"
   tasks:
     - name: Set default DNS name (nip.io)
       set_fact:
@@ -35,6 +37,10 @@
               stacCatalogueUrl: "{{ stac_url }}"
               workspaceRoot: "/user_workspaces"
               executorImage: "ghcr.io/eodcgmbh/openeo-argoworkflows:executor-{{ executor_version }}"
+              daskWorkerCores: "{{ dask_worker_cores }}"
+              daskWorkerMemory: "{{ dask_worker_memory }}"
+              daskWorkerLimit: "6"
+              daskClusterTimeout: "3600"
           image:
             repository: ghcr.io/eodcgmbh/openeo-argoworkflows
             # Overrides the image tag whose default is the chart appVersion.
diff --git a/templates/openeo.yaml b/templates/openeo.yaml
index d7897da..483fbd4 100644
--- a/templates/openeo.yaml
+++ b/templates/openeo.yaml
@@ -38,6 +38,18 @@ topology_template:
       type: string
       description: OpenEO DNS name (leave empty to use openeo.<node_ip>.nip.io)
       default: ""
+    openeo_dask_worker_cores:
+      type: integer
+      description: Number of cores per Dask worker
+      default: 2
+      constraints:
+        - greater_than: 0
+    openeo_dask_worker_memory:
+      type: integer
+      description: Memory per Dask worker (in GiB)
+      default: 4
+      constraints:
+        - greater_than: 1
 
     # Restrict some K8s input values
 
@@ -73,6 +85,8 @@ topology_template:
               openeo_oidc_organisation: { get_input: openeo_oidc_organisation }
               openeo_oidc_roles: { get_input: openeo_oidc_roles }
               openeo_dns_name: { get_input: openeo_dns_name }
+              openeo_dask_worker_cores: { get_input: openeo_dask_worker_cores }
+              openeo_dask_worker_memory: { get_input: openeo_dask_worker_memory }
       requirements:
         - host: front
         - dependency: lrms_front_end