Handle resource exhaustion for hhmi in us-west-2

config/clusters/hhmi/binder.values.yaml

@@ -27,7 +27,7 @@ jupyterhub:
     nodeSelector:
       # Schedule users on the smallest instance
       # https://github.com/2i2c-org/infrastructure/issues/4241
-      node.kubernetes.io/instance-type: n2-highmem-4
+      node.kubernetes.io/instance-type: n2-highmem-2
     cloudMetadata:
       blockWithIptables: false
     cpu:
@@ -96,7 +96,7 @@ binderhub-service:
     nodeSelector:
       # Schedule dockerApi pods to run on the smallest user nodes only
       # https://github.com/2i2c-org/infrastructure/issues/4241
-      node.kubernetes.io/instance-type: n2-highmem-4
+      node.kubernetes.io/instance-type: n2-highmem-2
   ingress:
     enabled: true
     hosts: [binder.hhmi.2i2c.cloud]
@@ -110,7 +110,7 @@ binderhub-service:
       node_selector:
         # Schedule builder pods to run on the smallest user nodes only
         # https://github.com/2i2c-org/infrastructure/issues/4241
-        node.kubernetes.io/instance-type: n2-highmem-4
+        node.kubernetes.io/instance-type: n2-highmem-2
     BinderHub:
       base_url: /
       hub_url: https://hub.binder.hhmi.2i2c.cloud

config/clusters/hhmi/spyglass.values.yaml

@@ -83,7 +83,7 @@ jupyterhub:
       limit: 3.4G
       guarantee: 3.4G
     nodeSelector:
-      node.kubernetes.io/instance-type: n2-highmem-4
+      node.kubernetes.io/instance-type: n2-highmem-2
     extraContainers:
     - name: mysql
       image: datajoint/mysql:8.0   # following the spyglass tutorial at https://lorenfranklab.github.io/spyglass/latest/notebooks/00_Setup/#existing-database

config/clusters/hhmi/staging.values.yaml

@@ -75,7 +75,7 @@ jupyterhub:
       limit: 3.4G
       guarantee: 3.4G
     nodeSelector:
-      node.kubernetes.io/instance-type: n2-highmem-4
+      node.kubernetes.io/instance-type: n2-highmem-2
     extraContainers:
     - name: mysql
       image: datajoint/mysql:8.0   # following the spyglass tutorial at https://lorenfranklab.github.io/spyglass/latest/notebooks/00_Setup/#existing-database

terraform/gcp/projects/hhmi.tfvars

@@ -33,21 +33,17 @@ hub_cloud_permissions = {
 
 user_buckets = {}
 
-# Setup notebook node pools
+# Setup a single node pool, as we don't offer resource selection dropdowns here
 notebook_nodes = {
-  "n2-highmem-4" : {
+  "n2-highmem-2" : {
     min : 0,
-    max : 100,
-    machine_type : "n2-highmem-4",
-  },
-  "n2-highmem-16" : {
-    min : 0,
-    max : 100,
-    machine_type : "n2-highmem-16",
-  },
-  "n2-highmem-64" : {
-    min : 0,
-    max : 100,
-    machine_type : "n2-highmem-64",
+    max : 10, # Capped at 10 rather than 100
+    machine_type : "n2-highmem-2",
+    zones : [
+      # us-west2 has limited resources, so lots of resource exhaustion
+      "us-west2-a",
+      "us-west2-b",
+      "us-west2-c",
+    ]
   }
 }