Add PERSISTENT_BUCKET to LEAP too

Based on https://github.com/2i2c-org/infrastructure/issues/1230#issuecomment-1278183441
yuvipanda · Oct 14, 2022 · 6ca9bbf · 6ca9bbf
1 parent f5271a3
commit 6ca9bbf
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/config/clusters/leap/prod.values.yaml b/config/clusters/leap/prod.values.yaml
@@ -6,6 +6,7 @@ basehub:
     singleuser:
       extraEnv:
         SCRATCH_BUCKET: gcs://leap-scratch/$(JUPYTERHUB_USER)
+        PERSISTENT_BUCKET: gcs://leap-persistent/$(JUPYTERHUB_USER)
         PANGEO_SCRATCH: gcs://leap-scratch/$(JUPYTERHUB_USER)
     hub:
       config:

diff --git a/config/clusters/leap/staging.values.yaml b/config/clusters/leap/staging.values.yaml
@@ -6,6 +6,7 @@ basehub:
     singleuser:
       extraEnv:
         SCRATCH_BUCKET: gcs://leap-scratch-staging/$(JUPYTERHUB_USER)
+        PERSISTENT_BUCKET: gcs://leap-persistent-staging/$(JUPYTERHUB_USER)
         PANGEO_SCRATCH: gcs://leap-scratch-staging/$(JUPYTERHUB_USER)
     hub:
       config:

diff --git a/terraform/gcp/projects/leap.tfvars b/terraform/gcp/projects/leap.tfvars
@@ -24,17 +24,24 @@ user_buckets = {
   "scratch": {
     "delete_after": 7
   }
+  # For https://github.com/2i2c-org/infrastructure/issues/1230#issuecomment-1278183441
+  "persistent": {
+    "delete_after": null
+  },
+  "persistent-staging": {
+    "delete_after": null
+  }
 }
 
 hub_cloud_permissions = {
   "staging" : {
     requestor_pays : true,
-    bucket_admin_access: ["scratch-staging"],
+    bucket_admin_access: ["scratch-staging", "persistent-staging"],
     hub_namespace: "staging"
   },
   "prod" : {
     requestor_pays : true,
-    bucket_admin_access: ["scratch"],
+    bucket_admin_access: ["scratch", "persistent"],
     hub_namespace: "prod"
   }
 }