Merge pull request #5227 from sgibson91/cryocloud/ebs-volume-prod

cryocloud: Use EBS volumes with per user quotas for home dir storage
2i2c-org · Dec 12, 2024 · 52c5d3e · 52c5d3e
2 parents e1c089c + 5e31341
commit 52c5d3e
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 3 deletions.
diff --git a/config/clusters/nasa-cryo/common.values.yaml b/config/clusters/nasa-cryo/common.values.yaml
@@ -4,6 +4,7 @@ basehub:
     volumeReporter:
       enabled: false
     pv:
+      # pv.serverIP is set in each individual staging and prod config file
       enabled: true
       # from https://docs.aws.amazon.com/efs/latest/ug/mounting-fs-nfs-mount-settings.html
       mountOptions:
@@ -13,7 +14,6 @@ basehub:
         - soft # We pick soft over hard, so NFS lockups don't lead to hung processes
         - retrans=2
         - noresvport
-      serverIP: fs-0872256335d483d5f.efs.us-west-2.amazonaws.com
       baseShareName: /
   dask-gateway:
     enabled: true
@@ -270,3 +270,7 @@ basehub:
     scheduling:
       userScheduler:
         enabled: true
+  jupyterhub-home-nfs:
+    enabled: true
+    eks:
+      enabled: true
diff --git a/config/clusters/nasa-cryo/prod.values.yaml b/config/clusters/nasa-cryo/prod.values.yaml
@@ -1,4 +1,7 @@
 basehub:
+  nfs:
+    pv:
+      serverIP: 10.100.217.176
   userServiceAccount:
     annotations:
       eks.amazonaws.com/role-arn: arn:aws:iam::574251165169:role/nasa-cryo-prod
@@ -30,3 +33,9 @@ basehub:
           extraPodConfig:
             nodeSelector:
               2i2c/hub-name: prod
+  jupyterhub-home-nfs:
+    eks:
+      volumeId: vol-00b9cf4a258bce8ef
+    quotaEnforcer:
+      hardQuota: "350" # in GB
+      path: "/export/prod"
diff --git a/config/clusters/nasa-cryo/staging.values.yaml b/config/clusters/nasa-cryo/staging.values.yaml
@@ -34,9 +34,7 @@ basehub:
             nodeSelector:
               2i2c/hub-name: staging
   jupyterhub-home-nfs:
-    enabled: true
     eks:
-      enabled: true
       volumeId: vol-02e09b4fdbf07100a
     quotaEnforcer:
       hardQuota: "0.1" # in GB

diff --git a/terraform/aws/projects/nasa-cryo.tfvars b/terraform/aws/projects/nasa-cryo.tfvars
@@ -11,6 +11,12 @@ ebs_volumes = {
     type        = "gp3"
     name_suffix = "staging"
     tags        = { "2i2c:hub-name" : "staging" }
+  },
+  "prod" = {
+    size        = 3500
+    type        = "gp3"
+    name_suffix = "prod"
+    tags        = { "2i2c:hub-name" : "prod" }
   }
 }