diff --git a/config/clusters/cloudbank/ccsf.values.yaml b/config/clusters/cloudbank/ccsf.values.yaml index 73c7303cae..786b32d16f 100644 --- a/config/clusters/cloudbank/ccsf.values.yaml +++ b/config/clusters/cloudbank/ccsf.values.yaml @@ -41,9 +41,6 @@ jupyterhub: username_claim: "email" allowed_domains: - mail.ccsf.edu - urn:mace:incommon:berkeley.edu: - username_derivation: - username_claim: "email" Authenticator: allowed_users: - clare.alice.heimer@gmail.com diff --git a/config/clusters/cloudbank/csm.values.yaml b/config/clusters/cloudbank/csm.values.yaml index 36bb238354..e7409cc5e9 100644 --- a/config/clusters/cloudbank/csm.values.yaml +++ b/config/clusters/cloudbank/csm.values.yaml @@ -36,9 +36,6 @@ jupyterhub: allowed_domains: - my.smccd.edu - smccd.edu - urn:mace:incommon:berkeley.edu: - username_derivation: - username_claim: "email" Authenticator: admin_users: - ericvd@berkeley.edu diff --git a/config/clusters/cloudbank/csulb.values.yaml b/config/clusters/cloudbank/csulb.values.yaml index 8d75bacdcc..8eb30c3e91 100644 --- a/config/clusters/cloudbank/csulb.values.yaml +++ b/config/clusters/cloudbank/csulb.values.yaml @@ -36,18 +36,15 @@ jupyterhub: CILogonOAuthenticator: oauth_callback_url: https://csulb.cloudbank.2i2c.cloud/hub/oauth_callback allowed_idps: - http://google.com/accounts/o8/id: - username_derivation: - username_claim: "email" - allowed_domains: - - csulb.edu https://its-shib.its.csulb.edu/idp/shibboleth: username_derivation: username_claim: "email" allow_all: true - urn:mace:incommon:berkeley.edu: + http://google.com/accounts/o8/id: username_derivation: username_claim: "email" + allowed_domains: + - csulb.edu Authenticator: admin_users: - ericvd@berkeley.edu diff --git a/config/clusters/cloudbank/demo.values.yaml b/config/clusters/cloudbank/demo.values.yaml index 8ed6f2e721..ce194dfdc6 100644 --- a/config/clusters/cloudbank/demo.values.yaml +++ b/config/clusters/cloudbank/demo.values.yaml @@ -42,15 +42,11 @@ jupyterhub: http://google.com/accounts/o8/id: username_derivation: username_claim: "email" - # allow_all is a partial authorization, username_pattern is enforced - # also to allow a subset of users, specifically *.edu suffixed - # domains in this case + # allow_all is a partial authorization for this hub because + # username_pattern configured and enforced also, allowing only users + # with *.edu suffixed domains besides specific admin users. allow_all: true - urn:mace:incommon:berkeley.edu: - username_derivation: - username_claim: "email" Authenticator: - # These folks should still have admin tho admin_users: - ericvd@berkeley.edu - sean.smorris@berkeley.edu diff --git a/config/clusters/cloudbank/dvc.values.yaml b/config/clusters/cloudbank/dvc.values.yaml index 0844c11520..dce9039f10 100644 --- a/config/clusters/cloudbank/dvc.values.yaml +++ b/config/clusters/cloudbank/dvc.values.yaml @@ -34,19 +34,16 @@ jupyterhub: CILogonOAuthenticator: oauth_callback_url: https://dvc.cloudbank.2i2c.cloud/hub/oauth_callback allowed_idps: - http://google.com/accounts/o8/id: + http://login.microsoftonline.com/common/oauth2/v2.0/authorize: username_derivation: username_claim: "email" allowed_domains: - dvc.edu - http://login.microsoftonline.com/common/oauth2/v2.0/authorize: + http://google.com/accounts/o8/id: username_derivation: username_claim: "email" allowed_domains: - dvc.edu - urn:mace:incommon:berkeley.edu: - username_derivation: - username_claim: "email" JupyterHub: authenticator_class: cilogon Authenticator: diff --git a/config/clusters/cloudbank/elcamino.values.yaml b/config/clusters/cloudbank/elcamino.values.yaml index 3715de112f..670bffc31a 100644 --- a/config/clusters/cloudbank/elcamino.values.yaml +++ b/config/clusters/cloudbank/elcamino.values.yaml @@ -40,9 +40,6 @@ jupyterhub: username_claim: "email" allowed_domains: - elcamino.edu - urn:mace:incommon:berkeley.edu: - username_derivation: - username_claim: "email" Authenticator: admin_users: - ericvd@berkeley.edu diff --git a/config/clusters/cloudbank/evc.values.yaml b/config/clusters/cloudbank/evc.values.yaml index 9cda39e729..ac04f1379d 100644 --- a/config/clusters/cloudbank/evc.values.yaml +++ b/config/clusters/cloudbank/evc.values.yaml @@ -47,9 +47,6 @@ jupyterhub: http://google.com/accounts/o8/id: username_derivation: username_claim: "email" - urn:mace:incommon:berkeley.edu: - username_derivation: - username_claim: "email" Authenticator: admin_users: - ericvd@berkeley.edu diff --git a/config/clusters/cloudbank/fresno.values.yaml b/config/clusters/cloudbank/fresno.values.yaml index ea472f3fd3..5a333e8abc 100644 --- a/config/clusters/cloudbank/fresno.values.yaml +++ b/config/clusters/cloudbank/fresno.values.yaml @@ -37,9 +37,6 @@ jupyterhub: http://google.com/accounts/o8/id: username_derivation: username_claim: "email" - urn:mace:incommon:berkeley.edu: - username_derivation: - username_claim: "email" Authenticator: admin_users: - joellen.green@fresnocitycollege.edu diff --git a/config/clusters/cloudbank/glendale.values.yaml b/config/clusters/cloudbank/glendale.values.yaml index b5769bef6a..080bab4d51 100644 --- a/config/clusters/cloudbank/glendale.values.yaml +++ b/config/clusters/cloudbank/glendale.values.yaml @@ -36,9 +36,6 @@ jupyterhub: allowed_domains: - glendale.edu - student.glendale.edu - urn:mace:incommon:berkeley.edu: - username_derivation: - username_claim: "email" Authenticator: admin_users: - simon@glendale.edu diff --git a/config/clusters/cloudbank/howard.values.yaml b/config/clusters/cloudbank/howard.values.yaml index 5e77e99332..f2fa446aa4 100644 --- a/config/clusters/cloudbank/howard.values.yaml +++ b/config/clusters/cloudbank/howard.values.yaml @@ -33,9 +33,6 @@ jupyterhub: http://google.com/accounts/o8/id: username_derivation: username_claim: "email" - urn:mace:incommon:berkeley.edu: - username_derivation: - username_claim: "email" OAuthenticator: # WARNING: Don't use allow_existing_users with config to allow an # externally managed group of users, such as diff --git a/config/clusters/cloudbank/humboldt.values.yaml b/config/clusters/cloudbank/humboldt.values.yaml index d9be01abf7..255b67fe5d 100644 --- a/config/clusters/cloudbank/humboldt.values.yaml +++ b/config/clusters/cloudbank/humboldt.values.yaml @@ -39,20 +39,16 @@ jupyterhub: CILogonOAuthenticator: oauth_callback_url: https://humboldt.cloudbank.2i2c.cloud/hub/oauth_callback allowed_idps: - http://google.com/accounts/o8/id: - username_derivation: - username_claim: "email" - allowed_domains: - - humboldt.edu https://sso.humboldt.edu/idp/metadata: username_derivation: username_claim: "email" allow_all: true - urn:mace:incommon:berkeley.edu: + http://google.com/accounts/o8/id: username_derivation: username_claim: "email" + allowed_domains: + - humboldt.edu Authenticator: - # These folks should still have admin tho admin_users: - ericvd@berkeley.edu - sean.smorris@berkeley.edu diff --git a/config/clusters/cloudbank/lacc.values.yaml b/config/clusters/cloudbank/lacc.values.yaml index 8c6c41b29a..0542b302e6 100644 --- a/config/clusters/cloudbank/lacc.values.yaml +++ b/config/clusters/cloudbank/lacc.values.yaml @@ -33,9 +33,6 @@ jupyterhub: http://google.com/accounts/o8/id: username_derivation: username_claim: "email" - urn:mace:incommon:berkeley.edu: - username_derivation: - username_claim: "email" OAuthenticator: # WARNING: Don't use allow_existing_users with config to allow an # externally managed group of users, such as diff --git a/config/clusters/cloudbank/laney.values.yaml b/config/clusters/cloudbank/laney.values.yaml index a30b501d07..f431f69e26 100644 --- a/config/clusters/cloudbank/laney.values.yaml +++ b/config/clusters/cloudbank/laney.values.yaml @@ -39,9 +39,6 @@ jupyterhub: http://google.com/accounts/o8/id: username_derivation: username_claim: "email" - urn:mace:incommon:berkeley.edu: - username_derivation: - username_claim: "email" Authenticator: admin_users: - ericvd@berkeley.edu diff --git a/config/clusters/cloudbank/mills.values.yaml b/config/clusters/cloudbank/mills.values.yaml index c2f4cae8cf..74b846e6d3 100644 --- a/config/clusters/cloudbank/mills.values.yaml +++ b/config/clusters/cloudbank/mills.values.yaml @@ -35,9 +35,6 @@ jupyterhub: username_claim: "email" allowed_domains: - mills.edu - urn:mace:incommon:berkeley.edu: - username_derivation: - username_claim: "email" Authenticator: admin_users: - aculich@berkeley.edu diff --git a/config/clusters/cloudbank/miracosta.values.yaml b/config/clusters/cloudbank/miracosta.values.yaml index dbae907c84..9864706df3 100644 --- a/config/clusters/cloudbank/miracosta.values.yaml +++ b/config/clusters/cloudbank/miracosta.values.yaml @@ -30,14 +30,11 @@ jupyterhub: CILogonOAuthenticator: oauth_callback_url: https://miracosta.cloudbank.2i2c.cloud/hub/oauth_callback allowed_idps: - http://google.com/accounts/o8/id: - username_derivation: - username_claim: "email" https://miracosta.fedgw.com/gateway: username_derivation: username_claim: "email" allow_all: true - urn:mace:incommon:berkeley.edu: + http://google.com/accounts/o8/id: username_derivation: username_claim: "email" Authenticator: diff --git a/config/clusters/cloudbank/mission.values.yaml b/config/clusters/cloudbank/mission.values.yaml index acf5883b71..6ec0d56592 100644 --- a/config/clusters/cloudbank/mission.values.yaml +++ b/config/clusters/cloudbank/mission.values.yaml @@ -42,9 +42,6 @@ jupyterhub: allowed_domains: - missioncollege.edu - mywvm.wvm.edu - urn:mace:incommon:berkeley.edu: - username_derivation: - username_claim: "email" Authenticator: admin_users: - ericvd@berkeley.edu diff --git a/config/clusters/cloudbank/norco.values.yaml b/config/clusters/cloudbank/norco.values.yaml index d82f2d3a43..2e64440c0c 100644 --- a/config/clusters/cloudbank/norco.values.yaml +++ b/config/clusters/cloudbank/norco.values.yaml @@ -39,9 +39,6 @@ jupyterhub: http://google.com/accounts/o8/id: username_derivation: username_claim: "email" - urn:mace:incommon:berkeley.edu: - username_derivation: - username_claim: "email" Authenticator: admin_users: - ericvd@berkeley.edu diff --git a/config/clusters/cloudbank/palomar.values.yaml b/config/clusters/cloudbank/palomar.values.yaml index 91dcb3349c..2d5e8ce8f8 100644 --- a/config/clusters/cloudbank/palomar.values.yaml +++ b/config/clusters/cloudbank/palomar.values.yaml @@ -33,9 +33,6 @@ jupyterhub: http://google.com/accounts/o8/id: username_derivation: username_claim: "email" - urn:mace:incommon:berkeley.edu: - username_derivation: - username_claim: "email" OAuthenticator: # WARNING: Don't use allow_existing_users with config to allow an # externally managed group of users, such as diff --git a/config/clusters/cloudbank/pasadena.values.yaml b/config/clusters/cloudbank/pasadena.values.yaml index 6a8896ff8a..c5ce436305 100644 --- a/config/clusters/cloudbank/pasadena.values.yaml +++ b/config/clusters/cloudbank/pasadena.values.yaml @@ -41,9 +41,6 @@ jupyterhub: username_claim: "email" allowed_domains: - go.pasadena.edu - urn:mace:incommon:berkeley.edu: - username_derivation: - username_claim: "email" Authenticator: admin_users: - yxchang@go.pasadena.edu diff --git a/config/clusters/cloudbank/sacramento.values.yaml b/config/clusters/cloudbank/sacramento.values.yaml index 174d1d1465..ff03773762 100644 --- a/config/clusters/cloudbank/sacramento.values.yaml +++ b/config/clusters/cloudbank/sacramento.values.yaml @@ -42,9 +42,6 @@ jupyterhub: allowed_domains: - scc.losrios.edu - apps.losrios.edu - urn:mace:incommon:berkeley.edu: - username_derivation: - username_claim: "email" Authenticator: admin_users: - ericvd@berkeley.edu diff --git a/config/clusters/cloudbank/saddleback.values.yaml b/config/clusters/cloudbank/saddleback.values.yaml index e3b7f98920..ffaa5de787 100644 --- a/config/clusters/cloudbank/saddleback.values.yaml +++ b/config/clusters/cloudbank/saddleback.values.yaml @@ -41,9 +41,6 @@ jupyterhub: username_claim: "email" allowed_domains: - saddleback.edu - urn:mace:incommon:berkeley.edu: - username_derivation: - username_claim: "email" Authenticator: admin_users: - ericvd@berkeley.edu diff --git a/config/clusters/cloudbank/santiago.values.yaml b/config/clusters/cloudbank/santiago.values.yaml index be3ad58b77..14837ede12 100644 --- a/config/clusters/cloudbank/santiago.values.yaml +++ b/config/clusters/cloudbank/santiago.values.yaml @@ -46,9 +46,6 @@ jupyterhub: http://google.com/accounts/o8/id: username_derivation: username_claim: "email" - urn:mace:incommon:berkeley.edu: - username_derivation: - username_claim: "email" Authenticator: admin_users: - ericvd@berkeley.edu diff --git a/config/clusters/cloudbank/sbcc-dev.values.yaml b/config/clusters/cloudbank/sbcc-dev.values.yaml index 98e01568a0..bb470db2b6 100644 --- a/config/clusters/cloudbank/sbcc-dev.values.yaml +++ b/config/clusters/cloudbank/sbcc-dev.values.yaml @@ -30,13 +30,10 @@ jupyterhub: CILogonOAuthenticator: oauth_callback_url: "https://sbcc-dev.cloudbank.2i2c.cloud/hub/oauth_callback" allowed_idps: - http://google.com/accounts/o8/id: - username_derivation: - username_claim: "email" https://idp.sbcc.edu/idp/shibboleth: username_derivation: username_claim: "email" - urn:mace:incommon:berkeley.edu: + http://google.com/accounts/o8/id: username_derivation: username_claim: "email" OAuthenticator: diff --git a/config/clusters/cloudbank/sbcc.values.yaml b/config/clusters/cloudbank/sbcc.values.yaml index 2fc8495102..f186ee3386 100644 --- a/config/clusters/cloudbank/sbcc.values.yaml +++ b/config/clusters/cloudbank/sbcc.values.yaml @@ -30,13 +30,10 @@ jupyterhub: CILogonOAuthenticator: oauth_callback_url: "https://sbcc.cloudbank.2i2c.cloud/hub/oauth_callback" allowed_idps: - http://google.com/accounts/o8/id: - username_derivation: - username_claim: "email" https://idp.sbcc.edu/idp/shibboleth: username_derivation: username_claim: "email" - urn:mace:incommon:berkeley.edu: + http://google.com/accounts/o8/id: username_derivation: username_claim: "email" OAuthenticator: diff --git a/config/clusters/cloudbank/sjcc.values.yaml b/config/clusters/cloudbank/sjcc.values.yaml index d1dcd0df1e..7aa427950e 100644 --- a/config/clusters/cloudbank/sjcc.values.yaml +++ b/config/clusters/cloudbank/sjcc.values.yaml @@ -41,9 +41,6 @@ jupyterhub: http://google.com/accounts/o8/id: username_derivation: username_claim: "email" - urn:mace:incommon:berkeley.edu: - username_derivation: - username_claim: "email" Authenticator: admin_users: - christiaan.desmond@sjcc.edu diff --git a/config/clusters/cloudbank/sjsu.values.yaml b/config/clusters/cloudbank/sjsu.values.yaml index 9257693c0b..91454df518 100644 --- a/config/clusters/cloudbank/sjsu.values.yaml +++ b/config/clusters/cloudbank/sjsu.values.yaml @@ -46,9 +46,6 @@ jupyterhub: http://google.com/accounts/o8/id: username_derivation: username_claim: "email" - urn:mace:incommon:berkeley.edu: - username_derivation: - username_claim: "email" Authenticator: admin_users: - ericvd@berkeley.edu diff --git a/config/clusters/cloudbank/skyline.values.yaml b/config/clusters/cloudbank/skyline.values.yaml index d153662897..03b16084f1 100644 --- a/config/clusters/cloudbank/skyline.values.yaml +++ b/config/clusters/cloudbank/skyline.values.yaml @@ -41,9 +41,6 @@ jupyterhub: username_claim: "email" allowed_domains: - my.smccd.edu - urn:mace:incommon:berkeley.edu: - username_derivation: - username_claim: "email" Authenticator: admin_users: - ericvd@berkeley.edu diff --git a/config/clusters/cloudbank/srjc.values.yaml b/config/clusters/cloudbank/srjc.values.yaml index 1475e74c8e..03c6802287 100644 --- a/config/clusters/cloudbank/srjc.values.yaml +++ b/config/clusters/cloudbank/srjc.values.yaml @@ -41,9 +41,6 @@ jupyterhub: username_claim: "email" allowed_domains: - santarosa.edu - urn:mace:incommon:berkeley.edu: - username_derivation: - username_claim: "email" Authenticator: admin_users: - ericvd@berkeley.edu diff --git a/config/clusters/cloudbank/staging.values.yaml b/config/clusters/cloudbank/staging.values.yaml index b45e22d8ae..83ec5fe872 100644 --- a/config/clusters/cloudbank/staging.values.yaml +++ b/config/clusters/cloudbank/staging.values.yaml @@ -33,9 +33,6 @@ jupyterhub: http://google.com/accounts/o8/id: username_derivation: username_claim: "email" - urn:mace:incommon:berkeley.edu: - username_derivation: - username_claim: "email" OAuthenticator: # WARNING: Don't use allow_existing_users with config to allow an # externally managed group of users, such as diff --git a/config/clusters/cloudbank/tuskegee.values.yaml b/config/clusters/cloudbank/tuskegee.values.yaml index 40d56e897c..9ff5994406 100644 --- a/config/clusters/cloudbank/tuskegee.values.yaml +++ b/config/clusters/cloudbank/tuskegee.values.yaml @@ -33,9 +33,6 @@ jupyterhub: http://google.com/accounts/o8/id: username_derivation: username_claim: "email" - urn:mace:incommon:berkeley.edu: - username_derivation: - username_claim: "email" OAuthenticator: # WARNING: Don't use allow_existing_users with config to allow an # externally managed group of users, such as