Merge pull request 2i2c-org#3832 from sgibson91/openscapes/persistent…

…-bucket [Openscapes] Set up persistent buckets
yuvipanda · Mar 25, 2024 · 048b0bb · 048b0bb
2 parents 466d193 + 81133dd
commit 048b0bb
Show file tree

Hide file tree

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

diff --git a/config/clusters/openscapes/staging.values.yaml b/config/clusters/openscapes/staging.values.yaml
@@ -11,6 +11,7 @@ basehub:
     singleuser:
       extraEnv:
         SCRATCH_BUCKET: s3://openscapeshub-scratch-staging/$(JUPYTERHUB_USER)
+        PERSISTENT_BUCKET: s3://openscapeshub-persistent-staging/$(JUPYTERHUB_USER)
     hub:
       config:
         GitHubOAuthenticator:

diff --git a/terraform/aws/projects/openscapes.tfvars b/terraform/aws/projects/openscapes.tfvars
@@ -13,17 +13,29 @@ user_buckets = {
   },
   "prod-homedirs-archive" : {
     "archival_storageclass_after" : 3
+  },
+  "persistent-staging" : {
+    "delete_after" : null
+  },
+  "persistent" : {
+    "delete_after" : null
   }
 }
 
 
 hub_cloud_permissions = {
   "staging" : {
-    bucket_admin_access : ["scratch-staging"],
+    bucket_admin_access : [
+      "scratch-staging",
+      "persistent-staging"
+    ],
     extra_iam_policy : ""
   },
   "prod" : {
-    bucket_admin_access : ["scratch"],
+    bucket_admin_access : [
+      "scratch",
+      "persistent"
+    ],
     extra_iam_policy : ""
   },
 }