feat: use resource allocation from #6313

Author: agoose77

config/clusters/berkeley-geojupyter/common.values.yaml

@@ -108,43 +108,48 @@ jupyterhub:
         resource_allocation:
           display_name: Resource Allocation
           choices:
-            mem_3_7:
-              display_name: 3.7 GB RAM, upto 3.7 CPUs
+            mem_4_gb:
+              display_name: ~4 GB RAM, ~0.5 CPUs
+              description: Up to ~4 CPUs when available
+              default: true
               kubespawner_override:
-                mem_guarantee: 3982489550
-                mem_limit: 3982489550
-                cpu_guarantee: 0.465625
-                cpu_limit: 3.725
+                mem_guarantee: 3902839759
+                mem_limit: 3902839759
+                cpu_guarantee: 0.4563125
+                cpu_limit: 3.6505
                 node_selector:
                   node.kubernetes.io/instance-type: r5.xlarge
-              default: true
-            mem_7_4:
-              display_name: 7.4 GB RAM, upto 3.7 CPUs
+            mem_7_gb:
+              display_name: ~7 GB RAM, ~0.9 CPUs
+              description: Up to ~4 CPUs when available
               kubespawner_override:
-                mem_guarantee: 7964979101
-                mem_limit: 7964979101
-                cpu_guarantee: 0.93125
-                cpu_limit: 3.725
+                mem_guarantee: 7805679519
+                mem_limit: 7805679519
+                cpu_guarantee: 0.912625
+                cpu_limit: 3.6505
                 node_selector:
                   node.kubernetes.io/instance-type: r5.xlarge
-            mem_14_8:
-              display_name: 14.8 GB RAM, upto 3.7 CPUs
+            mem_15_gb:
+              display_name: ~15 GB RAM, ~1.8 CPUs
+              description: Up to ~4 CPUs when available
               kubespawner_override:
-                mem_guarantee: 15929958203
-                mem_limit: 15929958203
-                cpu_guarantee: 1.8625
-                cpu_limit: 3.725
+                mem_guarantee: 15611359038
+                mem_limit: 15611359038
+                cpu_guarantee: 1.82525
+                cpu_limit: 3.6505
                 node_selector:
                   node.kubernetes.io/instance-type: r5.xlarge
-            mem_29_7:
-              display_name: 29.7 GB RAM, upto 3.7 CPUs
+            mem_29_gb:
+              display_name: ~29 GB RAM, ~4 CPUs
+              description: ~4 CPUs always available
               kubespawner_override:
-                mem_guarantee: 31859916406
-                mem_limit: 31859916406
-                cpu_guarantee: 3.725
-                cpu_limit: 3.725
+                mem_guarantee: 31222718077
+                mem_limit: 31222718077
+                cpu_guarantee: 3.6505
+                cpu_limit: 3.6505
                 node_selector:
                   node.kubernetes.io/instance-type: r5.xlarge
+
 binderhub-service:
   enabled: true
     # Explicitly specify what nodes we want for our builds