Merge pull request #471 from yuvipanda/cbplan

Provixion x1 instances for carbonplan
2i2c-org · Jun 14, 2021 · ec14dd8 · ec14dd8
2 parents 5e1d165 + 805ee0a
commit ec14dd8
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 19 deletions.
diff --git a/config/hubs/carbonplan.cluster.yaml b/config/hubs/carbonplan.cluster.yaml
@@ -92,6 +92,20 @@ hubs:
                   mem_guarantee: 240G
                   node_selector:
                     node.kubernetes.io/instance-type: r5.8xlarge
+              - display_name: "Very Huge: x1.16xlarge"
+                description: "~64 CPU, ~976G RAM"
+                kubespawner_override:
+                  mem_limit: null
+                  mem_guarantee: 940G
+                  node_selector:
+                    node.kubernetes.io/instance-type: x1.16xlarge
+              - display_name: "Very Very Huge: x1.32xlarge"
+                description: "~128 CPU, ~1952G RAM"
+                kubespawner_override:
+                  mem_limit: null
+                  mem_guarantee: 1900G
+                  node_selector:
+                    node.kubernetes.io/instance-type: x1.32xlarge
           scheduling:
             userPlaceholder:
               enabled: false

diff --git a/hub-templates/daskhub/values.yaml b/hub-templates/daskhub/values.yaml
@@ -13,6 +13,8 @@ basehub:
       hook:
         enabled: false
     singleuser:
+      # Almost everyone using dask by default wants JupyterLab
+      defaultUrl: /lab
       extraLabels:
          hub.jupyter.org/network-access-proxy-http: "true"
 
@@ -178,8 +180,8 @@ dask-gateway:
                     "environment": options.environment,
                 }
             return Options(
-                Integer("worker_cores", 2, min=1, max=16, label="Worker Cores"),
-                Float("worker_memory", 4, min=1, max=32, label="Worker Memory (GiB)"),
+                Integer("worker_cores", 2, min=1, label="Worker Cores"),
+                Float("worker_memory", 4, min=1, label="Worker Memory (GiB)"),
                 # The default image is set via DASK_GATEWAY__CLUSTER__OPTIONS__IMAGE env variable
                 String("image", label="Image"),
                 Mapping("environment", {}, label="Environment Variables"),

diff --git a/kops/carbonplan.jsonnet b/kops/carbonplan.jsonnet
@@ -6,7 +6,9 @@ local nodes = [
     {spec+: { machineType: "r5.large" }}, // 2CPU, 16G RAM
     {spec+: { machineType: "r5.xlarge" }}, // 4CPU, 32G RAM
     {spec+: { machineType: "r5.2xlarge" }}, // 8CPU, 64G RAM
-    {spec+: { machineType: "r5.8xlarge" }} // 32CPU, 256 RAM
+    {spec+: { machineType: "r5.8xlarge" }}, // 32CPU, 256 RAM
+    {spec+: { machineType: "x1.16xlarge" }}, // 64CPU, 976G RAM
+    {spec+: { machineType: "x1.32xlarge" }} // 128CPU, 1952G RAM
 ];
 
 local data = {