From 3e9b4e97b5bfb04497a4a8c92e7e519df077cbbd Mon Sep 17 00:00:00 2001 From: Sarah Gibson Date: Wed, 4 Dec 2024 11:14:16 +0000 Subject: [PATCH 1/4] nasa-cryo: create an EBS volume for prod hub --- terraform/aws/projects/nasa-cryo.tfvars | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/terraform/aws/projects/nasa-cryo.tfvars b/terraform/aws/projects/nasa-cryo.tfvars index 1d05d6687..16519e8ff 100644 --- 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" } } } From a6f7e26fec5e2dd1b06c1249c4ca00014f9ace22 Mon Sep 17 00:00:00 2001 From: Sarah Gibson Date: Wed, 4 Dec 2024 11:24:13 +0000 Subject: [PATCH 2/4] nasa-cryo: enable jupyterhub-home-nfs on prod hub and combine common config --- config/clusters/nasa-cryo/common.values.yaml | 4 ++++ config/clusters/nasa-cryo/prod.values.yaml | 3 +++ config/clusters/nasa-cryo/staging.values.yaml | 2 -- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/config/clusters/nasa-cryo/common.values.yaml b/config/clusters/nasa-cryo/common.values.yaml index 9160cd546..5de860014 100644 --- a/config/clusters/nasa-cryo/common.values.yaml +++ b/config/clusters/nasa-cryo/common.values.yaml @@ -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 index 3c98a47ab..5d37bbfcb 100644 --- a/config/clusters/nasa-cryo/prod.values.yaml +++ b/config/clusters/nasa-cryo/prod.values.yaml @@ -30,3 +30,6 @@ basehub: extraPodConfig: nodeSelector: 2i2c/hub-name: prod + jupyterhub-home-nfs: + eks: + volumeId: vol-00b9cf4a258bce8ef diff --git a/config/clusters/nasa-cryo/staging.values.yaml b/config/clusters/nasa-cryo/staging.values.yaml index 73a59690c..f5ecc6b3a 100644 --- 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 From 366600512ef56dfc0870ff5918cacef0975a128c Mon Sep 17 00:00:00 2001 From: Sarah Gibson Date: Thu, 12 Dec 2024 10:42:15 +0000 Subject: [PATCH 3/4] nasa-cryo: add quotas to prod home directories --- config/clusters/nasa-cryo/prod.values.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/clusters/nasa-cryo/prod.values.yaml b/config/clusters/nasa-cryo/prod.values.yaml index 5d37bbfcb..362e4898e 100644 --- a/config/clusters/nasa-cryo/prod.values.yaml +++ b/config/clusters/nasa-cryo/prod.values.yaml @@ -33,3 +33,6 @@ basehub: jupyterhub-home-nfs: eks: volumeId: vol-00b9cf4a258bce8ef + quotaEnforcer: + hardQuota: "350" # in GB + path: "/export/prod" From 5e3134143c6d16ea15bce1590f1060a494387078 Mon Sep 17 00:00:00 2001 From: Sarah Gibson Date: Thu, 12 Dec 2024 10:43:52 +0000 Subject: [PATCH 4/4] nasa-cryo: switch prod's server IP to EBS volume --- config/clusters/nasa-cryo/common.values.yaml | 2 +- config/clusters/nasa-cryo/prod.values.yaml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/config/clusters/nasa-cryo/common.values.yaml b/config/clusters/nasa-cryo/common.values.yaml index 5de860014..3e6c66291 100644 --- 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 diff --git a/config/clusters/nasa-cryo/prod.values.yaml b/config/clusters/nasa-cryo/prod.values.yaml index 362e4898e..fee0b1301 100644 --- 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