Merge pull request #5162 from GeorgianaElena/dask-hub-split

nasa-ghg: put dask workers into their own nodepool per hub and tag them
2i2c-org · Nov 20, 2024 · c07a4a0 · c07a4a0
2 parents 73ddeb8 + 807fd1f
commit c07a4a0
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 1 deletion.
diff --git a/config/clusters/nasa-ghg/prod.values.yaml b/config/clusters/nasa-ghg/prod.values.yaml
@@ -19,3 +19,14 @@ basehub:
     singleuser:
       nodeSelector:
         2i2c/hub-name: prod
+  dask-gateway:
+    gateway:
+      backend:
+        scheduler:
+          extraPodConfig:
+            nodeSelector:
+              2i2c/hub-name: prod
+        worker:
+          extraPodConfig:
+            nodeSelector:
+              2i2c/hub-name: prod
diff --git a/config/clusters/nasa-ghg/staging.values.yaml b/config/clusters/nasa-ghg/staging.values.yaml
@@ -2,6 +2,18 @@ basehub:
   userServiceAccount:
     annotations:
       eks.amazonaws.com/role-arn: arn:aws:iam::597746869805:role/nasa-ghg-hub-staging
+  dask-gateway:
+    gateway:
+      backend:
+        scheduler:
+          extraPodConfig:
+            nodeSelector:
+              2i2c/hub-name: staging
+        worker:
+          extraPodConfig:
+            nodeSelector:
+              2i2c/hub-name: staging
+
   jupyterhub:
     ingress:
       hosts: [staging.ghg.2i2c.cloud]

diff --git a/eksctl/nasa-ghg.jsonnet b/eksctl/nasa-ghg.jsonnet
@@ -73,7 +73,18 @@ local daskNodes = [
     // A not yet fully established policy is being developed about using a single
     // node pool, see https://github.com/2i2c-org/infrastructure/issues/2687.
     //
-    { instancesDistribution+: { instanceTypes: ["r5.4xlarge"] }},
+    {
+        namePrefix: "dask-staging",
+        labels+: { "2i2c/hub-name": "staging" },
+        tags+: { "2i2c:hub-name": "staging" },
+        instancesDistribution+: { instanceTypes: ["r5.4xlarge"] }
+    },
+    {
+        namePrefix: "dask-prod",
+        labels+: { "2i2c/hub-name": "prod" },
+        tags+: { "2i2c:hub-name": "prod" },
+        instancesDistribution+: { instanceTypes: ["r5.4xlarge"] }
+    },
 ];
 
 
@@ -194,6 +205,9 @@ local daskNodes = [
             labels+: {
                 "k8s.dask.org/node-purpose": "worker"
             },
+            tags+: {
+                "2i2c:node-purpose": "worker"
+            },
             taints+: {
                 "k8s.dask.org_dedicated" : "worker:NoSchedule",
                 "k8s.dask.org/dedicated" : "worker:NoSchedule"