Merge pull request #4734 from sean-morris/main

[CloudBank] Merced to GitHub OAuth

config/clusters/cloudbank/cluster.yaml

@@ -60,6 +60,30 @@ hubs:
       - common.values.yaml
       - csm.values.yaml
       - enc-csm.secret.values.yaml
+  - name: csulb
+    display_name: "California State University Long Beach"
+    domain: csulb.cloudbank.2i2c.cloud
+    helm_chart: basehub
+    helm_chart_values_files:
+      - common.values.yaml
+      - csulb.values.yaml
+      - enc-csulb.secret.values.yaml
+  - name: csum
+    display_name: "Cal Maritime"
+    domain: csum.cloudbank.2i2c.cloud
+    helm_chart: basehub
+    helm_chart_values_files:
+      - common.values.yaml
+      - csum.values.yaml
+      - enc-csum.secret.values.yaml
+  - name: demo
+    display_name: "Cloudbank demo"
+    domain: demo.cloudbank.2i2c.cloud
+    helm_chart: basehub
+    helm_chart_values_files:
+      - common.values.yaml
+      - demo.values.yaml
+      - enc-demo-git.secret.values.yaml
   - name: dvc
     display_name: "Diablo Valley College"
     domain: dvc.cloudbank.2i2c.cloud
@@ -68,6 +92,14 @@ hubs:
       - common.values.yaml
       - dvc.values.yaml
       - enc-dvc.secret.values.yaml
+  - name: elac
+    display_name: "East Los Angeles College"
+    domain: elac.cloudbank.2i2c.cloud
+    helm_chart: basehub
+    helm_chart_values_files:
+      - common.values.yaml
+      - elac.values.yaml
+      - enc-elac.secret.values.yaml
   - name: elcamino
     display_name: "El Camino College"
     domain: elcamino.cloudbank.2i2c.cloud
@@ -84,6 +116,14 @@ hubs:
       - common.values.yaml
       - evc.values.yaml
       - enc-evc.secret.values.yaml
+  - name: fresno
+    display_name: "Fresno City College"
+    domain: fresno.cloudbank.2i2c.cloud
+    helm_chart: basehub
+    helm_chart_values_files:
+      - common.values.yaml
+      - fresno.values.yaml
+      - enc-fresno.secret.values.yaml
   - name: glendale
     display_name: "Glendale Community College"
     domain: glendale.cloudbank.2i2c.cloud
@@ -108,46 +148,6 @@ hubs:
       - common.values.yaml
       - howard.values.yaml
       - enc-howard.secret.values.yaml
-  - name: miracosta
-    display_name: "MiraCosta College"
-    domain: miracosta.cloudbank.2i2c.cloud
-    helm_chart: basehub
-    helm_chart_values_files:
-      - common.values.yaml
-      - miracosta.values.yaml
-      - enc-miracosta.secret.values.yaml
-  - name: riohondo
-    display_name: "Rio Hondo Community College"
-    domain: riohondo.cloudbank.2i2c.cloud
-    helm_chart: basehub
-    helm_chart_values_files:
-      - common.values.yaml
-      - riohondo.values.yaml
-      - enc-riohondo.secret.values.yaml
-  - name: skyline
-    display_name: "Skyline College"
-    domain: skyline.cloudbank.2i2c.cloud
-    helm_chart: basehub
-    helm_chart_values_files:
-      - common.values.yaml
-      - skyline.values.yaml
-      - enc-skyline.secret.values.yaml
-  - name: demo
-    display_name: "Cloudbank demo"
-    domain: demo.cloudbank.2i2c.cloud
-    helm_chart: basehub
-    helm_chart_values_files:
-      - common.values.yaml
-      - demo.values.yaml
-      - enc-demo-git.secret.values.yaml
-  - name: fresno
-    display_name: "Fresno City College"
-    domain: fresno.cloudbank.2i2c.cloud
-    helm_chart: basehub
-    helm_chart_values_files:
-      - common.values.yaml
-      - fresno.values.yaml
-      - enc-fresno.secret.values.yaml
   - name: humboldt
     display_name: "Cal Poly Humboldt"
     domain: humboldt.cloudbank.2i2c.cloud
@@ -156,38 +156,6 @@ hubs:
       - common.values.yaml
       - humboldt.values.yaml
       - enc-humboldt.secret.values.yaml
-  - name: laney
-    display_name: "Laney College"
-    domain: laney.cloudbank.2i2c.cloud
-    helm_chart: basehub
-    helm_chart_values_files:
-      - common.values.yaml
-      - laney.values.yaml
-      - enc-laney.secret.values.yaml
-  - name: sbcc
-    display_name: "Santa Barbara City College"
-    domain: sbcc.cloudbank.2i2c.cloud
-    helm_chart: basehub
-    helm_chart_values_files:
-      - common.values.yaml
-      - sbcc.values.yaml
-      - enc-sbcc.secret.values.yaml
-  - name: sbcc-dev
-    display_name: "Santa Barbara City College Dev"
-    domain: sbcc-dev.cloudbank.2i2c.cloud
-    helm_chart: basehub
-    helm_chart_values_files:
-      - common.values.yaml
-      - sbcc-dev.values.yaml
-      - enc-sbcc-dev.secret.values.yaml
-  - name: elac
-    display_name: "East Los Angeles College"
-    domain: elac.cloudbank.2i2c.cloud
-    helm_chart: basehub
-    helm_chart_values_files:
-      - common.values.yaml
-      - elac.values.yaml
-      - enc-elac.secret.values.yaml
   - name: lacc
     display_name: "Los Angeles City College"
     domain: lacc.cloudbank.2i2c.cloud
@@ -204,6 +172,14 @@ hubs:
       - common.values.yaml
       - lamission.values.yaml
       - enc-lamission.secret.values.yaml
+  - name: laney
+    display_name: "Laney College"
+    domain: laney.cloudbank.2i2c.cloud
+    helm_chart: basehub
+    helm_chart_values_files:
+      - common.values.yaml
+      - laney.values.yaml
+      - enc-laney.secret.values.yaml
   - name: lbcc
     display_name: "Long Beach City College"
     domain: lbcc.cloudbank.2i2c.cloud
@@ -236,6 +212,14 @@ hubs:
       - common.values.yaml
       - mills.values.yaml
       - enc-mills.secret.values.yaml
+  - name: miracosta
+    display_name: "MiraCosta College"
+    domain: miracosta.cloudbank.2i2c.cloud
+    helm_chart: basehub
+    helm_chart_values_files:
+      - common.values.yaml
+      - miracosta.values.yaml
+      - enc-miracosta.secret.values.yaml
   - name: mission
     display_name: "Mission College Santa Clara"
     domain: mission.cloudbank.2i2c.cloud
@@ -284,14 +268,14 @@ hubs:
       - common.values.yaml
       - reedley.values.yaml
       - enc-reedley.secret.values.yaml
-  - name: sjcc
-    display_name: "San Jose Community College"
-    domain: sjcc.cloudbank.2i2c.cloud
+  - name: riohondo
+    display_name: "Rio Hondo Community College"
+    domain: riohondo.cloudbank.2i2c.cloud
     helm_chart: basehub
     helm_chart_values_files:
       - common.values.yaml
-      - sjcc.values.yaml
-      - enc-sjcc.secret.values.yaml
+      - riohondo.values.yaml
+      - enc-riohondo.secret.values.yaml
   - name: sacramento
     display_name: "Sacramento City College"
     domain: sacramento.cloudbank.2i2c.cloud
@@ -300,14 +284,6 @@ hubs:
       - common.values.yaml
       - sacramento.values.yaml
       - enc-sacramento.secret.values.yaml
-  - name: srjc
-    display_name: "Santa Rosa Junior College"
-    domain: srjc.cloudbank.2i2c.cloud
-    helm_chart: basehub
-    helm_chart_values_files:
-      - common.values.yaml
-      - srjc.values.yaml
-      - enc-srjc.secret.values.yaml
   - name: saddleback
     display_name: "Saddleback College"
     domain: saddleback.cloudbank.2i2c.cloud
@@ -324,14 +300,22 @@ hubs:
       - common.values.yaml
       - santiago.values.yaml
       - enc-santiago.secret.values.yaml
-  - name: sjsu
-    display_name: "San Jose State University"
-    domain: sjsu.cloudbank.2i2c.cloud
+  - name: sbcc
+    display_name: "Santa Barbara City College"
+    domain: sbcc.cloudbank.2i2c.cloud
     helm_chart: basehub
     helm_chart_values_files:
       - common.values.yaml
-      - sjsu.values.yaml
-      - enc-sjsu.secret.values.yaml
+      - sbcc.values.yaml
+      - enc-sbcc.secret.values.yaml
+  - name: sbcc-dev
+    display_name: "Santa Barbara City College Dev"
+    domain: sbcc-dev.cloudbank.2i2c.cloud
+    helm_chart: basehub
+    helm_chart_values_files:
+      - common.values.yaml
+      - sbcc-dev.values.yaml
+      - enc-sbcc-dev.secret.values.yaml
   - name: sierra
     display_name: "Sierra College"
     domain: sierra.cloudbank.2i2c.cloud
@@ -340,6 +324,38 @@ hubs:
       - common.values.yaml
       - sierra.values.yaml
       - enc-sierra.secret.values.yaml
+  - name: sjcc
+    display_name: "San Jose Community College"
+    domain: sjcc.cloudbank.2i2c.cloud
+    helm_chart: basehub
+    helm_chart_values_files:
+      - common.values.yaml
+      - sjcc.values.yaml
+      - enc-sjcc.secret.values.yaml
+  - name: sjsu
+    display_name: "San Jose State University"
+    domain: sjsu.cloudbank.2i2c.cloud
+    helm_chart: basehub
+    helm_chart_values_files:
+      - common.values.yaml
+      - sjsu.values.yaml
+      - enc-sjsu.secret.values.yaml
+  - name: skyline
+    display_name: "Skyline College"
+    domain: skyline.cloudbank.2i2c.cloud
+    helm_chart: basehub
+    helm_chart_values_files:
+      - common.values.yaml
+      - skyline.values.yaml
+      - enc-skyline.secret.values.yaml
+  - name: srjc
+    display_name: "Santa Rosa Junior College"
+    domain: srjc.cloudbank.2i2c.cloud
+    helm_chart: basehub
+    helm_chart_values_files:
+      - common.values.yaml
+      - srjc.values.yaml
+      - enc-srjc.secret.values.yaml
   - name: tuskegee
     display_name: "Tuskegee University"
     domain: tuskegee.cloudbank.2i2c.cloud
@@ -356,19 +372,3 @@ hubs:
       - common.values.yaml
       - wlac.values.yaml
       - enc-wlac.secret.values.yaml
-  - name: csulb
-    display_name: "California State University Long Beach"
-    domain: csulb.cloudbank.2i2c.cloud
-    helm_chart: basehub
-    helm_chart_values_files:
-      - common.values.yaml
-      - csulb.values.yaml
-      - enc-csulb.secret.values.yaml
-  - name: csum
-    display_name: "Cal Maritime"
-    domain: csum.cloudbank.2i2c.cloud
-    helm_chart: basehub
-    helm_chart_values_files:
-      - common.values.yaml
-      - csum.values.yaml
-      - enc-csum.secret.values.yaml

config/clusters/cloudbank/enc-merced.secret.values.yaml

@@ -1,20 +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]
+            GitHubOAuthenticator:
+                client_id: ENC[AES256_GCM,data:Aubrpz/ns9h+oDMFLQ3xTpHhM24=,iv:PPFtVx9sRFfJg0t4tziYLskve3ZsCvqX3hDFD6pmdPI=,tag:25mcS55yKX5E1Fqh+KsBiw==,type:str]
+                client_secret: ENC[AES256_GCM,data:DnRwFsEqTk/6iGva7/68RYHBdXr/W6Sr4X46aVH81Vr7EvcqkKWQPA==,iv:O93B0yIgWQ15OcoCsY1xSasHKxnQnhzfH4fZFP+OZUA=,tag:a7cjmBCiBOGIE9XRkPggPA==,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
+          created_at: "2024-09-04T00:23:37Z"
+          enc: CiUA4OM7eB4h5/w25VngaOF4C4qkbSmdIzjEpWmsu2pDvQV8B0mgEkkA5dG1QzXOzR35HgfwtPvc13e9hayVKDm+QgZ9SMkzKIQFz5otZRkP2IKjBRU/okhL4F0aL3kMhtgX04b/Lvpo+ZXJwzkxWpf9
     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]
+    lastmodified: "2024-09-04T00:23:37Z"
+    mac: ENC[AES256_GCM,data:z9h9hhy1r1LNqc85zr2n6rbTTCRczsDYfXrXiydSobddZ6z3SC6Sbv+YRUVIAve2ECs6Y33WlMgwlavyC7FNoIy7USfLY6fjkmeCDH+kZfie2stUzsB3tpKeCkRKC7WoCoCPlDJqibEBQ5p22nXbdiMQP65tsOcQ0Jk+zg03p/U=,iv:bCpOzxEYOgG7jfEjq1PuGEbvrRWQOGxrg2WLBiic6Xg=,tag:sq5UrMFSTcTs+5dJVQLSKg==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.8.1

config/clusters/cloudbank/merced.values.yaml

@@ -32,25 +32,17 @@ jupyterhub:
   hub:
     config:
       JupyterHub:
-        authenticator_class: cilogon
-      CILogonOAuthenticator:
+        authenticator_class: github
+      GitHubOAuthenticator:
         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"
+        allowed_organizations:
+          - Merced-College
+        scope:
+          - read:org
       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
+          - sean-morris
+          - katkanemoto
+          - ghogan42
+          - svetla-gargova
+          - basaadMerced