[CloudBank] Demo Hub to GH Auth

sean-morris · Jun 3, 2024 · 7c5683b · 7c5683b
1 parent acc0f19
commit 7c5683b
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 25 deletions.
diff --git a/config/clusters/cloudbank/cluster.yaml b/config/clusters/cloudbank/cluster.yaml
@@ -107,7 +107,7 @@ hubs:
     helm_chart_values_files:
       - common.values.yaml
       - demo.values.yaml
-      - enc-demo.secret.values.yaml
+      - enc-demo-git.secret.values.yaml
   - name: fresno
     display_name: "Fresno City College"
     domain: fresno.cloudbank.2i2c.cloud

diff --git a/config/clusters/cloudbank/demo.values.yaml b/config/clusters/cloudbank/demo.values.yaml
@@ -16,7 +16,7 @@ jupyterhub:
   custom:
     2i2c:
       add_staff_user_ids_to_admin_users: true
-      add_staff_user_ids_of_type: "google"
+      add_staff_user_ids_of_type: "github"
     homepage:
       templateVars:
         org:
@@ -35,25 +35,17 @@ jupyterhub:
   hub:
     config:
       JupyterHub:
-        authenticator_class: cilogon
-      CILogonOAuthenticator:
+        authenticator_class: github
+      GitHubOAuthenticator:
         oauth_callback_url: https://demo.cloudbank.2i2c.cloud/hub/oauth_callback
-        allowed_idps:
-          http://google.com/accounts/o8/id:
-            default: true
-            username_derivation:
-              username_claim: "email"
+        allowed_organizations:
+          - data-8:demo-hub-auth
+          - data-8
+        scope:
+          - read:org
       Authenticator:
         admin_users:
-          - [email protected]
-          - [email protected]
-          - [email protected]
-          - [email protected]
-        # NOTE: This demo hub may be temporarily opened up for broad access by
-        #       declaring `allow_all: true` for the google idp. If that is done,
-        #       username_pattern can then be used to constrain access.
-        #
-        # username_pattern: '^(.+@2i2c\.org|.+\.edu|kalkeab@gmail\.com|jhenryestrada@gmail\.com|deployment-service-check)$'
+          - sean-morris
   cull:
     # Cull after 30min of inactivity
     every: 300

diff --git a/config/clusters/cloudbank/enc-demo-git.secret.values.yaml b/config/clusters/cloudbank/enc-demo-git.secret.values.yaml
@@ -2,19 +2,19 @@ jupyterhub:
     hub:
         config:
             GitHubOAuthenticator:
-                client_id: ENC[AES256_GCM,data:hUklCIxzn0DcTn/8wAvOsjjhbPQ=,iv:3Q8M39+RWKsFW1zoYwtfcKwgyqrCn0gD5kCYpV34f9s=,tag:3X8XVvk7R7CZ8A9r7c6Xyw==,type:str]
-                client_secret: ENC[AES256_GCM,data:KH39Ztj5k2y8O1isRUlq+C7HTKLZL3bKNMACHTDf1b/+Oj02ugimdQ==,iv:DziFESpFqBbW9G7DNfc/hGASWtwbWllJwfN+UBEbkFI=,tag:YaO3M2Qm5O+/Xr/wt/p+IQ==,type:str]
+                client_id: ENC[AES256_GCM,data:EZErlZRIRyMKjXrRifNkh3x/vHI=,iv:L5x/nv/UaYOL9VOyfMbNtOupzVgOWlpxJspVXX/MYH4=,tag:vHLVG8AOIR5zomJPmf+9Tw==,type:str]
+                client_secret: ENC[AES256_GCM,data:NxoiO5x6Mr7KGl390QhZDjI8Zzyu8q7EGdfNJj8UEZlwEPDMXgkhmw==,iv:2NuzyInqiowh6eXiuaRckYC61vHhvUlmxAlXc4QW0qY=,tag:tos1jfiBqOWG2lSb77pySA==,type:str]
 sops:
     kms: []
     gcp_kms:
         - resource_id: projects/two-eye-two-see/locations/global/keyRings/sops-keys/cryptoKeys/similar-hubs
-          created_at: "2023-07-12T20:19:09Z"
-          enc: CiUA4OM7eJBb2i/RPXWo7DMEXza9Vju41ArGS8HMJVjCqNMOIaizEkkAyiwFHAiA3YVIV/4nAQ16WlStbzseuh0zo+TPrytupbVkm1XoaGopSE+ALGwPeZOfb5Jsjd7PcW9U4NfT9utJEaES4pi89hnz
+          created_at: "2024-06-03T23:43:37Z"
+          enc: CiUA4OM7eDBfcNyyfZIY9sGsscOkqVwAogPZsPZb03BknpwsuHrJEkkAWX/fcT/TZw3BPYlj2oAJP4eMKpbbwPq4qnkxBtjEWRRX90cez4ZmgDJ/f1usBuTWWm1LQMhvgWAhS6HlBaKasUUPRfiZ9exz
     azure_kv: []
     hc_vault: []
     age: []
-    lastmodified: "2023-07-12T20:19:09Z"
-    mac: ENC[AES256_GCM,data:gx+rKkMlzVRJhA5mD4AJ8IYPqUhSUiADZQaSzyrnIfh1P/45sdPE5oQsLpQvHFo7DU2n0D8igS6BFl/6vVNkKTtC4Bybqyryqg2MY0+lsRwKW6yzID0AqfkkBl1f9zh7wHD2nLmn4ysH97roxIjWGUh1bLrk4fg5w6PxrIO5Z9g=,iv:pzl2CJ8EhPWUkJDFR/yP55Ly9pbl26AoPFWokrAzBrE=,tag:JKEjUqeVrEUZoq9tMaY+Fw==,type:str]
+    lastmodified: "2024-06-03T23:43:38Z"
+    mac: ENC[AES256_GCM,data:H46boAK7Rl/F5td+WX++dGfB9f2INxWhzibkukdobTGC3xPF3NlLORi06shlY+NrHWWWOYsuTG9H2G/+JCjf6YRtQ4TwOVTqXSnJbLevfWOl4TZwoD8/KROYOf0l32rmwZ6TKPdLoS5TGUq65Sui9D/b306bYxvEZ9BB1Gmg9QQ=,iv:Hz1cthqcHOgktc44E+eO+Llg22ghdH3gAZNDQxZhM7w=,tag:OwJalUgba6RlgnrSyS67ZQ==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
-    version: 3.7.1
+    version: 3.8.1