From 3342161e5ce1b2e21a3d0f10cc5e1c0ef286f399 Mon Sep 17 00:00:00 2001
From: YuviPanda <yuvipanda@gmail.com>
Date: Mon, 26 May 2025 16:37:09 -0700
Subject: [PATCH 1/2] Set quotaEnforcer.path for staging hubs too

Without this, it was only being set for non-staging hubs. So
staging hubs now have a quota set on the entire directory, instead
of for each user. We will have to unset that quota somehow.
---
 helm-charts/basehub/values.jsonnet | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/helm-charts/basehub/values.jsonnet b/helm-charts/basehub/values.jsonnet
index 7d03120907..8a50006e25 100644
--- a/helm-charts/basehub/values.jsonnet
+++ b/helm-charts/basehub/values.jsonnet
@@ -13,8 +13,9 @@ local emitDaskHubCompatibleConfig(basehubConfig) =
   if isDaskHub then { basehub: basehubConfig } else basehubConfig;
 
 local jupyterhubHomeNFSResources = {
-  quotaEnforcer: {
-    path: '/export/%s' % hub_name,
+  # The + is required so this will merge correctly with other config
+  # when needed
+  quotaEnforcer+: {
     resources: {
       requests: {
         cpu: 0.02,
@@ -26,7 +27,7 @@ local jupyterhubHomeNFSResources = {
       },
     },
   },
-  nfsServer: {
+  nfsServer+: {
     resources: {
       requests: {
         cpu: 0.2,
@@ -38,7 +39,7 @@ local jupyterhubHomeNFSResources = {
       },
     },
   },
-  prometheusExporter: {
+  prometheusExporter+: {
     resources: {
       requests: {
         cpu: 0.02,
@@ -51,7 +52,12 @@ local jupyterhubHomeNFSResources = {
     },
   },
 };
+local jupyterhubHomeNFS = {
+  quotaEnforcer: {
+    path: '/export/%s' % hub_name,
+  },
+} + if is_staging then {} else jupyterhubHomeNFSResources;
 
 emitDaskHubCompatibleConfig({
-  'jupyterhub-home-nfs': if is_staging then {} else jupyterhubHomeNFSResources,
+  'jupyterhub-home-nfs': jupyterhubHomeNFS,
 })

From 5e2cb940dd96cdb49514365d2a6e446b6013c172 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Mon, 26 May 2025 23:40:35 +0000
Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 helm-charts/basehub/values.jsonnet | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/helm-charts/basehub/values.jsonnet b/helm-charts/basehub/values.jsonnet
index 8a50006e25..5e3acfefd5 100644
--- a/helm-charts/basehub/values.jsonnet
+++ b/helm-charts/basehub/values.jsonnet
@@ -13,8 +13,8 @@ local emitDaskHubCompatibleConfig(basehubConfig) =
   if isDaskHub then { basehub: basehubConfig } else basehubConfig;
 
 local jupyterhubHomeNFSResources = {
-  # The + is required so this will merge correctly with other config
-  # when needed
+  // The + is required so this will merge correctly with other config
+  // when needed
   quotaEnforcer+: {
     resources: {
       requests: {