From 6ca9bbff37621c650d840b96a36ea06ffae99c3c Mon Sep 17 00:00:00 2001 From: YuviPanda Date: Fri, 14 Oct 2022 11:27:15 -0700 Subject: [PATCH] Add PERSISTENT_BUCKET to LEAP too Based on https://github.com/2i2c-org/infrastructure/issues/1230#issuecomment-1278183441 --- config/clusters/leap/prod.values.yaml | 1 + config/clusters/leap/staging.values.yaml | 1 + terraform/gcp/projects/leap.tfvars | 11 +++++++++-- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/config/clusters/leap/prod.values.yaml b/config/clusters/leap/prod.values.yaml index 1f51278d5f..be7775a10c 100644 --- 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 index b2d10acc51..c958f11cca 100644 --- 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 index 2a0c373581..61c7f9b596 100644 --- 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" } }