From d6639ddb5e45cf9ed34e1cdfbf31f95cfb28f8f8 Mon Sep 17 00:00:00 2001 From: Georgiana Dolocan Date: Thu, 28 Mar 2024 22:57:34 +0200 Subject: [PATCH 01/10] Add the staging dandi hub --- config/clusters/dandi/cluster.yaml | 10 +- config/clusters/dandi/common.values.yaml | 146 ++++++++++++++++++ .../dandi/enc-staging.secret.values.yaml | 20 +++ config/clusters/dandi/staging.values.yaml | 15 ++ eksctl/dandi.jsonnet | 15 +- terraform/aws/projects/dandi.tfvars | 7 +- 6 files changed, 194 insertions(+), 19 deletions(-) create mode 100644 config/clusters/dandi/common.values.yaml create mode 100644 config/clusters/dandi/enc-staging.secret.values.yaml create mode 100644 config/clusters/dandi/staging.values.yaml diff --git a/config/clusters/dandi/cluster.yaml b/config/clusters/dandi/cluster.yaml index cee37ed0d3..2be272405c 100644 --- a/config/clusters/dandi/cluster.yaml +++ b/config/clusters/dandi/cluster.yaml @@ -11,4 +11,12 @@ support: helm_chart_values_files: - support.values.yaml - enc-support.secret.values.yaml -hubs: [] +hubs: + - name: staging + display_name: "MIT DANDI (staging)" + domain: staging.dandi.2i2c.cloud + helm_chart: basehub + helm_chart_values_files: + - common.values.yaml + - staging.values.yaml + - enc-staging.secret.values.yaml diff --git a/config/clusters/dandi/common.values.yaml b/config/clusters/dandi/common.values.yaml new file mode 100644 index 0000000000..5df332710f --- /dev/null +++ b/config/clusters/dandi/common.values.yaml @@ -0,0 +1,146 @@ +nfs: + enabled: true + pv: + enabled: true + # from https://docs.aws.amazon.com/efs/latest/ug/mounting-fs-nfs-mount-settings.html + mountOptions: + - rsize=1048576 + - wsize=1048576 + - timeo=600 + - soft # We pick soft over hard, so NFS lockups don't lead to hung processes + - retrans=2 + - noresvport + serverIP: fs-0bf8c8fce5ca8695f.efs.us-east-2.amazonaws.com + baseShareName: / +jupyterhub: + hub: + config: + JupyterHub: + authenticator_class: github + Authenticator: + enable_auth_state: true + admin_users: + - asdf + - kabilar + - aaronkanzer + - asmacdo + - satra + - yarikoptic + - waxlamp + custom: + 2i2c: + add_staff_user_ids_to_admin_users: true + add_staff_user_ids_of_type: "github" + jupyterhubConfigurator: + enabled: false + homepage: + templateVars: + org: + logo_url: "https://raw.githubusercontent.com/dandi/artwork/3f287d3ae53154a66f8b50711549740719a23fdb/pics/dandi-logo.svg" + url: "https://dandiarchive.org/" + designed_by: + name: 2i2c + url: https://2i2c.org + operated_by: + name: 2i2c + url: https://2i2c.org + funded_by: + name: "DANDI (MIT Brain)" + url: "https://dandiarchive.org/" + scheduling: + userScheduler: + enabled: true + singleuser: + profileList: + - display_name: "DANDI (CPU)" + description: "Default DANDI image with JupyterLab" + default: true + kubespawner_override: + image: dandiarchive/dandihub:latest + image_pull_policy: Always + default_url: /lab + profile_options: &profile_options_cpu + requests: + display_name: Resource Allocation + choices: + mem_3_7: + display_name: 3.7 GB RAM, upto 3.7 CPUs + kubespawner_override: + mem_guarantee: 3982682624 + mem_limit: 3982682624 + cpu_guarantee: 0.46875 + cpu_limit: 3.75 + node_selector: + node.kubernetes.io/instance-type: r5.xlarge + default: true + mem_7_4: + display_name: 7.4 GB RAM, upto 3.7 CPUs + kubespawner_override: + mem_guarantee: 7965365248 + mem_limit: 7965365248 + cpu_guarantee: 0.9375 + cpu_limit: 3.75 + node_selector: + node.kubernetes.io/instance-type: r5.xlarge + mem_14_8: + display_name: 14.8 GB RAM, upto 3.7 CPUs + kubespawner_override: + mem_guarantee: 15930730496 + mem_limit: 15930730496 + cpu_guarantee: 1.875 + cpu_limit: 3.75 + node_selector: + node.kubernetes.io/instance-type: r5.xlarge + mem_29_7: + display_name: 29.7 GB RAM, upto 3.7 CPUs + kubespawner_override: + mem_guarantee: 31861460992 + mem_limit: 31861460992 + cpu_guarantee: 3.75 + cpu_limit: 3.75 + node_selector: + node.kubernetes.io/instance-type: r5.xlarge + - display_name: "DANDI Matlab (CPU)" + description: "DANDI image with MATLAB. Requires you to bring your own license" + kubespawner_override: + image: dandiarchive/dandihub:latest-matlab + image_pull_policy: Always + profile_options: *profile_options_cpu + - display_name: "DANDI (GPU)" + description: "DANDI image with JupyterLab and GPU support" + kubespawner_override: + image: dandiarchive/dandihub:latest-gpu + image_pull_policy: Always + extra_resource_limits: + nvidia.com/gpu: 1 + profile_options: &profile_options_gpu + requests: + display_name: Resource Allocation + choices: + gpu_1: + display_name: 1 T4 GPU, ~4 CPUs, ~16GB of RAM + kubespawner_override: + mem_guarantee: 14G + mem_limit: 16G + cpu_guarantee: 3 + cpu_limit: 4 + node_selector: + node.kubernetes.io/instance-type: g4dn.xlarge + default: true + gpu_2: + display_name: 1 T4 GPU, ~8 CPUs, ~32GB of RAM + kubespawner_override: + mem_guarantee: 29G + mem_limit: 32G + cpu_guarantee: 6 + cpu_limit: 8 + node_selector: + node.kubernetes.io/instance-type: g4dn.2xlarge + - display_name: "DANDI Matlab (GPU)" + description: "DANDI Matlab image with GPU support. Requires you to bring your own license." + kubespawner_override: + image: dandiarchive/dandihub:latest-gpu-matlab + image_pull_policy: Always + extra_resource_limits: + nvidia.com/gpu: 1 + profile_options: *profile_options_gpu diff --git a/config/clusters/dandi/enc-staging.secret.values.yaml b/config/clusters/dandi/enc-staging.secret.values.yaml new file mode 100644 index 0000000000..bae08d553f --- /dev/null +++ b/config/clusters/dandi/enc-staging.secret.values.yaml @@ -0,0 +1,20 @@ +jupyterhub: + hub: + config: + GitHubOAuthenticator: + client_id: ENC[AES256_GCM,data:36XvfIO3qOI9RdfNAwZA9WdG+AE=,iv:OhawuU/IKP4n8VYWub3o60ljLCpAnUCR8U2rxS4R0CA=,tag:eQoJ1pRHMJd6QWyOE9yoLA==,type:str] + client_secret: ENC[AES256_GCM,data:uIpmcAJQ9WsLYwe+/QRSyGCasK5bVTPfxn89umhmVvwR1qXDsmLXEQ==,iv:4DAtEjj+bHSU7T+sG7AZa9jlwdhsl9bg/OhNk7Dj8EE=,tag:28R2UJwU1+H6a7IjWi+UTA==,type:str] +sops: + kms: [] + gcp_kms: + - resource_id: projects/two-eye-two-see/locations/global/keyRings/sops-keys/cryptoKeys/similar-hubs + created_at: "2024-03-27T16:04:45Z" + enc: CiUA4OM7ePqxiqs9++GjbB2FDQnNdmoVHS7O7Zcl2aMFfp1a11/vEkkAXoW3Jve/+QrP/HLbBVHIvuGz722VBqrZXIRQLHzfh1UR91ke/JBGHYp8CNQoji4wDYGNiuT6QwtEB5QXJxY7SMlCkR5qmSFu + azure_kv: [] + hc_vault: [] + age: [] + lastmodified: "2024-03-28T20:40:59Z" + mac: ENC[AES256_GCM,data:50U5gW7d3eMUDKojfZECf2xpyrQsqjGlqz/03GRuaObsmx25rU+6UWV68p22orcjC5kT13DqXjWqvzClVOntP9dV8jIpCjSSc4wrKw9Yo0BoSUMZ59k0uLVfGzV/umiIcaDaum/JDkwn2Dl+dx19HBWYxhbECsPQ2ZyJZJso/ok=,iv:TOrtexsqE7kRQ8Q9g6HKbRIXz2m745JBCs0n+QwOdko=,tag:WXqmp3sf46fmypLDQzRC7Q==,type:str] + pgp: [] + unencrypted_suffix: _unencrypted + version: 3.7.3 diff --git a/config/clusters/dandi/staging.values.yaml b/config/clusters/dandi/staging.values.yaml new file mode 100644 index 0000000000..a330bd0e65 --- /dev/null +++ b/config/clusters/dandi/staging.values.yaml @@ -0,0 +1,15 @@ +jupyterhub: + ingress: + hosts: [staging.dandi.2i2c.cloud] + tls: + - hosts: [staging.dandi.2i2c.cloud] + secretName: https-auto-tls + hub: + config: + GitHubOAuthenticator: + oauth_callback_url: https://staging.dandi.2i2c.cloud/hub/oauth_callback + custom: + homepage: + templateVars: + org: + name: MIT DANDI (staging) diff --git a/eksctl/dandi.jsonnet b/eksctl/dandi.jsonnet index d4aa0c508d..026970bfa7 100644 --- a/eksctl/dandi.jsonnet +++ b/eksctl/dandi.jsonnet @@ -47,20 +47,7 @@ local notebookNodes = [ availabilityZones: masterAzs, } ]; -local daskNodes = [ - // Node definitions for dask worker nodes. Config here is merged - // with our dask worker node definition, which uses spot instances. - // A `node.kubernetes.io/instance-type label is set to the name of the - // *first* item in instanceDistribution.instanceTypes, to match - // what we do with notebook nodes. Pods can request a particular - // kind of node with a nodeSelector - // - // A not yet fully established policy is being developed about using a single - // node pool, see https://github.com/2i2c-org/infrastructure/issues/2687. - // - { instancesDistribution+: { instanceTypes: ["r5.4xlarge"] }}, -]; - +local daskNodes = []; { apiVersion: 'eksctl.io/v1alpha5', diff --git a/terraform/aws/projects/dandi.tfvars b/terraform/aws/projects/dandi.tfvars index a517550c4b..0f8b2bf0ae 100644 --- a/terraform/aws/projects/dandi.tfvars +++ b/terraform/aws/projects/dandi.tfvars @@ -8,19 +8,18 @@ user_buckets = { "scratch-staging" : { "delete_after" : 7 }, - "scratch" : { + "scratch-dandi" : { "delete_after" : 7 }, } - hub_cloud_permissions = { "staging" : { bucket_admin_access : ["scratch-staging"], extra_iam_policy : "" }, - "prod" : { - bucket_admin_access : ["scratch"], + "dandi" : { + bucket_admin_access : ["scratch-dandi"], extra_iam_policy : "" }, } \ No newline at end of file From 22695d439be4ad641d4030cf6d9a1e4fe0334c62 Mon Sep 17 00:00:00 2001 From: Georgiana Dolocan Date: Thu, 28 Mar 2024 23:08:08 +0200 Subject: [PATCH 02/10] Add dandi hub --- config/clusters/dandi/cluster.yaml | 8 ++++++++ config/clusters/dandi/dandi.values.yaml | 15 ++++++++++++++ .../dandi/enc-dandi.secret.values.yaml | 20 +++++++++++++++++++ 3 files changed, 43 insertions(+) create mode 100644 config/clusters/dandi/dandi.values.yaml create mode 100644 config/clusters/dandi/enc-dandi.secret.values.yaml diff --git a/config/clusters/dandi/cluster.yaml b/config/clusters/dandi/cluster.yaml index 2be272405c..b99a34d8d6 100644 --- a/config/clusters/dandi/cluster.yaml +++ b/config/clusters/dandi/cluster.yaml @@ -20,3 +20,11 @@ hubs: - common.values.yaml - staging.values.yaml - enc-staging.secret.values.yaml + - name: dandi + display_name: "MIT DANDI (staging)" + domain: dandi.2i2c.cloud + helm_chart: basehub + helm_chart_values_files: + - common.values.yaml + - dandi.values.yaml + - enc-dandi.secret.values.yaml diff --git a/config/clusters/dandi/dandi.values.yaml b/config/clusters/dandi/dandi.values.yaml new file mode 100644 index 0000000000..363dfbaad3 --- /dev/null +++ b/config/clusters/dandi/dandi.values.yaml @@ -0,0 +1,15 @@ +jupyterhub: + ingress: + hosts: [dandi.2i2c.cloud] + tls: + - hosts: [dandi.2i2c.cloud] + secretName: https-auto-tls + hub: + config: + GitHubOAuthenticator: + oauth_callback_url: https://dandi.2i2c.cloud/hub/oauth_callback + custom: + homepage: + templateVars: + org: + name: MIT DANDI diff --git a/config/clusters/dandi/enc-dandi.secret.values.yaml b/config/clusters/dandi/enc-dandi.secret.values.yaml new file mode 100644 index 0000000000..799ada35ec --- /dev/null +++ b/config/clusters/dandi/enc-dandi.secret.values.yaml @@ -0,0 +1,20 @@ +jupyterhub: + hub: + config: + GitHubOAuthenticator: + client_id: ENC[AES256_GCM,data:GHXwlK8xb1mqg8JyKV9MCveoBBY=,iv:dh4byjuzDeHxf9RRH2D/UVQc6O6eu1oq3s6mluA9aCI=,tag:HaqPA1l1fYy0OjowJNBnIg==,type:str] + client_secret: ENC[AES256_GCM,data:H5y0hUlRVn+zreyLsi20qSFVdLx7HrQSyfPM9CIzqMiG3wTrvMV1lA==,iv:6yfWAMH01UP5DVW4DuM0MvDV4HkHRoH89Ib+41c8uYg=,tag:PZl90fWWxJ+hs1baYPag4w==,type:str] +sops: + kms: [] + gcp_kms: + - resource_id: projects/two-eye-two-see/locations/global/keyRings/sops-keys/cryptoKeys/similar-hubs + created_at: "2024-03-28T20:59:26Z" + enc: CiUA4OM7eEw+PG5huNxT8nSngA2L2N3GbBS5PMEaJXNQRFXgf2MCEkkAXoW3JkxVvTaBas/24VBQ+fyYZcfqhjDm5u4EP/mzsrVvXwC/xjMY/TrDyJWgBUMH17jCVmdqpRWEPrcPU3SFO+wiinn9xyjh + azure_kv: [] + hc_vault: [] + age: [] + lastmodified: "2024-03-28T21:01:36Z" + mac: ENC[AES256_GCM,data:0CPxn8WAaQNJ4HALOEKJgHFv9eZ3q9bVg8sd3e8rCnsG0FZdbt/qibGlCtF0ow4a5NUcoygNhVIndLVufKFNNVNvDl00qyg5ke78oZFWHg+3CzVjs4PQIvG4K1M0xwlVC1S8MZtcUBCCvyND5l/ahLVLxYJjDvXSg3R66NwECx0=,iv:l8T/ufDQeeDfAPMds5uJoC5KC4I5ePhuEs5Bd1gC4rw=,tag:lT5Q0bLzZJ+ZMQ8+xErZRA==,type:str] + pgp: [] + unencrypted_suffix: _unencrypted + version: 3.7.3 From f58da5a511c1249505e0869d2b1cbba76c190e95 Mon Sep 17 00:00:00 2001 From: Georgiana Dolocan Date: Tue, 2 Apr 2024 12:01:29 +0300 Subject: [PATCH 03/10] Rename to prod --- config/clusters/dandi/cluster.yaml | 4 ++-- .../clusters/dandi/{dandi.values.yaml => prod.values.yaml} | 0 eksctl/dandi.jsonnet | 1 + terraform/aws/projects/dandi.tfvars | 6 +++--- 4 files changed, 6 insertions(+), 5 deletions(-) rename config/clusters/dandi/{dandi.values.yaml => prod.values.yaml} (100%) diff --git a/config/clusters/dandi/cluster.yaml b/config/clusters/dandi/cluster.yaml index b99a34d8d6..1bc24ef62a 100644 --- a/config/clusters/dandi/cluster.yaml +++ b/config/clusters/dandi/cluster.yaml @@ -20,11 +20,11 @@ hubs: - common.values.yaml - staging.values.yaml - enc-staging.secret.values.yaml - - name: dandi + - name: prod display_name: "MIT DANDI (staging)" domain: dandi.2i2c.cloud helm_chart: basehub helm_chart_values_files: - common.values.yaml - - dandi.values.yaml + - prod.values.yaml - enc-dandi.secret.values.yaml diff --git a/config/clusters/dandi/dandi.values.yaml b/config/clusters/dandi/prod.values.yaml similarity index 100% rename from config/clusters/dandi/dandi.values.yaml rename to config/clusters/dandi/prod.values.yaml diff --git a/eksctl/dandi.jsonnet b/eksctl/dandi.jsonnet index 026970bfa7..0d737094e7 100644 --- a/eksctl/dandi.jsonnet +++ b/eksctl/dandi.jsonnet @@ -49,6 +49,7 @@ local notebookNodes = [ ]; local daskNodes = []; + { apiVersion: 'eksctl.io/v1alpha5', kind: 'ClusterConfig', diff --git a/terraform/aws/projects/dandi.tfvars b/terraform/aws/projects/dandi.tfvars index 0f8b2bf0ae..c055b973af 100644 --- a/terraform/aws/projects/dandi.tfvars +++ b/terraform/aws/projects/dandi.tfvars @@ -8,7 +8,7 @@ user_buckets = { "scratch-staging" : { "delete_after" : 7 }, - "scratch-dandi" : { + "scratch-prod" : { "delete_after" : 7 }, } @@ -18,8 +18,8 @@ hub_cloud_permissions = { bucket_admin_access : ["scratch-staging"], extra_iam_policy : "" }, - "dandi" : { - bucket_admin_access : ["scratch-dandi"], + "prod" : { + bucket_admin_access : ["scratch-prod"], extra_iam_policy : "" }, } \ No newline at end of file From 73103f1c61a621a064ca21cbc54aaed0e9c353a2 Mon Sep 17 00:00:00 2001 From: Georgiana Dolocan Date: Tue, 2 Apr 2024 12:20:03 +0300 Subject: [PATCH 04/10] Explictly enable the autoscaler --- config/clusters/dandi/support.values.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config/clusters/dandi/support.values.yaml b/config/clusters/dandi/support.values.yaml index 742bb75a42..a89ecb0463 100644 --- a/config/clusters/dandi/support.values.yaml +++ b/config/clusters/dandi/support.values.yaml @@ -30,3 +30,9 @@ grafana: - secretName: grafana-tls hosts: - grafana.dandi.2i2c.cloud + +cluster-autoscaler: + enabled: true + autoDiscovery: + clusterName: dandi + awsRegion: us-east-2 From b4ea2954774abd69602a9c325ae9f7ade3d5c259 Mon Sep 17 00:00:00 2001 From: Georgiana Dolocan Date: Tue, 2 Apr 2024 12:20:15 +0300 Subject: [PATCH 05/10] Add more resource allocation options --- config/clusters/dandi/common.values.yaml | 36 ++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/config/clusters/dandi/common.values.yaml b/config/clusters/dandi/common.values.yaml index 5df332710f..091eb4f6f9 100644 --- a/config/clusters/dandi/common.values.yaml +++ b/config/clusters/dandi/common.values.yaml @@ -100,6 +100,42 @@ jupyterhub: cpu_limit: 3.75 node_selector: node.kubernetes.io/instance-type: r5.xlarge + mem_60_6: + display_name: 60.6 GB RAM, upto 15.7 CPUs + kubespawner_override: + mem_guarantee: 65094813696 + mem_limit: 65094813696 + cpu_guarantee: 7.86 + cpu_limit: 15.72 + node_selector: + node.kubernetes.io/instance-type: r5.4xlarge + mem_121_2: + display_name: 121.2 GB RAM, upto 15.7 CPUs + kubespawner_override: + mem_guarantee: 130189627392 + mem_limit: 130189627392 + cpu_guarantee: 15.72 + cpu_limit: 15.72 + node_selector: + node.kubernetes.io/instance-type: r5.4xlarge + mem_244_9: + display_name: 244.9 GB RAM, upto 63.6 CPUs + kubespawner_override: + mem_guarantee: 263005526016 + mem_limit: 263005526016 + cpu_guarantee: 31.8 + cpu_limit: 63.6 + node_selector: + node.kubernetes.io/instance-type: r5.16xlarge + mem_489_9: + display_name: 489.9 GB RAM, upto 63.6 CPUs + kubespawner_override: + mem_guarantee: 526011052032 + mem_limit: 526011052032 + cpu_guarantee: 63.6 + cpu_limit: 63.6 + node_selector: + node.kubernetes.io/instance-type: r5.16xlarge - display_name: "DANDI Matlab (CPU)" description: "DANDI image with MATLAB. Requires you to bring your own license" kubespawner_override: From 38b5aa1f161f811c5aeb829a1749f42ecdd33b96 Mon Sep 17 00:00:00 2001 From: Georgiana Dolocan Date: Tue, 2 Apr 2024 13:17:23 +0300 Subject: [PATCH 06/10] Setup the configures scratch buckets --- config/clusters/dandi/prod.values.yaml | 7 +++++++ config/clusters/dandi/staging.values.yaml | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/config/clusters/dandi/prod.values.yaml b/config/clusters/dandi/prod.values.yaml index 363dfbaad3..354ed688f2 100644 --- a/config/clusters/dandi/prod.values.yaml +++ b/config/clusters/dandi/prod.values.yaml @@ -1,3 +1,7 @@ +userServiceAccount: + annotations: + eks.amazonaws.com/role-arn: arn:aws:iam::975050327108:role/dandi-prod + jupyterhub: ingress: hosts: [dandi.2i2c.cloud] @@ -13,3 +17,6 @@ jupyterhub: templateVars: org: name: MIT DANDI + singleuser: + extraEnv: + SCRATCH_BUCKET: s3://dandi-scratch-prod/$(JUPYTERHUB_USER) diff --git a/config/clusters/dandi/staging.values.yaml b/config/clusters/dandi/staging.values.yaml index a330bd0e65..b1872304eb 100644 --- a/config/clusters/dandi/staging.values.yaml +++ b/config/clusters/dandi/staging.values.yaml @@ -1,3 +1,7 @@ +userServiceAccount: + annotations: + eks.amazonaws.com/role-arn: arn:aws:iam::975050327108:role/dandi-staging + jupyterhub: ingress: hosts: [staging.dandi.2i2c.cloud] @@ -13,3 +17,6 @@ jupyterhub: templateVars: org: name: MIT DANDI (staging) + singleuser: + extraEnv: + SCRATCH_BUCKET: s3://dandi-scratch-staging/$(JUPYTERHUB_USER) From 1132381a9e04252c233f2163ff3c0cd392d3ff2e Mon Sep 17 00:00:00 2001 From: Georgiana Dolocan Date: Tue, 2 Apr 2024 14:02:51 +0300 Subject: [PATCH 07/10] Fix display name --- config/clusters/dandi/cluster.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/clusters/dandi/cluster.yaml b/config/clusters/dandi/cluster.yaml index 1bc24ef62a..de35724ed7 100644 --- a/config/clusters/dandi/cluster.yaml +++ b/config/clusters/dandi/cluster.yaml @@ -21,7 +21,7 @@ hubs: - staging.values.yaml - enc-staging.secret.values.yaml - name: prod - display_name: "MIT DANDI (staging)" + display_name: "MIT DANDI" domain: dandi.2i2c.cloud helm_chart: basehub helm_chart_values_files: From 721b1cc72590f0edff8b16514b090ddb5fea0293 Mon Sep 17 00:00:00 2001 From: Georgiana Dolocan Date: Tue, 2 Apr 2024 14:04:06 +0300 Subject: [PATCH 08/10] Rename file --- config/clusters/dandi/cluster.yaml | 2 +- ...enc-dandi.secret.values.yaml => enc-prod.secret.values.yaml} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename config/clusters/dandi/{enc-dandi.secret.values.yaml => enc-prod.secret.values.yaml} (100%) diff --git a/config/clusters/dandi/cluster.yaml b/config/clusters/dandi/cluster.yaml index de35724ed7..c2fa0547e2 100644 --- a/config/clusters/dandi/cluster.yaml +++ b/config/clusters/dandi/cluster.yaml @@ -27,4 +27,4 @@ hubs: helm_chart_values_files: - common.values.yaml - prod.values.yaml - - enc-dandi.secret.values.yaml + - enc-prod.secret.values.yaml diff --git a/config/clusters/dandi/enc-dandi.secret.values.yaml b/config/clusters/dandi/enc-prod.secret.values.yaml similarity index 100% rename from config/clusters/dandi/enc-dandi.secret.values.yaml rename to config/clusters/dandi/enc-prod.secret.values.yaml From 9e919cc777bfd6551ed758439e9b3b9db3c3fa5f Mon Sep 17 00:00:00 2001 From: Georgiana Date: Tue, 2 Apr 2024 21:11:43 +0300 Subject: [PATCH 09/10] Remove copy-paste error Co-authored-by: Yuvi Panda --- config/clusters/dandi/common.values.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/config/clusters/dandi/common.values.yaml b/config/clusters/dandi/common.values.yaml index 091eb4f6f9..432fc12b00 100644 --- a/config/clusters/dandi/common.values.yaml +++ b/config/clusters/dandi/common.values.yaml @@ -20,7 +20,6 @@ jupyterhub: Authenticator: enable_auth_state: true admin_users: - - asdf - kabilar - aaronkanzer - asmacdo From 624f44c3fb8f0a53d2a91e6064e3fa51b9f3ecc1 Mon Sep 17 00:00:00 2001 From: Georgiana Dolocan Date: Tue, 2 Apr 2024 21:31:56 +0300 Subject: [PATCH 10/10] Rm prod from the name of the bucket --- config/clusters/dandi/prod.values.yaml | 2 +- terraform/aws/projects/dandi.tfvars | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/clusters/dandi/prod.values.yaml b/config/clusters/dandi/prod.values.yaml index 354ed688f2..2f3e4121f6 100644 --- a/config/clusters/dandi/prod.values.yaml +++ b/config/clusters/dandi/prod.values.yaml @@ -19,4 +19,4 @@ jupyterhub: name: MIT DANDI singleuser: extraEnv: - SCRATCH_BUCKET: s3://dandi-scratch-prod/$(JUPYTERHUB_USER) + SCRATCH_BUCKET: s3://dandi-scratch/$(JUPYTERHUB_USER) diff --git a/terraform/aws/projects/dandi.tfvars b/terraform/aws/projects/dandi.tfvars index c055b973af..a66677c70b 100644 --- a/terraform/aws/projects/dandi.tfvars +++ b/terraform/aws/projects/dandi.tfvars @@ -8,7 +8,7 @@ user_buckets = { "scratch-staging" : { "delete_after" : 7 }, - "scratch-prod" : { + "scratch" : { "delete_after" : 7 }, } @@ -19,7 +19,7 @@ hub_cloud_permissions = { extra_iam_policy : "" }, "prod" : { - bucket_admin_access : ["scratch-prod"], + bucket_admin_access : ["scratch"], extra_iam_policy : "" }, } \ No newline at end of file