Merge pull request #3173 from yuvipanda/ubc-resourcefix

Update UBC EOAS resource requests based on observed usage
2i2c-org · Sep 28, 2023 · d7c2f7a · d7c2f7a
2 parents eab9491 + b6ad5f1
commit d7c2f7a
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 15 deletions.
diff --git a/config/clusters/ubc-eoas/common.values.yaml b/config/clusters/ubc-eoas/common.values.yaml
@@ -59,25 +59,29 @@ jupyterhub:
 
   singleuser:
     defaultUrl: /lab
+    memory:
+      # https://2i2c.freshdesk.com/a/tickets/955
+      # Based on request from community rep
+      guarantee: 4G
+      limit: 4G
+    cpu:
+      # https://2i2c.freshdesk.com/a/tickets/955
+      # Based on request from community rep
+      guarantee: 0.1
+      limit: 1
+    nodeSelector:
+      node.kubernetes.io/instance-type: r5.2xlarge
     profileList:
       - display_name: EOSC211
-        description: "For class EOSC211, provides ~2 CPU and ~8G RAM"
+        description: "For class EOSC211, provides upto 1 CPU and ~4G RAM"
         default: true
         kubespawner_override:
-          mem_limit: 8G
-          mem_guarantee: 6.5G
-          node_selector:
-            node.kubernetes.io/instance-type: m5.large
           # Using 'latest' for now so updates do not require 2i2c
           # involvement.
           image: quay.io/henrykmodzelewski/2i2c-eosc211:latest
       - display_name: EOSC350
-        description: "For class EOSC350, provides ~2 CPU and ~8G RAM"
+        description: "For class EOSC350, provides upto 1 CPU and ~4G RAM"
         kubespawner_override:
-          mem_limit: 8G
-          mem_guarantee: 6.5G
-          node_selector:
-            node.kubernetes.io/instance-type: m5.large
           # Using 'latest' for now so updates do not require 2i2c
           # involvement.
           image: quay.io/henrykmodzelewski/2i2c-eosc350:latest

diff --git a/eksctl/ubc-eoas.jsonnet b/eksctl/ubc-eoas.jsonnet
@@ -25,13 +25,13 @@ local nodeAz = "ca-central-1a";
 // A `node.kubernetes.io/instance-type label is added, so pods
 // can request a particular kind of node with a nodeSelector
 local notebookNodes = [
+    # TODO: this m5 instance type is to be deleted when its no longer has user pods
+    #       running on it, we have transitioned to use r5 instance types (highmem)
     { instanceType: "m5.large" },
-    { instanceType: "m5.xlarge" },
-    { instanceType: "m5.2xlarge" },
-    { instanceType: "m5.8xlarge" },
+    { instanceType: "r5.2xlarge" },
 ];
 
-local daskNodes = []
+local daskNodes = [];
 
 
 {
@@ -134,4 +134,4 @@ local daskNodes = []
         } + n for n in daskNodes
         ] else []
     )
-}
+}