Merge pull request #4601 from sgibson91/new-hub/catalystproject-latam…

…/arecibo3 New Hub: Arecibo C3 on catalystproject-latam
2i2c-org · Aug 9, 2024 · 05997a1 · 05997a1
2 parents 45ec02f + 88fee7d
commit 05997a1
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 0 deletions.
diff --git a/config/clusters/catalystproject-latam/areciboc3.values.yaml 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/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
diff --git a/config/clusters/catalystproject-latam/enc-areciboc3.secret.values.yaml 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
diff --git a/terraform/gcp/projects/catalystproject-latam.tfvars b/terraform/gcp/projects/catalystproject-latam.tfvars
@@ -73,11 +73,18 @@ user_buckets = {
       "group:persistent-unam-writers@2i2c.org"
     ]
   },
+  "scratch-areciboc3" : {
+    "delete_after" : 7,
+  },
 }
 
 hub_cloud_permissions = {
   "unam" : {
     bucket_admin_access : ["scratch-unam", "persistent-unam"],
     hub_namespace : "unam",
   },
+  "areciboc3" : {
+    bucket_admin_access : ["scratch-areciboc3"],
+    hub_namespace : "areciboc3",
+  },
 }