Merge pull request #2824 from sean-morris/master

[CloudBank] Added Admin to CCSF and Demo Hub Restored

config/clusters/cloudbank/ccsf.values.yaml

@@ -46,6 +46,7 @@ jupyterhub:
           - [email protected]
           - [email protected]
           - [email protected]
+          - [email protected]
         username_pattern: '^(.+@2i2c\.org|.+@berkeley\.edu|.+@mail\.ccsf\.edu|deployment-service-check)$'
     extraFiles:
       configurator-schema-default:

config/clusters/cloudbank/demo.values.yaml

@@ -34,34 +34,34 @@ jupyterhub:
           url: http://cloudbank.org/
   hub:
     config:
-      JupyterHub:
-        authenticator_class: github
-      GitHubOAuthenticator:
-        oauth_callback_url: https://demo.cloudbank.2i2c.cloud/hub/oauth_callback
-        allowed_organizations:
-          - 2i2c-org
-          - ahs-cs-a
-        scope:
-          - read:org
-      Authenticator:
-        admin_users:
-          - sean-morris
       # JupyterHub:
-      #   authenticator_class: cilogon
-      # CILogonOAuthenticator:
+      #   authenticator_class: github
+      # GitHubOAuthenticator:
       #   oauth_callback_url: https://demo.cloudbank.2i2c.cloud/hub/oauth_callback
-      #   username_claim: email
+      #   allowed_organizations:
+      #     - 2i2c-org
+      #     - ahs-cs-a
+      #   scope:
+      #     - read:org
       # Authenticator:
-      #   # These folks should still have admin tho
       #   admin_users:
-      #     - [email protected]
-      #     - [email protected]
-      #     - [email protected]
-      #   # We only want 2i2c users and users with .edu emails to sign up
-      #   # Protects against cryptominers - https://github.com/2i2c-org/infrastructure/issues/1216
-      #   # FIXME: This doesn't account for educational institutions that have emails that don't end in .edu,
-      #   # as is the case for some non-euroamerican universities.
-      #   username_pattern: '^(.+@2i2c\.org|.+\.edu|kalkeab@gmail\.com|deployment-service-check)$'
+      #     - sean-morris
+      JupyterHub:
+        authenticator_class: cilogon
+      CILogonOAuthenticator:
+        oauth_callback_url: https://demo.cloudbank.2i2c.cloud/hub/oauth_callback
+        username_claim: email
+      Authenticator:
+        # These folks should still have admin tho
+        admin_users:
+          - [email protected]
+          - [email protected]
+          - [email protected]
+        # We only want 2i2c users and users with .edu emails to sign up
+        # Protects against cryptominers - https://github.com/2i2c-org/infrastructure/issues/1216
+        # FIXME: This doesn't account for educational institutions that have emails that don't end in .edu,
+        # as is the case for some non-euroamerican universities.
+        username_pattern: '^(.+@2i2c\.org|.+\.edu|kalkeab@gmail\.com|deployment-service-check)$'
   cull:
     # Cull after 30min of inactivity
     every: 300