From a12848e30fb81ee9d4be6dcad459c03cb8ad99ce Mon Sep 17 00:00:00 2001
From: Sarah Gibson <drsarahlgibson@gmail.com>
Date: Fri, 9 Aug 2024 16:12:07 +0100
Subject: [PATCH 1/3] Create a scratch bucket for valledellili hub on
 catalystproject-latam cluster

---
 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 76a130e48..a5b6e46d3 100644
--- a/terraform/gcp/projects/catalystproject-latam.tfvars
+++ b/terraform/gcp/projects/catalystproject-latam.tfvars
@@ -76,6 +76,9 @@ user_buckets = {
   "scratch-areciboc3" : {
     "delete_after" : 7,
   },
+  "scratch-valledellili" : {
+    "delete_after" : 7,
+  },
 }
 
 hub_cloud_permissions = {
@@ -87,4 +90,8 @@ hub_cloud_permissions = {
     bucket_admin_access : ["scratch-areciboc3"],
     hub_namespace : "areciboc3",
   },
+  "valledellili" : {
+    bucket_admin_access : ["scratch-valledellili"],
+    hub_namespace : "valledellili",
+  },
 }

From 8837ba7e5df0e24b41ece8c3a86e71be9fef08f7 Mon Sep 17 00:00:00 2001
From: Sarah Gibson <drsarahlgibson@gmail.com>
Date: Fri, 9 Aug 2024 16:13:56 +0100
Subject: [PATCH 2/3] Add config for valledellili hub

---
 .../enc-valledellili.secret.values.yaml       | 20 +++++++++++++
 .../valledellili.values.yaml                  | 30 +++++++++++++++++++
 2 files changed, 50 insertions(+)
 create mode 100644 config/clusters/catalystproject-latam/enc-valledellili.secret.values.yaml
 create mode 100644 config/clusters/catalystproject-latam/valledellili.values.yaml

diff --git a/config/clusters/catalystproject-latam/enc-valledellili.secret.values.yaml b/config/clusters/catalystproject-latam/enc-valledellili.secret.values.yaml
new file mode 100644
index 000000000..44dc0e8c9
--- /dev/null
+++ b/config/clusters/catalystproject-latam/enc-valledellili.secret.values.yaml
@@ -0,0 +1,20 @@
+jupyterhub:
+  hub:
+    config:
+      GitHubOAuthenticator:
+        client_id: ENC[AES256_GCM,data:0tchmgpmyPY0H9SpWWMFBif0xWE=,iv:RhU8UQkJQRIp869kiFR79vTbadH/18LXyWdnrOMR3/Y=,tag:Nd8NGXC+vabM9EhVt08Dlw==,type:str]
+        client_secret: ENC[AES256_GCM,data:tQtwFi3DK/AmoMw0tW8C6tWzgwkmU5sohDRNykhD8bSidqropKYHwg==,iv:NfpvW2e0giDgev+rGTPZWbKfb0fB4tmOt7ExeZB327Q=,tag:JiDhrs15ATGHGzLKSCJfVQ==,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-09T14:58:16Z"
+      enc: CiUA4OM7eKwGa3muwRSTYtkCjosqylUIFW12XGLPmB5WMRN1e5ZZEkkAWX/fceGfX3zDcebJGDC4LLMyEjvPOlqGDWDvi9yrvVcred8rkRa0cbG3Feq6zA49tVR1lLmRZZlA+pbM0KSUSz2PK13i2ofI
+  azure_kv: []
+  hc_vault: []
+  age: []
+  lastmodified: "2024-08-09T14:58:16Z"
+  mac: ENC[AES256_GCM,data:gaOmknmvBp3NsWVKHD9zK2+G7bttvDI34HrrN/ZFjGsl/p+j16xd6TmP9NXHTlUs3Q/zBSEjuno6M0TX1SaXUu5iz8rJhw4cfyxijUDzwM5LRlVQHmWZLfBLhrggE2v/EMEOq/F6HsxxrXkm7eNMFF2HSR+TyLM9brKkHNHhq7U=,iv:HGrmmbyvKq9mbAMUO6YvC1S2wl2kX0FZLI2ZkFpF/LU=,tag:WwgqfA0R+FNrYDmfawyvpw==,type:str]
+  pgp: []
+  unencrypted_suffix: _unencrypted
+  version: 3.9.0
diff --git a/config/clusters/catalystproject-latam/valledellili.values.yaml b/config/clusters/catalystproject-latam/valledellili.values.yaml
new file mode 100644
index 000000000..b0dc53a4f
--- /dev/null
+++ b/config/clusters/catalystproject-latam/valledellili.values.yaml
@@ -0,0 +1,30 @@
+userServiceAccount:
+  annotations:
+    iam.gke.io/gcp-service-account: latam-valledellili@catalystproject-392106.iam.gserviceaccount.com
+jupyterhub:
+  ingress:
+    hosts: [valledellili.latam.catalystproject.2i2c.cloud]
+    tls:
+      - hosts: [valledellili.latam.catalystproject.2i2c.cloud]
+        secretName: https-auto-tls
+  custom:
+    homepage:
+      templateVars:
+        org:
+          name: "Catalyst Project, LatAm - Fundación Valle del Lili-UMBC & AC3"
+  singleuser:
+    extraEnv:
+      SCRATCH_BUCKET: gs://latam-scratch-valledellili/$(JUPYTERHUB_USER)
+  hub:
+    config:
+      JupyterHub:
+        authenticator_class: github
+      GitHubOAuthenticator:
+        oauth_callback_url: https://valledellili.latam.catalystproject.2i2c.cloud/hub/oauth_callback
+        allowed_organizations:
+          - catalystproject-hubs:valledellili
+        scope:
+          - read:org
+      Authenticator:
+        admin_users:
+          - pattiordonez

From 6569d22abd507a8d6a52f58a3a1ac90f0534444d Mon Sep 17 00:00:00 2001
From: Sarah Gibson <drsarahlgibson@gmail.com>
Date: Fri, 9 Aug 2024 16:14:13 +0100
Subject: [PATCH 3/3] Add valledellili hub to cataclystproject-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 070d7b693..9dcef33dc 100644
--- a/config/clusters/catalystproject-latam/cluster.yaml
+++ b/config/clusters/catalystproject-latam/cluster.yaml
@@ -105,3 +105,11 @@ hubs:
       - common.values.yaml
       - areciboc3.values.yaml
       - enc-areciboc3.secret.values.yaml
+  - name: valledellili
+    display_name: "Catalyst Project, LatAm - Fundación Valle del Lili-UMBC & AC3"
+    domain: valledellili.latam.catalystproject.2i2c.cloud
+    helm_chart: basehub
+    helm_chart_values_files:
+      - common.values.yaml
+      - valledellili.values.yaml
+      - enc-valledellili.secret.values.yaml