From 2d3e1e00715f8c6dae284df74e5faf292e33c960 Mon Sep 17 00:00:00 2001
From: sean-morris <sean.smorris@gmail.com>
Date: Mon, 22 Jul 2024 09:51:59 -0700
Subject: [PATCH] [CloudBank] Merced College

---
 config/clusters/cloudbank/cluster.yaml        |  8 +++
 .../cloudbank/enc-merced.secret.values.yaml   | 20 +++++++
 config/clusters/cloudbank/merced.values.yaml  | 56 +++++++++++++++++++
 3 files changed, 84 insertions(+)
 create mode 100644 config/clusters/cloudbank/enc-merced.secret.values.yaml
 create mode 100644 config/clusters/cloudbank/merced.values.yaml

diff --git a/config/clusters/cloudbank/cluster.yaml b/config/clusters/cloudbank/cluster.yaml
index 99c62934b2..97b97ab6c6 100644
--- a/config/clusters/cloudbank/cluster.yaml
+++ b/config/clusters/cloudbank/cluster.yaml
@@ -204,6 +204,14 @@ hubs:
       - common.values.yaml
       - mendocino.values.yaml
       - enc-mendocino.secret.values.yaml
+  - name: merced
+    display_name: "Merced College"
+    domain: merced.cloudbank.2i2c.cloud
+    helm_chart: basehub
+    helm_chart_values_files:
+      - common.values.yaml
+      - merced.values.yaml
+      - enc-merced.secret.values.yaml
   - name: mills
     display_name: "Mills College"
     domain: datahub.mills.edu
diff --git a/config/clusters/cloudbank/enc-merced.secret.values.yaml b/config/clusters/cloudbank/enc-merced.secret.values.yaml
new file mode 100644
index 0000000000..5b4dadf0d1
--- /dev/null
+++ b/config/clusters/cloudbank/enc-merced.secret.values.yaml
@@ -0,0 +1,20 @@
+jupyterhub:
+    hub:
+        config:
+            CILogonOAuthenticator:
+                client_id: ENC[AES256_GCM,data:H3bvrn8izN+j4/da6oK3pIl4CqjHpViA6RPER+Dg6LVHSQN+wov+EC31Kaibg1NGK/wi,iv:4PUYenfb4YVq9GtfM4nZ8A46vywvtGLv6OD2Bu7hPg8=,tag:AQKsqKRQjkmUc26AhKkAlQ==,type:str]
+                client_secret: ENC[AES256_GCM,data:Hmktn8bucQFR5bkirlmMx+cTQFYjrG7m80OhhpFI3uTFIMKpi+TRU7tEENVm05St2C7k+wY0BVnDfI+weBiM6edQHi2hX0klijp7waqUnzSqeeAgtsc=,iv:cZC+CBKXt4BjKMJ/TD/SEfR9cRJaffMAm/8USxgRfz4=,tag:deGtgO0u8uFw7+42lYo09w==,type:str]
+sops:
+    kms: []
+    gcp_kms:
+        - resource_id: projects/two-eye-two-see/locations/global/keyRings/sops-keys/cryptoKeys/similar-hubs
+          created_at: "2024-07-22T16:50:53Z"
+          enc: CiUA4OM7eAEfOPmpsCa6KyBfy9R7T09g2NiyHRXimRRoa/mh+BSpEkkAWX/fcb6URw2pMXTliGgEFCR7cM1e9rRgeUX8vnMsny3vilYzEgYTPwqzVWf7gUkxEPZPdj7oUv7nmXaufNvyCCeHtjSK/Qit
+    azure_kv: []
+    hc_vault: []
+    age: []
+    lastmodified: "2024-07-22T16:50:54Z"
+    mac: ENC[AES256_GCM,data:3Dt7FR3zeFUDGq9KE5VsRxWPzahl6xdHWvivi1Hh6XefdKpYGDHEvbcOIDp25Jx+DW16toibi+Lyk1FHBPGfd4hgThEBHjs65zkhEiKs6A4JOcgR71iNPXjRzkejqgoIZbF/cQ/bfxpd/AzxMvNGUKnIVToWYvJBNVQpgvEX6IA=,iv:JCU8GpKO8H7kNxem6BJjEmH9ZgP8m5TIhqrJQDFrOio=,tag:N5i+5526hyiuRPVaQGs5Wg==,type:str]
+    pgp: []
+    unencrypted_suffix: _unencrypted
+    version: 3.8.1
diff --git a/config/clusters/cloudbank/merced.values.yaml b/config/clusters/cloudbank/merced.values.yaml
new file mode 100644
index 0000000000..6a6d37610b
--- /dev/null
+++ b/config/clusters/cloudbank/merced.values.yaml
@@ -0,0 +1,56 @@
+jupyterhub:
+  ingress:
+    hosts: [merced.cloudbank.2i2c.cloud]
+    tls:
+      - hosts: [merced.cloudbank.2i2c.cloud]
+        secretName: https-auto-tls
+  singleuser:
+    memory:
+      # Increased to help deal with possible kernel restarts
+      # https://2i2c.freshdesk.com/a/tickets/567
+      guarantee: 384M
+      limit: 1.5G
+  custom:
+    2i2c:
+      add_staff_user_ids_of_type: google
+      add_staff_user_ids_to_admin_users: true
+    homepage:
+      templateVars:
+        designed_by:
+          name: 2i2c
+          url: https://2i2c.org
+        funded_by:
+          name: CloudBank
+          url: http://cloudbank.org/
+        operated_by:
+          name: CloudBank
+          url: http://cloudbank.org/
+        org:
+          logo_url: https://www.mccd.edu/wp-content/uploads/2023/09/MicrosoftTeams-image-15-300x300.png
+          name: Merced College
+          url: https://www.mccd.edu/
+  hub:
+    config:
+      JupyterHub:
+        authenticator_class: cilogon
+      CILogonOAuthenticator:
+        oauth_callback_url: https://merced.cloudbank.2i2c.cloud/hub/oauth_callback
+        allowed_idps:
+          http://login.microsoftonline.com/common/oauth2/v2.0/authorize:
+            default: true
+            username_derivation:
+              username_claim: "email"
+            allowed_domains:
+              - mccd.edu
+              - campus.mccd.edu
+          http://google.com/accounts/o8/id:
+            username_derivation:
+              username_claim: "email"
+      Authenticator:
+        admin_users:
+          - ericvd@berkeley.edu
+          - sean.smorris@berkeley.edu
+          - gregory.hogan@mccd.edu
+          - kanemoto.k@mccd.edu
+          - bassem.saad@mccd.edu
+          - gargova.s@mccd.edu