2i2c-org · consideRatio · Nov 27, 2023 · Nov 27, 2023
diff --git a/config/clusters/2i2c-aws-us/cosmicds.values.yaml b/config/clusters/2i2c-aws-us/cosmicds.values.yaml
@@ -83,7 +83,6 @@ jupyterhub:
         oauth_callback_url: https://cosmicds.2i2c.cloud/hub/oauth_callback
         allowed_idps:
           http://github.com/login/oauth/authorize:
-            default: true
             username_derivation:
               username_claim: "preferred_username"
             allow_all: true

diff --git a/config/clusters/2i2c-uk/staging.values.yaml b/config/clusters/2i2c-uk/staging.values.yaml
@@ -41,6 +41,5 @@ jupyterhub:
         oauth_callback_url: "https://staging.uk.2i2c.cloud/hub/oauth_callback"
         allowed_idps:
           http://google.com/accounts/o8/id:
-            default: true
             username_derivation:
               username_claim: "email"
diff --git a/config/clusters/2i2c/aup.values.yaml b/config/clusters/2i2c/aup.values.yaml
@@ -40,7 +40,6 @@ jupyterhub:
         oauth_callback_url: "https://aup.pilot.2i2c.cloud/hub/oauth_callback"
         allowed_idps:
           http://github.com/login/oauth/authorize:
-            default: true
             username_derivation:
               username_claim: "preferred_username"
       OAuthenticator:

diff --git a/config/clusters/2i2c/binder-staging.values.yaml b/config/clusters/2i2c/binder-staging.values.yaml
@@ -74,7 +74,6 @@ binderhub:
           oauth_callback_url: "https://binder-staging.hub.2i2c.cloud/hub/oauth_callback"
           allowed_idps:
             http://google.com/accounts/o8/id:
-              default: true
               username_derivation:
                 username_claim: "email"
         Authenticator:

diff --git a/config/clusters/2i2c/dask-staging.values.yaml b/config/clusters/2i2c/dask-staging.values.yaml
@@ -47,6 +47,5 @@ basehub:
           oauth_callback_url: "https://dask-staging.2i2c.cloud/hub/oauth_callback"
           allowed_idps:
             http://google.com/accounts/o8/id:
-              default: true
               username_derivation:
                 username_claim: "email"
diff --git a/config/clusters/2i2c/demo.values.yaml b/config/clusters/2i2c/demo.values.yaml
@@ -34,7 +34,6 @@ jupyterhub:
         allowed_idps:
           # UTexas hub
           https://enterprise.login.utexas.edu/idp/shibboleth:
-            default: true
             username_derivation:
               username_claim: "eppn"
             allow_all: true

diff --git a/config/clusters/2i2c/mtu.values.yaml b/config/clusters/2i2c/mtu.values.yaml
@@ -38,7 +38,6 @@ jupyterhub:
         allowed_idps:
           # Allow MTU to login via Shibboleth
           https://sso.mtu.edu/idp/shibboleth:
-            default: true
             username_derivation:
               username_claim: "email"
             allowed_domains:

diff --git a/config/clusters/2i2c/neurohackademy.values.yaml b/config/clusters/2i2c/neurohackademy.values.yaml
@@ -59,7 +59,6 @@ jupyterhub:
         oauth_callback_url: https://neurohackademy.2i2c.cloud/hub/oauth_callback
         allowed_idps:
           http://github.com/login/oauth/authorize:
-            default: true
             username_derivation:
               username_claim: "preferred_username"
       OAuthenticator:

diff --git a/config/clusters/2i2c/staging.values.yaml b/config/clusters/2i2c/staging.values.yaml
@@ -58,6 +58,5 @@ jupyterhub:
         oauth_callback_url: "https://staging.2i2c.cloud/hub/oauth_callback"
         allowed_idps:
           http://google.com/accounts/o8/id:
-            default: true
             username_derivation:
               username_claim: "email"
diff --git a/config/clusters/2i2c/temple.values.yaml b/config/clusters/2i2c/temple.values.yaml
@@ -51,7 +51,6 @@ jupyterhub:
         oauth_callback_url: https://temple.2i2c.cloud/hub/oauth_callback
         allowed_idps:
           https://fim.temple.edu/idp/shibboleth:
-            default: true
             username_derivation:
               username_claim: "eppn"
             allow_all: true

diff --git a/config/clusters/2i2c/ucmerced-common.values.yaml b/config/clusters/2i2c/ucmerced-common.values.yaml
@@ -19,19 +19,28 @@ jupyterhub:
           name: University of California, Merced
           url: http://www.ucmerced.edu/
   hub:
+    extraConfig:
+      100-cilogon-ordering: |
+        # Explicitly specify allowed_idps here, so their sort order is
+        # preserved. Otherwise, the keys get sorted lexicographically,
+        # and Google comes before UC Merced
+        # https://github.com/2i2c-org/infrastructure/issues/3267
+        c.CILogonOAuthenticator.allowed_idps = {
+          "urn:mace:incommon:ucmerced.edu": {
+            "username_derivation": {
+              "username_claim": "eppn"
+            },
+            "allow_all": True
+          },
+          "http://google.com/accounts/o8/id": {
+            "username_derivation": {
+              "username_claim": "email"
+            }
+          }
+        }
     config:
       JupyterHub:
         authenticator_class: cilogon
-      CILogonOAuthenticator:
-        allowed_idps:
-          urn:mace:incommon:ucmerced.edu:
-            default: true
-            username_derivation:
-              username_claim: "eppn"
-            allow_all: true
-          http://google.com/accounts/o8/id:
-            username_derivation:
-              username_claim: "email"
       Authenticator:
         admin_users:
           - [email protected]
diff --git a/config/clusters/callysto/common.values.yaml b/config/clusters/callysto/common.values.yaml
@@ -141,7 +141,6 @@ jupyterhub:
           - "106951135662332329542" # Elmar Bouwer (Cybera)
         allowed_idps:
           http://google.com/accounts/o8/id:
-            default: true
             username_derivation:
               username_claim: "oidc"
             allowed_domains: &allowed_domains

diff --git a/config/clusters/carbonplan/common.values.yaml b/config/clusters/carbonplan/common.values.yaml
@@ -190,7 +190,6 @@ basehub:
         CILogonOAuthenticator:
           allowed_idps:
             http://github.com/login/oauth/authorize:
-              default: true
               username_derivation:
                 username_claim: "preferred_username"
         OAuthenticator:

diff --git a/config/clusters/catalystproject-africa/nm-aist.values.yaml b/config/clusters/catalystproject-africa/nm-aist.values.yaml
@@ -31,7 +31,6 @@ jupyterhub:
         oauth_callback_url: https://nm-aist.af.catalystproject.2i2c.cloud/hub/oauth_callback
         allowed_idps:
           http://google.com/accounts/o8/id:
-            default: true
             username_derivation:
               username_claim: email
             allowed_domains:

diff --git a/config/clusters/catalystproject-latam/unitefa-conicet.values.yaml b/config/clusters/catalystproject-latam/unitefa-conicet.values.yaml
@@ -31,7 +31,6 @@ jupyterhub:
         oauth_callback_url: "https://unitefa-conicet.latam.catalystproject.2i2c.cloud/hub/oauth_callback"
         allowed_idps:
           http://google.com/accounts/o8/id:
-            default: true
             username_derivation:
               username_claim: "email"
             allowed_domains:

diff --git a/config/clusters/cloudbank/bcc.values.yaml b/config/clusters/cloudbank/bcc.values.yaml
@@ -37,7 +37,6 @@ jupyterhub:
         oauth_callback_url: https://bcc.cloudbank.2i2c.cloud/hub/oauth_callback
         allowed_idps:
           http://google.com/accounts/o8/id:
-            default: true
             username_derivation:
               username_claim: "email"
             allowed_domains:

diff --git a/config/clusters/cloudbank/ccsf.values.yaml b/config/clusters/cloudbank/ccsf.values.yaml
@@ -37,7 +37,6 @@ jupyterhub:
         oauth_callback_url: "https://ccsf.cloudbank.2i2c.cloud/hub/oauth_callback"
         allowed_idps:
           http://google.com/accounts/o8/id:
-            default: true
             username_derivation:
               username_claim: "email"
             allowed_domains:

diff --git a/config/clusters/cloudbank/csm.values.yaml b/config/clusters/cloudbank/csm.values.yaml
@@ -31,7 +31,6 @@ jupyterhub:
         oauth_callback_url: https://csm.cloudbank.2i2c.cloud/hub/oauth_callback
         allowed_idps:
           http://google.com/accounts/o8/id:
-            default: true
             username_derivation:
               username_claim: "email"
             allowed_domains:

diff --git a/config/clusters/cloudbank/csulb.values.yaml b/config/clusters/cloudbank/csulb.values.yaml
@@ -37,7 +37,6 @@ jupyterhub:
         oauth_callback_url: https://csulb.cloudbank.2i2c.cloud/hub/oauth_callback
         allowed_idps:
           https://its-shib.its.csulb.edu/idp/shibboleth:
-            default: true
             username_derivation:
               username_claim: "email"
             allow_all: true

diff --git a/config/clusters/cloudbank/csum.values.yaml b/config/clusters/cloudbank/csum.values.yaml
@@ -37,7 +37,6 @@ jupyterhub:
         oauth_callback_url: "https://csum.cloudbank.2i2c.cloud/hub/oauth_callback"
         allowed_idps:
           https://cma-shibboleth.csum.edu/idp/shibboleth:
-            default: true
             username_derivation:
               username_claim: "email"
             allow_all: true

diff --git a/config/clusters/cloudbank/demo.values.yaml b/config/clusters/cloudbank/demo.values.yaml
@@ -40,7 +40,6 @@ jupyterhub:
         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"
       Authenticator:

diff --git a/config/clusters/cloudbank/dvc.values.yaml b/config/clusters/cloudbank/dvc.values.yaml
@@ -35,7 +35,6 @@ jupyterhub:
         oauth_callback_url: https://dvc.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:

diff --git a/config/clusters/cloudbank/elcamino.values.yaml b/config/clusters/cloudbank/elcamino.values.yaml
@@ -36,7 +36,6 @@ jupyterhub:
         oauth_callback_url: "https://elcamino.cloudbank.2i2c.cloud/hub/oauth_callback"
         allowed_idps:
           http://google.com/accounts/o8/id:
-            default: true
             username_derivation:
               username_claim: "email"
             allowed_domains:

diff --git a/config/clusters/cloudbank/evc.values.yaml b/config/clusters/cloudbank/evc.values.yaml
@@ -37,7 +37,6 @@ jupyterhub:
         oauth_callback_url: https://evc.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:

diff --git a/config/clusters/cloudbank/fresno.values.yaml b/config/clusters/cloudbank/fresno.values.yaml
@@ -31,7 +31,6 @@ jupyterhub:
         oauth_callback_url: https://fresno.cloudbank.2i2c.cloud/hub/oauth_callback
         allowed_idps:
           https://idp.scccd.edu/idp/shibboleth:
-            default: true
             username_derivation:
               username_claim: "email"
             allow_all: true

diff --git a/config/clusters/cloudbank/glendale.values.yaml b/config/clusters/cloudbank/glendale.values.yaml
@@ -31,7 +31,6 @@ jupyterhub:
         oauth_callback_url: https://glendale.cloudbank.2i2c.cloud/hub/oauth_callback
         allowed_idps:
           http://google.com/accounts/o8/id:
-            default: true
             username_derivation:
               username_claim: "email"
             allowed_domains:

diff --git a/config/clusters/cloudbank/howard.values.yaml b/config/clusters/cloudbank/howard.values.yaml
@@ -31,7 +31,6 @@ jupyterhub:
         oauth_callback_url: "https://howard.cloudbank.2i2c.cloud/hub/oauth_callback"
         allowed_idps:
           http://google.com/accounts/o8/id:
-            default: true
             username_derivation:
               username_claim: "email"
       OAuthenticator:

diff --git a/config/clusters/cloudbank/humboldt.values.yaml b/config/clusters/cloudbank/humboldt.values.yaml
@@ -40,7 +40,6 @@ jupyterhub:
         oauth_callback_url: https://humboldt.cloudbank.2i2c.cloud/hub/oauth_callback
         allowed_idps:
           https://sso.humboldt.edu/idp/metadata:
-            default: true
             username_derivation:
               username_claim: "email"
             allow_all: true

diff --git a/config/clusters/cloudbank/lacc.values.yaml b/config/clusters/cloudbank/lacc.values.yaml
@@ -31,7 +31,6 @@ jupyterhub:
         oauth_callback_url: "https://lacc.cloudbank.2i2c.cloud/hub/oauth_callback"
         allowed_idps:
           http://google.com/accounts/o8/id:
-            default: true
             username_derivation:
               username_claim: "email"
       OAuthenticator:

diff --git a/config/clusters/cloudbank/laney.values.yaml b/config/clusters/cloudbank/laney.values.yaml
@@ -31,7 +31,6 @@ jupyterhub:
         oauth_callback_url: "https://laney.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:

diff --git a/config/clusters/cloudbank/mills.values.yaml b/config/clusters/cloudbank/mills.values.yaml
@@ -31,7 +31,6 @@ jupyterhub:
         oauth_callback_url: "https://datahub.mills.edu/hub/oauth_callback"
         allowed_idps:
           http://google.com/accounts/o8/id:
-            default: true
             username_derivation:
               username_claim: "email"
             allowed_domains:

diff --git a/config/clusters/cloudbank/miracosta.values.yaml b/config/clusters/cloudbank/miracosta.values.yaml
@@ -31,7 +31,6 @@ jupyterhub:
         oauth_callback_url: https://miracosta.cloudbank.2i2c.cloud/hub/oauth_callback
         allowed_idps:
           https://miracosta.fedgw.com/gateway:
-            default: true
             username_derivation:
               username_claim: "email"
             allow_all: true

diff --git a/config/clusters/cloudbank/mission.values.yaml b/config/clusters/cloudbank/mission.values.yaml
@@ -37,7 +37,6 @@ jupyterhub:
         oauth_callback_url: https://mission.cloudbank.2i2c.cloud/hub/oauth_callback
         allowed_idps:
           http://google.com/accounts/o8/id:
-            default: true
             username_derivation:
               username_claim: "email"
             allowed_domains:

diff --git a/config/clusters/cloudbank/norco.values.yaml b/config/clusters/cloudbank/norco.values.yaml
@@ -31,7 +31,6 @@ jupyterhub:
         oauth_callback_url: "https://norco.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:

diff --git a/config/clusters/cloudbank/palomar.values.yaml b/config/clusters/cloudbank/palomar.values.yaml
@@ -31,7 +31,6 @@ jupyterhub:
         oauth_callback_url: "https://palomar.cloudbank.2i2c.cloud/hub/oauth_callback"
         allowed_idps:
           http://google.com/accounts/o8/id:
-            default: true
             username_derivation:
               username_claim: "email"
       OAuthenticator:

diff --git a/config/clusters/cloudbank/pasadena.values.yaml b/config/clusters/cloudbank/pasadena.values.yaml
@@ -37,7 +37,6 @@ jupyterhub:
         oauth_callback_url: https://pasadena.cloudbank.2i2c.cloud/hub/oauth_callback
         allowed_idps:
           http://google.com/accounts/o8/id:
-            default: true
             username_derivation:
               username_claim: "email"
             allowed_domains:

diff --git a/config/clusters/cloudbank/sacramento.values.yaml b/config/clusters/cloudbank/sacramento.values.yaml
@@ -37,7 +37,6 @@ jupyterhub:
         oauth_callback_url: https://sacramento.cloudbank.2i2c.cloud/hub/oauth_callback
         allowed_idps:
           http://google.com/accounts/o8/id:
-            default: true
             username_derivation:
               username_claim: "email"
             allowed_domains:

diff --git a/config/clusters/cloudbank/saddleback.values.yaml b/config/clusters/cloudbank/saddleback.values.yaml
@@ -37,7 +37,6 @@ jupyterhub:
         oauth_callback_url: https://saddleback.cloudbank.2i2c.cloud/hub/oauth_callback
         allowed_idps:
           http://google.com/accounts/o8/id:
-            default: true
             username_derivation:
               username_claim: "email"
             allowed_domains:

diff --git a/config/clusters/cloudbank/santiago.values.yaml b/config/clusters/cloudbank/santiago.values.yaml
@@ -37,7 +37,6 @@ jupyterhub:
         oauth_callback_url: https://santiago.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:

diff --git a/config/clusters/cloudbank/sbcc-dev.values.yaml b/config/clusters/cloudbank/sbcc-dev.values.yaml
@@ -31,7 +31,6 @@ jupyterhub:
         oauth_callback_url: "https://sbcc-dev.cloudbank.2i2c.cloud/hub/oauth_callback"
         allowed_idps:
           https://idp.sbcc.edu/idp/shibboleth:
-            default: true
             username_derivation:
               username_claim: "email"
           http://google.com/accounts/o8/id:

diff --git a/config/clusters/cloudbank/sbcc.values.yaml b/config/clusters/cloudbank/sbcc.values.yaml
@@ -31,7 +31,6 @@ jupyterhub:
         oauth_callback_url: "https://sbcc.cloudbank.2i2c.cloud/hub/oauth_callback"
         allowed_idps:
           https://idp.sbcc.edu/idp/shibboleth:
-            default: true
             username_derivation:
               username_claim: "email"
           http://google.com/accounts/o8/id:

diff --git a/config/clusters/cloudbank/sjcc.values.yaml b/config/clusters/cloudbank/sjcc.values.yaml
@@ -31,7 +31,6 @@ jupyterhub:
         oauth_callback_url: https://sjcc.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:

diff --git a/config/clusters/cloudbank/sjsu.values.yaml b/config/clusters/cloudbank/sjsu.values.yaml
@@ -40,7 +40,6 @@ jupyterhub:
         oauth_callback_url: https://sjsu.cloudbank.2i2c.cloud/hub/oauth_callback
         allowed_idps:
           https://idp01.sjsu.edu/idp/shibboleth:
-            default: true
             username_derivation:
               username_claim: "email"
             allow_all: true

diff --git a/config/clusters/cloudbank/skyline.values.yaml b/config/clusters/cloudbank/skyline.values.yaml
@@ -37,7 +37,6 @@ jupyterhub:
         oauth_callback_url: https://skyline.cloudbank.2i2c.cloud/hub/oauth_callback
         allowed_idps:
           http://google.com/accounts/o8/id:
-            default: true
             username_derivation:
               username_claim: "email"
             allowed_domains:

diff --git a/config/clusters/cloudbank/srjc.values.yaml b/config/clusters/cloudbank/srjc.values.yaml
@@ -37,7 +37,6 @@ jupyterhub:
         oauth_callback_url: https://srjc.cloudbank.2i2c.cloud/hub/oauth_callback
         allowed_idps:
           http://google.com/accounts/o8/id:
-            default: true
             username_derivation:
               username_claim: "email"
             allowed_domains:

diff --git a/config/clusters/cloudbank/staging.values.yaml b/config/clusters/cloudbank/staging.values.yaml
@@ -31,7 +31,6 @@ jupyterhub:
         oauth_callback_url: "https://staging.cloudbank.2i2c.cloud/hub/oauth_callback"
         allowed_idps:
           http://google.com/accounts/o8/id:
-            default: true
             username_derivation:
               username_claim: "email"
       OAuthenticator: