Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make all GCP clusters support the instance types 4, 16, and 64 CPU highmem nodes #3319

Merged
merged 7 commits into from
Oct 31, 2023
Merged

Make all GCP clusters support the instance types 4, 16, and 64 CPU highmem nodes #3319

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6a7c9b4
Make the three default instance types available to all gcp clusters
GeorgianaElena Oct 24, 2023
bb8c803
Update the templates with more specific naming of instances
GeorgianaElena Oct 27, 2023
a9cf27a
Switch from generic naming of instances to new proposed names
GeorgianaElena Oct 27, 2023
334dbe5
Don't rename pre-existing node pools
GeorgianaElena Oct 27, 2023
bbc6f68
Rename node pools per instance type in one more place
GeorgianaElena Oct 27, 2023
f444764
Rename node pools per instance type in one more place
GeorgianaElena Oct 27, 2023
36cd208
Add fixme comments and some missing trailing commas
GeorgianaElena Oct 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion terraform/gcp/projects/2i2c-uk.tfvars
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,19 @@ filestore_capacity_gb = 1024
notebook_nodes = {
"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"
}
}

user_buckets = {}
14 changes: 7 additions & 7 deletions terraform/gcp/projects/basehub-template.tfvars
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
machine_type : "n2-highmem-4"
},
"medium" : {
"n2-highmem-16" : {
min : 0,
max : 100,
machine_type : "n2-highmem-16",
machine_type : "n2-highmem-16"
},
"large" : {
"n2-highmem-64" : {
min : 0,
max : 100,
machine_type : "n2-highmem-64",
},
machine_type : "n2-highmem-64"
}
}

user_buckets = {}
12 changes: 11 additions & 1 deletion terraform/gcp/projects/callysto.tfvars
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,19 @@ filestore_capacity_gb = 1024
notebook_nodes = {
"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"
}
}

user_buckets = {}
12 changes: 11 additions & 1 deletion terraform/gcp/projects/cloudbank.tfvars
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,19 @@ filestore_capacity_gb = 1024
notebook_nodes = {
"user" : {
min : 0,
max : 20,
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.
Expand Down
14 changes: 7 additions & 7 deletions terraform/gcp/projects/daskhub-template.tfvars
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
machine_type : "n2-highmem-4"
},
"medium" : {
"n2-highmem-16" : {
min : 0,
max : 100,
machine_type : "n2-highmem-16",
machine_type : "n2-highmem-16"
},
"large" : {
"n2-highmem-64" : {
min : 0,
max : 100,
machine_type : "n2-highmem-64",
},
machine_type : "n2-highmem-64"
}
}

# Setup a single node pool for dask workers.
Expand Down
10 changes: 10 additions & 0 deletions terraform/gcp/projects/hhmi.tfvars
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,16 @@ notebook_nodes = {
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.
Expand Down
10 changes: 10 additions & 0 deletions terraform/gcp/projects/leap.tfvars
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,23 @@ hub_cloud_permissions = {

# Setup notebook node pools
notebook_nodes = {
"n2-highmem-4" : {
min : 0,
max : 100,
machine_type : "n2-highmem-4"
},
"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,
Expand Down
7 changes: 6 additions & 1 deletion terraform/gcp/projects/linked-earth.tfvars
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,13 @@ notebook_nodes = {
"medium" : {
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"
}
}

# Setup a single node pool for dask workers.
Expand Down
15 changes: 15 additions & 0 deletions terraform/gcp/projects/m2lines.tfvars
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
15 changes: 15 additions & 0 deletions terraform/gcp/projects/pangeo-hubs.tfvars
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
12 changes: 11 additions & 1 deletion terraform/gcp/projects/pilot-hubs.tfvars
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,19 @@ filestore_capacity_gb = 5120
notebook_nodes = {
"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,
Expand Down
5 changes: 5 additions & 0 deletions terraform/gcp/projects/qcl.tfvars
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,11 @@ notebook_nodes = {
max : 100,
machine_type : "n2-standard-48",
},
"n2-highmem-64" : {
min : 0,
max : 100,
machine_type : "n2-highmem-64"
}
"huge" : {
min : 0,
max : 100,
Expand Down