diff --git a/config/clusters/openscapes/prod.values.yaml b/config/clusters/openscapes/prod.values.yaml index 235ca2d304..0e1e49ff16 100644 --- 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 index eb16900803..38028b76e6 100644 --- 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 index 77d86e6ee1..e1f9b5dc44 100644 --- 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 : "" }, }