From 12d154d3367c8396cddc015707bdbded09f89d74 Mon Sep 17 00:00:00 2001 From: Sarah Gibson Date: Fri, 9 Aug 2024 14:14:22 +0100 Subject: [PATCH 1/3] Create a scratch bucket for Arecibo C3 hub --- terraform/gcp/projects/catalystproject-latam.tfvars | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/terraform/gcp/projects/catalystproject-latam.tfvars b/terraform/gcp/projects/catalystproject-latam.tfvars index 2255a1bd6..76a130e48 100644 --- a/terraform/gcp/projects/catalystproject-latam.tfvars +++ b/terraform/gcp/projects/catalystproject-latam.tfvars @@ -73,6 +73,9 @@ user_buckets = { "group:persistent-unam-writers@2i2c.org" ] }, + "scratch-areciboc3" : { + "delete_after" : 7, + }, } hub_cloud_permissions = { @@ -80,4 +83,8 @@ hub_cloud_permissions = { bucket_admin_access : ["scratch-unam", "persistent-unam"], hub_namespace : "unam", }, + "areciboc3" : { + bucket_admin_access : ["scratch-areciboc3"], + hub_namespace : "areciboc3", + }, } From 302400d420af1790d2fe6cbe11c737c52db3eb1e Mon Sep 17 00:00:00 2001 From: Sarah Gibson Date: Fri, 9 Aug 2024 14:49:21 +0100 Subject: [PATCH 2/3] Add Arecibo C3 hub config --- .../areciboc3.values.yaml | 27 +++++++++++++++++++ .../enc-areciboc3.secret.values.yaml | 20 ++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 config/clusters/catalystproject-latam/areciboc3.values.yaml create mode 100644 config/clusters/catalystproject-latam/enc-areciboc3.secret.values.yaml diff --git a/config/clusters/catalystproject-latam/areciboc3.values.yaml b/config/clusters/catalystproject-latam/areciboc3.values.yaml new file mode 100644 index 000000000..f262f0824 --- /dev/null +++ b/config/clusters/catalystproject-latam/areciboc3.values.yaml @@ -0,0 +1,27 @@ +userServiceAccount: + annotations: + iam.gke.io/gcp-service-account: latam-areciboc3@catalystproject-392106.iam.gserviceaccount.com +jupyterhub: + ingress: + hosts: [areciboc3.latam.catalystproject.2i2c.cloud] + tls: + - hosts: [areciboc3.latam.catalystproject.2i2c.cloud] + secretName: https-auto-tls + custom: + homepage: + templateVars: + org: + name: Catalyst Project, LatAm - Arecibo C3 + singleuser: + extraEnv: + SCRATCH_BUCKET: gs://latam-scratch-areciboc3/$(JUPYTERHUB_USER) + hub: + config: + JupyterHub: + authenticator_class: github + GitHubOAuthenticator: + oauth_callback_url: https://areciboc3.latam.catalystproject.2i2c.cloud/hub/oauth_callback + allowed_organizations: + - catalystproject-hubs:areciboc3 + scope: + - read:org diff --git a/config/clusters/catalystproject-latam/enc-areciboc3.secret.values.yaml b/config/clusters/catalystproject-latam/enc-areciboc3.secret.values.yaml new file mode 100644 index 000000000..9c040ee86 --- /dev/null +++ b/config/clusters/catalystproject-latam/enc-areciboc3.secret.values.yaml @@ -0,0 +1,20 @@ +jupyterhub: + hub: + config: + GitHubOAuthenticator: + client_id: ENC[AES256_GCM,data:QXHHnsGyZa1ZkqKHbKcpuNMlD74=,iv:XwHojBI0vq4ToZJDByERzDFwC7NG9m/hQLgq/I3g0UQ=,tag:1rXtFSpAAhCCjV8/kc0x9w==,type:str] + client_secret: ENC[AES256_GCM,data:XvF1f94iZyr8w/WJTGqZDt9qQghbgckDNJhQlBjtMfktwqz9PGwY2Q==,iv:5dr7bxHVZmhcqFZNQVs1B0EDtWKel+x4/tpgT5817j4=,tag:lq/Jr5o3bFTFT0pnkJjYeA==,type:str] +sops: + kms: [] + gcp_kms: + - resource_id: projects/two-eye-two-see/locations/global/keyRings/sops-keys/cryptoKeys/similar-hubs + created_at: "2024-08-09T13:26:35Z" + enc: CiUA4OM7eE7nn7lY+XXgowvMVj0jHKQNdyAuybBWw7+WqfKj+PtwEkkAWX/fcViaL4ep6Uv3VeVTZh1XyXunxfZlU3xNZAlz9mSv2lskYbRQUvwFa8ZkafADN9P1vN0dsP3NDLH1UC0t5HLbWvKBQvQW + azure_kv: [] + hc_vault: [] + age: [] + lastmodified: "2024-08-09T13:26:35Z" + mac: ENC[AES256_GCM,data:pS93oxMiaaWpTreBkQ4N0/znewoiVjHZPzAfqQXlAuxRnYvOCEs0uyH0yVMyctdAW+NXGT5xweMe6zmEdblojc1YjzFoXDoin2nG6P22hDH4vylf8azE72OZBX4ZDdO6BufCCi9Yv7rVyTEXcd05av0ep8XETLNuSWiMwZWu7nE=,iv:hNHCnWoFe1ilP2X089l1KcN8iNcuFPon0pXgRaGnUZI=,tag:hqc0i3+g7+RRypoFOOpzlg==,type:str] + pgp: [] + unencrypted_suffix: _unencrypted + version: 3.9.0 From 88fee7de4f16bcb36e35e59a28a11355a5c96447 Mon Sep 17 00:00:00 2001 From: Sarah Gibson Date: Fri, 9 Aug 2024 14:49:39 +0100 Subject: [PATCH 3/3] Add Arecibo C3 hub entry to catalystproject-latam cluster.yaml --- config/clusters/catalystproject-latam/cluster.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/config/clusters/catalystproject-latam/cluster.yaml b/config/clusters/catalystproject-latam/cluster.yaml index 5df80e2e3..070d7b693 100644 --- a/config/clusters/catalystproject-latam/cluster.yaml +++ b/config/clusters/catalystproject-latam/cluster.yaml @@ -97,3 +97,11 @@ hubs: - common.values.yaml - labi.values.yaml - enc-labi.secret.values.yaml + - name: areciboc3 + display_name: "Catalyst Project, LatAm - Arecibo C3" + domain: areciboc3.latam.catalystproject.2i2c.cloud + helm_chart: basehub + helm_chart_values_files: + - common.values.yaml + - areciboc3.values.yaml + - enc-areciboc3.secret.values.yaml