Merge pull request #3319 from GeorgianaElena/add-default-machine-types

Make all GCP clusters support the instance types 4, 16, and 64 CPU highmem nodes
2i2c-org · Oct 31, 2023 · dd8760f · dd8760f
2 parents f9fbcef + 36cd208
commit dd8760f
Show file tree

Hide file tree

Showing 15 changed files with 141 additions and 23 deletions.
diff --git a/terraform/gcp/projects/2i2c-uk.tfvars b/terraform/gcp/projects/2i2c-uk.tfvars
@@ -19,11 +19,22 @@ enable_filestore      = true
 filestore_capacity_gb = 1024
 
 notebook_nodes = {
+  # FIXME: Rename this to "n2-highmem-4" when given the chance and no such nodes are running
   "user" : {
     min : 0,
-    max : 20,
-    machine_type : "n2-highmem-4"
+    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",
+  }
 }
 
 user_buckets = {}
diff --git a/terraform/gcp/projects/awi-ciroh.tfvars b/terraform/gcp/projects/awi-ciroh.tfvars
@@ -31,20 +31,23 @@ user_buckets = {
 
 # Setup notebook node pools
 notebook_nodes = {
+  # FIXME: Rename this to "n2-highmem-4" when given the chance and no such nodes are running
   "small" : {
     min : 0,
     max : 100,
-    machine_type : "n2-highmem-4"
+    machine_type : "n2-highmem-4",
   },
+  # FIXME: Rename this to "n2-highmem-16" when given the chance and no such nodes are running
   "medium" : {
     min : 0,
     max : 100,
-    machine_type : "n2-highmem-16"
+    machine_type : "n2-highmem-16",
   },
+  # FIXME: Rename this to "n2-highmem-64" when given the chance and no such nodes are running
   "large" : {
     min : 0,
     max : 100,
-    machine_type : "n2-highmem-64"
+    machine_type : "n2-highmem-64",
   },
 }
 

diff --git a/terraform/gcp/projects/basehub-template.tfvars b/terraform/gcp/projects/basehub-template.tfvars
@@ -24,21 +24,21 @@ enable_filestore      = true
 filestore_capacity_gb = 1024
 
 notebook_nodes = {
-  "small" : {
+  "n2-highmem-4" : {
     min : 0,
     max : 100,
     machine_type : "n2-highmem-4",
   },
-  "medium" : {
+  "n2-highmem-16" : {
     min : 0,
     max : 100,
     machine_type : "n2-highmem-16",
   },
-  "large" : {
+  "n2-highmem-64" : {
     min : 0,
     max : 100,
     machine_type : "n2-highmem-64",
-  },
+  }
 }
 
 user_buckets = {}
diff --git a/terraform/gcp/projects/callysto.tfvars b/terraform/gcp/projects/callysto.tfvars
@@ -19,11 +19,22 @@ enable_filestore      = true
 filestore_capacity_gb = 1024
 
 notebook_nodes = {
+  # FIXME: Rename this to "n2-highmem-4" when given the chance and no such nodes are running
   "user" : {
     min : 0,
-    max : 20,
-    machine_type : "n2-highmem-4"
+    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",
+  }
 }
 
 user_buckets = {}
diff --git a/terraform/gcp/projects/catalystproject-latam.tfvars b/terraform/gcp/projects/catalystproject-latam.tfvars
@@ -17,16 +17,19 @@ filestore_capacity_gb = 1024
 core_node_machine_type = "n2-highmem-2"
 
 notebook_nodes = {
+  # FIXME: Rename this to "n2-highmem-4" when given the chance and no such nodes are running
   "small" : {
     min : 0,
     max : 100,
     machine_type : "n2-highmem-4",
   },
+  # FIXME: Rename this to "n2-highmem-16" when given the chance and no such nodes are running
   "medium" : {
     min : 0,
     max : 100,
     machine_type : "n2-highmem-16",
   },
+  # FIXME: Rename this to "n2-highmem-64" when given the chance and no such nodes are running
   "large" : {
     min : 0,
     max : 100,

diff --git a/terraform/gcp/projects/cloudbank.tfvars b/terraform/gcp/projects/cloudbank.tfvars
@@ -22,11 +22,22 @@ enable_filestore      = true
 filestore_capacity_gb = 1024
 
 notebook_nodes = {
+  # FIXME: Rename this to "n2-highmem-4" when given the chance and no such nodes are running
   "user" : {
     min : 0,
-    max : 20,
-    machine_type : "n1-highmem-4"
+    max : 100,
+    machine_type : "n1-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",
+  }
 }
 
 # Setup a single node pool for dask workers.

diff --git a/terraform/gcp/projects/daskhub-template.tfvars b/terraform/gcp/projects/daskhub-template.tfvars
@@ -42,21 +42,21 @@ hub_cloud_permissions = {
 
 # Setup notebook node pools
 notebook_nodes = {
-  "small" : {
+  "n2-highmem-4" : {
     min : 0,
     max : 100,
     machine_type : "n2-highmem-4",
   },
-  "medium" : {
+  "n2-highmem-16" : {
     min : 0,
     max : 100,
     machine_type : "n2-highmem-16",
   },
-  "large" : {
+  "n2-highmem-64" : {
     min : 0,
     max : 100,
     machine_type : "n2-highmem-64",
-  },
+  }
 }
 
 # Setup a single node pool for dask workers.

diff --git a/terraform/gcp/projects/hhmi.tfvars b/terraform/gcp/projects/hhmi.tfvars
@@ -22,11 +22,22 @@ hub_cloud_permissions = {}
 
 # Setup notebook node pools
 notebook_nodes = {
+  # FIXME: Rename this to "n2-highmem-16" when given the chance and no such nodes are running
   "medium" : {
     min : 0,
     max : 100,
     machine_type : "n2-highmem-16",
   },
+  "n2-highmem-4" : {
+    min : 0,
+    max : 100,
+    machine_type : "n2-highmem-4",
+  },
+  "n2-highmem-64" : {
+    min : 0,
+    max : 100,
+    machine_type : "n2-highmem-64",
+  }
 }
 
 # Setup a single node pool for dask workers.

diff --git a/terraform/gcp/projects/leap.tfvars b/terraform/gcp/projects/leap.tfvars
@@ -70,13 +70,24 @@ hub_cloud_permissions = {
 
 # Setup notebook node pools
 notebook_nodes = {
+  "n2-highmem-4" : {
+    min : 0,
+    max : 100,
+    machine_type : "n2-highmem-4",
+  },
+  # FIXME: Rename this to "n2-highmem-16" when given the chance and no such nodes are running
   "medium" : {
     # A minimum of one is configured for LEAP to ensure quick startups at all
     # time. Cost is not a greater concern than optimizing startup times.
     min : 1,
     max : 100,
     machine_type : "n2-highmem-16",
   },
+  "n2-highmem-64" : {
+    min : 0,
+    max : 100,
+    machine_type : "n2-highmem-64"
+  }
   "gpu-t4" : {
     min : 0,
     max : 100,

diff --git a/terraform/gcp/projects/linked-earth.tfvars b/terraform/gcp/projects/linked-earth.tfvars
@@ -29,16 +29,24 @@ user_buckets = {
 
 # Setup notebook node pools
 notebook_nodes = {
+  # FIXME: Rename this to "n2-highmem-4" when given the chance and no such nodes are running
   "small" : {
     min : 0,
     max : 100,
-    machine_type : "n2-highmem-4"
+    machine_type : "n2-highmem-4",
   },
+  # FIXME: Rename this to "n2-highmem-16" when given the chance and no such nodes are running
   "medium" : {
     min : 0,
     max : 100,
-    machine_type : "n2-highmem-16"
+    machine_type : "n2-highmem-16",
   },
+  # FIXME: Rename this to "n2-highmem-64" when given the chance and no such nodes are running
+  "n2-highmem-64" : {
+    min : 0,
+    max : 100,
+    machine_type : "n2-highmem-64",
+  }
 }
 
 # Setup a single node pool for dask workers.

diff --git a/terraform/gcp/projects/m2lines.tfvars b/terraform/gcp/projects/m2lines.tfvars
@@ -46,6 +46,21 @@ user_buckets = {
 
 # Setup notebook node pools
 notebook_nodes = {
+  "n2-highmem-4" : {
+    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",
+  },
   "small" : {
     min : 0,
     max : 100,

diff --git a/terraform/gcp/projects/meom-ige.tfvars b/terraform/gcp/projects/meom-ige.tfvars
@@ -18,17 +18,17 @@ notebook_nodes = {
   "n2-highmem-4" : {
     min : 0,
     max : 100,
-    machine_type : "n2-highmem-4"
+    machine_type : "n2-highmem-4",
   },
   "n2-highmem-16" : {
     min : 0,
     max : 100,
-    machine_type : "n2-highmem-16"
+    machine_type : "n2-highmem-16",
   },
   "n2-highmem-64" : {
     min : 0,
     max : 100,
-    machine_type : "n2-highmem-64"
+    machine_type : "n2-highmem-64",
   },
   "small" : {
     min : 0,

diff --git a/terraform/gcp/projects/pangeo-hubs.tfvars b/terraform/gcp/projects/pangeo-hubs.tfvars
@@ -50,6 +50,21 @@ user_buckets = {
 
 # Setup notebook node pools
 notebook_nodes = {
+  "n2-highmem-4" : {
+    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",
+  },
   "small" : {
     min : 0,
     max : 100,

diff --git a/terraform/gcp/projects/pilot-hubs.tfvars b/terraform/gcp/projects/pilot-hubs.tfvars
@@ -19,11 +19,22 @@ enable_filestore      = true
 filestore_capacity_gb = 5120
 
 notebook_nodes = {
+  # FIXME: Rename this to "n2-highmem-4" when given the chance and no such nodes are running
   "user" : {
     min : 0,
-    max : 20,
+    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",
+  }
   "climatematch" : {
     min : 0,
     max : 100,

diff --git a/terraform/gcp/projects/qcl.tfvars b/terraform/gcp/projects/qcl.tfvars
@@ -27,21 +27,29 @@ user_buckets = {
 }
 
 notebook_nodes = {
+  # FIXME: Rename this to "n2-highmem-4" when given the chance and no such nodes are running
   "small" : {
     min : 0,
     max : 100,
     machine_type : "n2-highmem-4",
   },
+  # FIXME: Rename this to "n2-highmem-16" when given the chance and no such nodes are running
   "medium" : {
     min : 0,
     max : 100,
     machine_type : "n2-highmem-16",
   },
+  # FIXME: Rename this to "n2-highmem-48" when given the chance and no such nodes are running
   "large" : {
     min : 0,
     max : 100,
     machine_type : "n2-standard-48",
   },
+  "n2-highmem-64" : {
+    min : 0,
+    max : 100,
+    machine_type : "n2-highmem-64",
+  }
   "huge" : {
     min : 0,
     max : 100,