From 85c4f17a2eec19199867215a2bf9d0df2a09d613 Mon Sep 17 00:00:00 2001
From: Min RK <benjaminrk@gmail.com>
Date: Mon, 5 Feb 2024 12:41:12 +0100
Subject: [PATCH] increase user resources

larger user nodes

2 b3-32 will cost ~$70 over two weeks
---
 jupyterhub/gfts-hub/values.yaml |  14 ++++++++------
 terraform/main.tf               |  10 ++++++----
 terraform/secrets/ovh-creds.sh  | Bin 436 -> 436 bytes
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/jupyterhub/gfts-hub/values.yaml b/jupyterhub/gfts-hub/values.yaml
index c6f37c0..39848a3 100644
--- a/jupyterhub/gfts-hub/values.yaml
+++ b/jupyterhub/gfts-hub/values.yaml
@@ -29,11 +29,11 @@ jupyterhub:
       tag: "set-by-chartpress"
       pullPolicy: Always
     memory:
-      limit: 12G
-      guarantee: 4G
+      limit: 24G
+      guarantee: 8G
     cpu:
-      limit: 4
-      guarantee: 1
+      limit: 6
+      guarantee: 2
     extraEnv:
       CULL_CONNECTED: "1"
       CULL_TIMEOUT: "1800"
@@ -83,8 +83,10 @@ jupyterhub:
       replicas: 0
     userPods:
       nodeAffinity:
-        # TODO: 'require' when we deploy for real
-        matchNodePurpose: prefer
+        # 'prefer' lets users run on small core nodes
+        # to save cost
+        # 'require' protects core nodes from user resource consumption
+        matchNodePurpose: require
     corePods:
       nodeAffinity:
         matchNodePurpose: require
diff --git a/terraform/main.tf b/terraform/main.tf
index 2e777b8..8dcbbcc 100644
--- a/terraform/main.tf
+++ b/terraform/main.tf
@@ -89,6 +89,8 @@ resource "ovh_cloud_project_kube" "cluster" {
   update_policy = "MINIMAL_DOWNTIME"
 }
 
+# ovh node flavors: https://www.ovhcloud.com/en/public-cloud/prices/
+
 resource "ovh_cloud_project_kube_nodepool" "core" {
   service_name = local.service_name
   kube_id      = ovh_cloud_project_kube.cluster.id
@@ -122,10 +124,10 @@ resource "ovh_cloud_project_kube_nodepool" "core" {
 resource "ovh_cloud_project_kube_nodepool" "user" {
   service_name = local.service_name
   kube_id      = ovh_cloud_project_kube.cluster.id
-  name         = "user-202401"
-  # r2-120 is 8 core, 120GB
-  flavor_name = "b3-16"
-  max_nodes   = 1
+  name         = "user-202402"
+  # b3-32 is 8-core, 32GB
+  flavor_name = "b3-32"
+  max_nodes   = 2
   min_nodes   = 0
   autoscale   = true
   template {
diff --git a/terraform/secrets/ovh-creds.sh b/terraform/secrets/ovh-creds.sh
index 7b6de13eb7ffc16765c7ea2d50fc3996882eb58e..cdd36b3bc6545b1caafd7c1bbcd183868321743e 100644
GIT binary patch
literal 436
zcmV;l0ZaY>M@dveQdv+`0Hddemvd90KJg6wW(6<%7bSMxiIYq{+F(%@SIJE)uME|J
zINKbohS2mc9=Tr?uhrFnOQec90$h_4sd+pUgu72=Lz|s@S8i~gen+D$T;y^u<iS4&
zw?pOW$TaEQF(5`gckMlb8RE`r=|HOkgzi`rfX0de4@ROKTnkSAp2@`OiBQc!vJJ*5
zu$cRdjYW%O5FI$kLh9@V1CQx8r@~nVc*dfq{83}lQsBLD)Am)X&C5iB0sV8)HbwEz
z<@Bbt{b$)k_ydoU_ZKw3BwbP^2PJsKxXT1w_B==dAUonTXi-E?-jFh95{9I-yq?$q
zgF)leod+#3F7a~VSz*Psp9;i-G=xt<0hi0(2l|<6Nba=aF{4e!;@EHZK4PGz!V!GH
zg9qU-m>93m>P~ud*7)4GEHi~O$+MoU$ky^~JGYf+G#oRp8}C@qwRH%hRLwvW8w{Mk
zQj%LneNiE;70SAr3MgwO70u-)p2agSznrzt^r~Im0N6jH`Gr2m2-o}8k)|78g{DI|
eAgBr`Tu5N^WKlDmVePJ5A~xeN;|wAy&~Zxvpwl}5

literal 436
zcmV;l0ZaY>M@dveQdv+`09#S($MRQbyC+=Sb(f6wau$f3vb%s_R<}?8)89ToX6-0l
zd3fh~LH5wdM%CY*Cb>5B!k8LjY1~F>1CrO+pzNyGtH*Dt_MH8e2}TLW{{goC4c`1R
zty)E{a9r{Xh_0EyO5Br|ij1T-Z0)M<fgiuHoszgsN}O=)Q<oHmHDsqxp`Eys$h1WJ
zQfjHfBYP|>18(+-vojYJxu;eFfT{e*T5!AD<(2AbBByW~02Lh55rG8HVQisFGcm&%
z&9M~Qd*#XVLAUQEHJ0>l=4QD|kWXXGu0iSdZEk+sf_@nA^5zq;xx<@ixu3@%O9Vjk
zo(?-G9S{9~H4q&%5459(T~#*Qm$SpU38p9}KF9;+i*-P&(#N{{y{?7xkv_JHMl;aK
zQV)z4x<#a8kL^;!+i6%MH0H@T%+EbMGFIY1Pc%@lnK?T@#45Y@Vt>)lF|65Y=I);s
zFKCPAf}0QG+ka)ks=iC@$cdc!d}{b8hHCVNxdua==e^8Qi2@NIhb5OwV0#^9-=E0}
eo{w5L3rO|3MYi#fbI&>>JRWHloY7=a^02(b+TYp$