[pull] main from 2i2c-org:main

config/clusters/2i2c-aws-us/dask-staging.values.yaml

@@ -42,13 +42,14 @@ basehub:
         GitHubOAuthenticator:
           oauth_callback_url: "https://dask-staging.aws.2i2c.cloud/hub/oauth_callback"
 
-dask-gateway:
-  gateway:
-    scheduler:
-      extraPodConfig:
-        nodeSelector:
-          2i2c/hub-name: dask-staging
-    worker:
-      extraPodConfig:
-        nodeSelector:
-          2i2c/hub-name: dask-staging
+  dask-gateway:
+    gateway:
+      backend:
+        scheduler:
+          extraPodConfig:
+            nodeSelector:
+              2i2c/hub-name: dask-staging
+        worker:
+          extraPodConfig:
+            nodeSelector:
+              2i2c/hub-name: dask-staging

config/clusters/2i2c-aws-us/ncar-cisl.values.yaml

@@ -253,13 +253,14 @@ basehub:
             extra_resource_limits:
               nvidia.com/gpu: "1"
 
-dask-gateway:
-  gateway:
-    scheduler:
-      extraPodConfig:
-        nodeSelector:
-          2i2c/hub-name: ncar-cisl
-    worker:
-      extraPodConfig:
-        nodeSelector:
-          2i2c/hub-name: ncar-cisl
+  dask-gateway:
+    gateway:
+      backend:
+        scheduler:
+          extraPodConfig:
+            nodeSelector:
+              2i2c/hub-name: ncar-cisl
+        worker:
+          extraPodConfig:
+            nodeSelector:
+              2i2c/hub-name: ncar-cisl

config/clusters/2i2c-aws-us/showcase.values.yaml

@@ -249,13 +249,14 @@ basehub:
             extra_resource_limits:
               nvidia.com/gpu: "1"
 
-dask-gateway:
-  gateway:
-    scheduler:
-      extraPodConfig:
-        nodeSelector:
-          2i2c/hub-name: showcase
-    worker:
-      extraPodConfig:
-        nodeSelector:
-          2i2c/hub-name: showcase
+  dask-gateway:
+    gateway:
+      backend:
+        scheduler:
+          extraPodConfig:
+            nodeSelector:
+              2i2c/hub-name: showcase
+        worker:
+          extraPodConfig:
+            nodeSelector:
+              2i2c/hub-name: showcase

config/clusters/2i2c/ohw.values.yaml

@@ -26,7 +26,7 @@ basehub:
           description: "~2 CPU, ~8G RAM"
           default: true
           kubespawner_override:
-            image: "ghcr.io/oceanhackweek/python:37f83fb"
+            image: "ghcr.io/oceanhackweek/python:2f04c57"
             default_url: "/lab"
             mem_limit: 8G
             mem_guarantee: 4G
@@ -35,7 +35,7 @@ basehub:
         - display_name: "R en RStudio"
           description: "~2 CPU, ~8G RAM"
           kubespawner_override:
-            image: "ghcr.io/oceanhackweek/r:13f3be6"
+            image: "ghcr.io/oceanhackweek/r:6db529b"
             default_url: "/rstudio"
             mem_limit: 8G
             mem_guarantee: 4G

config/clusters/earthscope/prod.values.yaml

@@ -28,3 +28,14 @@ basehub:
         2i2c/hub-name: prod
       extraEnv:
         SCRATCH_BUCKET: s3://earthscope-scratch/$(JUPYTERHUB_USER)
+  dask-gateway:
+    gateway:
+      backend:
+        scheduler:
+          extraPodConfig:
+            nodeSelector:
+              2i2c/hub-name: prod
+        worker:
+          extraPodConfig:
+            nodeSelector:
+              2i2c/hub-name: prod

config/clusters/earthscope/staging.values.yaml

@@ -30,3 +30,14 @@ basehub:
         2i2c/hub-name: staging
       extraEnv:
         SCRATCH_BUCKET: s3://earthscope-scratch-staging/$(JUPYTERHUB_USER)
+  dask-gateway:
+    gateway:
+      backend:
+        scheduler:
+          extraPodConfig:
+            nodeSelector:
+              2i2c/hub-name: staging
+        worker:
+          extraPodConfig:
+            nodeSelector:
+              2i2c/hub-name: staging

config/clusters/gridsst/prod.values.yaml

@@ -15,3 +15,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

config/clusters/gridsst/staging.values.yaml

@@ -15,3 +15,14 @@ basehub:
     singleuser:
       nodeSelector:
         2i2c/hub-name: staging
+  dask-gateway:
+    gateway:
+      backend:
+        scheduler:
+          extraPodConfig:
+            nodeSelector:
+              2i2c/hub-name: staging
+        worker:
+          extraPodConfig:
+            nodeSelector:
+              2i2c/hub-name: staging

config/clusters/jupyter-meets-the-earth/prod.values.yaml

@@ -32,3 +32,14 @@ basehub:
       nodeSelector:
         2i2c/hub-name: prod
         node.kubernetes.io/instance-type: m5.xlarge
+  dask-gateway:
+    gateway:
+      backend:
+        scheduler:
+          extraPodConfig:
+            nodeSelector:
+              2i2c/hub-name: prod
+        worker:
+          extraPodConfig:
+            nodeSelector:
+              2i2c/hub-name: prod

config/clusters/jupyter-meets-the-earth/staging.values.yaml

@@ -17,3 +17,14 @@ basehub:
         2i2c/hub-name: staging
       extraEnv:
         SCRATCH_BUCKET: s3://jupyter-meets-the-earth-scratch-staging/$(JUPYTERHUB_USER)
+  dask-gateway:
+    gateway:
+      backend:
+        scheduler:
+          extraPodConfig:
+            nodeSelector:
+              2i2c/hub-name: staging
+        worker:
+          extraPodConfig:
+            nodeSelector:
+              2i2c/hub-name: staging

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

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]

config/clusters/opensci/big-binder.values.yaml

@@ -3,6 +3,14 @@ dask-gateway:
   gateway:
     backend:
       imagePullSecrets: [{ name: image-pull-secret }]
+      scheduler:
+        extraPodConfig:
+          nodeSelector:
+            2i2c/hub-name: big-binder
+      worker:
+        extraPodConfig:
+          nodeSelector:
+            2i2c/hub-name: big-binder
 jupyterhub:
   ingress:
     hosts: [hub.big.binder.opensci.2i2c.cloud]

config/clusters/opensci/climaterisk.values.yaml

@@ -39,3 +39,14 @@ jupyterhub:
     cpu:
       guarantee: 1.8625
       limit: 3.725
+dask-gateway:
+  gateway:
+    backend:
+      scheduler:
+        extraPodConfig:
+          nodeSelector:
+            2i2c/hub-name: climaterisk
+      worker:
+        extraPodConfig:
+          nodeSelector:
+            2i2c/hub-name: climaterisk

config/clusters/smithsonian/prod.values.yaml

@@ -12,3 +12,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

config/clusters/smithsonian/staging.values.yaml

@@ -12,3 +12,14 @@ basehub:
     singleuser:
       nodeSelector:
         2i2c/hub-name: staging
+  dask-gateway:
+    gateway:
+      backend:
+        scheduler:
+          extraPodConfig:
+            nodeSelector:
+              2i2c/hub-name: staging
+        worker:
+          extraPodConfig:
+            nodeSelector:
+              2i2c/hub-name: staging

eksctl/earthscope.jsonnet

@@ -98,12 +98,25 @@ 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",
             "earthscope:application:name": "geolab",
             "earthscope:application:owner": "research-onramp-to-the-cloud"
         },
+        instancesDistribution+: { instanceTypes: ["r5.4xlarge"] }
+    },
+    {
+        namePrefix: "dask-prod",
+        labels+: { "2i2c/hub-name": "prod" },
+        tags+: {
+            "2i2c:hub-name": "prod",
+            "earthscope:application:name": "geolab",
+            "earthscope:application:owner": "research-onramp-to-the-cloud"
+        },
+        instancesDistribution+: { instanceTypes: ["r5.4xlarge"] }
     },
 ];
 
@@ -235,6 +248,9 @@ local daskNodes = [
                 "k8s.dask.org_dedicated" : "worker:NoSchedule",
                 "k8s.dask.org/dedicated" : "worker:NoSchedule"
             },
+            tags+: {
+                "2i2c:node-purpose": "worker"
+            },
             instancesDistribution+: {
                 onDemandBaseCapacity: 0,
                 onDemandPercentageAboveBaseCapacity: 0,

eksctl/gridsst.jsonnet

@@ -174,7 +174,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"] }
+    },
 ];
 
 
@@ -294,6 +305,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"

eksctl/jupyter-meets-the-earth.jsonnet

@@ -199,7 +199,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"] }
+    },
 ];
 
 
@@ -320,6 +331,9 @@ local daskNodes = [
             labels+: {
                 "k8s.dask.org/node-purpose": "worker"
             },
+            tags+: {
+                "k8s.dask.org/node-purpose": "worker"
+            },
             taints+: {
                 "k8s.dask.org_dedicated" : "worker:NoSchedule",
                 "k8s.dask.org/dedicated" : "worker:NoSchedule"