feat(dask): update openapi (reanahub#701)

Alputer · Oct 24, 2024 · 434e95a · 434e95a
1 parent 07188d0
commit 434e95a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 66 deletions.
diff --git a/docs/openapi.json b/docs/openapi.json
@@ -429,29 +429,21 @@
                     "slurmcern"
                   ]
                 },
-                "dask_cluster_default_cores_limit": {
-                  "title": "Default cores limit for dask clusters",
-                  "value": "4"
-                },
-                "dask_cluster_default_memory_limit": {
-                  "title": "Default memory limit for dask clusters",
+                "dask_cluster_default_number_of_workers": {
+                  "title": "Default number of workers for Dask clusters",
                   "value": "2Gi"
                 },
-                "dask_cluster_default_single_worker_cores": {
-                  "title": "Number of cores for one dask worker by default",
-                  "value": "0.5"
-                },
                 "dask_cluster_default_single_worker_memory": {
-                  "title": "Amount of memory for one dask worker by default",
-                  "value": "256Mi"
-                },
-                "dask_cluster_max_cores_limit": {
-                  "title": "Maximum cores limit for dask clusters",
-                  "value": "8"
+                  "title": "Amount of memory for one Dask worker by default",
+                  "value": "2Gi"
                 },
                 "dask_cluster_max_memory_limit": {
-                  "title": "Maximum memory limit for dask clusters",
-                  "value": "4Gi"
+                  "title": "Maximum memory limit for Dask clusters",
+                  "value": "16Gi"
+                },
+                "dask_cluster_max_single_worker_memory": {
+                  "title": "Maximum amount of memory for one Dask worker",
+                  "value": "8Gi"
                 },
                 "dask_enabled": {
                   "title": "Dask workflows allowed in the cluster",
@@ -507,29 +499,7 @@
                   },
                   "type": "object"
                 },
-                "dask_cluster_default_cores_limit": {
-                  "properties": {
-                    "title": {
-                      "type": "string"
-                    },
-                    "value": {
-                      "type": "string"
-                    }
-                  },
-                  "type": "object"
-                },
-                "dask_cluster_default_memory_limit": {
-                  "properties": {
-                    "title": {
-                      "type": "string"
-                    },
-                    "value": {
-                      "type": "string"
-                    }
-                  },
-                  "type": "object"
-                },
-                "dask_cluster_default_single_worker_cores": {
+                "dask_cluster_default_number_of_workers": {
                   "properties": {
                     "title": {
                       "type": "string"
@@ -551,7 +521,7 @@
                   },
                   "type": "object"
                 },
-                "dask_cluster_max_cores_limit": {
+                "dask_cluster_max_memory_limit": {
                   "properties": {
                     "title": {
                       "type": "string"
@@ -562,7 +532,7 @@
                   },
                   "type": "object"
                 },
-                "dask_cluster_max_memory_limit": {
+                "dask_cluster_max_single_worker_memory": {
                   "properties": {
                     "title": {
                       "type": "string"
@@ -679,18 +649,6 @@
                   "type": "object"
                 }
               },
-              "required": [
-                "compute_backends",
-                "default_kubernetes_jobs_timeout",
-                "default_kubernetes_memory_limit",
-                "default_workspace",
-                "kubernetes_max_memory_limit",
-                "maximum_interactive_session_inactivity_period",
-                "maximum_kubernetes_jobs_timeout",
-                "maximum_workspace_retention_period",
-                "workspaces_available",
-                "dask_enabled"
-              ],
               "type": "object"
             }
           },

diff --git a/reana_server/rest/info.py b/reana_server/rest/info.py
@@ -166,17 +166,6 @@ def info(user, **kwargs):  # noqa
                     type: string
                 type: object
             type: object
-            required:
-              - compute_backends
-              - default_kubernetes_jobs_timeout
-              - default_kubernetes_memory_limit
-              - default_workspace
-              - kubernetes_max_memory_limit
-              - maximum_interactive_session_inactivity_period
-              - maximum_kubernetes_jobs_timeout
-              - maximum_workspace_retention_period
-              - workspaces_available
-              - dask_enabled
           examples:
             application/json:
               {