Merge pull request 2i2c-org#3541 from yuvipanda/hhmi

Provide resource allocation options for HHMI
sgibson91 · Dec 19, 2023 · 393bd1f · 393bd1f
2 parents 69bbbfc + 0e54e8a
commit 393bd1f
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 14 deletions.
diff --git a/config/clusters/hhmi/common.values.yaml b/config/clusters/hhmi/common.values.yaml
@@ -88,6 +88,46 @@ basehub:
           description: "Spyglass-NWB container for the Loren Frank Lab"
           slug: lorenfrank
           profile_options:
+            requests: &profile_option_requests
+              display_name: Resource Allocation
+              choices:
+                mem_3_4:
+                  display_name: 3.4 GB RAM, upto 3.477 CPUs
+                  kubespawner_override:
+                    mem_guarantee: 3644869120
+                    mem_limit: 3644869120
+                    cpu_guarantee: 0.434625
+                    cpu_limit: 3.477
+                    node_selector:
+                      node.kubernetes.io/instance-type: n2-highmem-4
+                  default: true
+                mem_6_8:
+                  display_name: 6.8 GB RAM, upto 3.477 CPUs
+                  kubespawner_override:
+                    mem_guarantee: 7289738240
+                    mem_limit: 7289738240
+                    cpu_guarantee: 0.86925
+                    cpu_limit: 3.477
+                    node_selector:
+                      node.kubernetes.io/instance-type: n2-highmem-4
+                mem_13_6:
+                  display_name: 13.6 GB RAM, upto 3.477 CPUs
+                  kubespawner_override:
+                    mem_guarantee: 14579476480
+                    mem_limit: 14579476480
+                    cpu_guarantee: 1.7385
+                    cpu_limit: 3.477
+                    node_selector:
+                      node.kubernetes.io/instance-type: n2-highmem-4
+                mem_27_2:
+                  display_name: 27.2 GB RAM, upto 3.477 CPUs
+                  kubespawner_override:
+                    mem_guarantee: 29158952960
+                    mem_limit: 29158952960
+                    cpu_guarantee: 3.477
+                    cpu_limit: 3.477
+                    node_selector:
+                      node.kubernetes.io/instance-type: n2-highmem-4
             image:
               display_name: Image
               unlisted_choice:
@@ -107,6 +147,7 @@ basehub:
           description: "Start a container with a community maintained image"
           slug: community
           profile_options:
+            requests: *profile_option_requests
             image:
               display_name: Image
               choices:
@@ -140,14 +181,6 @@ basehub:
                     default_url: /desktop
                     # Built from https://github.com/jupyterhub/jupyter-remote-desktop-proxy/pull/51
                     image: "quay.io/jupyter-remote-desktop-proxy/qgis:2023-09-27"
-          nodeSelector:
-            node.kubernetes.io/instance-type: n2-highmem-16
-          cpu:
-            guarantee: 0.5
-            limit: 14
-          memory:
-            guarantee: 4G
-            limit: 16G
     hub:
       allowNamedServers: true
       config:

diff --git a/deployer/commands/generate/resource_allocation/node-capacity-info.json b/deployer/commands/generate/resource_allocation/node-capacity-info.json
@@ -30,19 +30,19 @@
     "n2-highmem-4": {
         "capacity": {
             "cpu": 4.0,
-            "memory": 33672949760
+            "memory": 33669926912
         },
         "allocatable": {
             "cpu": 3.92,
-            "memory": 29786927104
+            "memory": 29783904256
         },
         "measured_overhead": {
-            "cpu": 0.435,
-            "memory": 488636416
+            "cpu": 0.443,
+            "memory": 624951296
         },
         "available": {
-            "cpu": 3.485,
-            "memory": 29298290688
+            "cpu": 3.477,
+            "memory": 29158952960
         }
     },
     "r5.4xlarge": {