Skip to content

Commit

Permalink
Merge pull request #5359 from ryanlovett/hub-services-oauth
Browse files Browse the repository at this point in the history 
Remove internal datahub auth configuration
  • Loading branch information
@ryanlovett
ryanlovett authored Jan 11, 2024
2 parents de18840 + 7d5282a commit 7b54232
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 245 deletions.
73 changes: 0 additions & 73 deletions deployments/datahub/config/prod.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,79 +10,6 @@ jupyterhub:
hosts:
- datahub.berkeley.edu
hub:
services:
cee.datahub.berkeley.edu:
name: cee.datahub.berkeley.edu
oauth_client_id: service-cee.datahub.berkeley.edu
oauth_redirect_uri: https://cee.datahub.berkeley.edu/hub/oauth_callback
astro.datahub.berkeley.edu:
name: astro.datahub.berkeley.edu
oauth_client_id: service-astro.datahub.berkeley.edu
oauth_redirect_uri: https://astro.datahub.berkeley.edu/hub/oauth_callback
data8.datahub.berkeley.edu:
name: data8.datahub.berkeley.edu
oauth_client_id: service-data8.datahub.berkeley.edu
oauth_redirect_uri: https://data8.datahub.berkeley.edu/hub/oauth_callback
data100.datahub.berkeley.edu:
name: data100.datahub.berkeley.edu
oauth_client_id: service-data100.datahub.berkeley.edu
oauth_redirect_uri: https://data100.datahub.berkeley.edu/hub/oauth_callback
data101.datahub.berkeley.edu:
name: data101.datahub.berkeley.edu
oauth_client_id: service-data101.datahub.berkeley.edu
oauth_redirect_uri: https://data101.datahub.berkeley.edu/hub/oauth_callback
data102.datahub.berkeley.edu:
name: data102.datahub.berkeley.edu
oauth_client_id: service-data102.datahub.berkeley.edu
oauth_redirect_uri: https://data102.datahub.berkeley.edu/hub/oauth_callback
dlab.datahub.berkeley.edu:
name: dlab.datahub.berkeley.edu
oauth_client_id: service-dlab.datahub.berkeley.edu
oauth_redirect_uri: https://dlab.datahub.berkeley.edu/hub/oauth_callback
eecs.datahub.berkeley.edu:
name: eecs.datahub.berkeley.edu
oauth_client_id: service-eecs.datahub.berkeley.edu
oauth_redirect_uri: https://eecs.datahub.berkeley.edu/hub/oauth_callback
ischool.datahub.berkeley.edu:
name: ischool.datahub.berkeley.edu
oauth_client_id: service-ischool.datahub.berkeley.edu
oauth_redirect_uri: https://ischool.datahub.berkeley.edu/hub/oauth_callback
julia.datahub.berkeley.edu:
name: julia.datahub.berkeley.edu
oauth_client_id: service-julia.datahub.berkeley.edu
oauth_redirect_uri: https://julia.datahub.berkeley.edu/hub/oauth_callback
logodev.datahub.berkeley.edu:
name: logodev.datahub.berkeley.edu
oauth_client_id: service-logodev.datahub.berkeley.edu
oauth_redirect_uri: https://logodev.datahub.berkeley.edu/hub/oauth_callback
prob140.datahub.berkeley.edu:
name: prob140.datahub.berkeley.edu
oauth_client_id: service-prob140.datahub.berkeley.edu
oauth_redirect_uri: https://prob140.datahub.berkeley.edu/hub/oauth_callback
r.datahub.berkeley.edu:
name: r.datahub.berkeley.edu
oauth_client_id: service-r.datahub.berkeley.edu
oauth_redirect_uri: https://r.datahub.berkeley.edu/hub/oauth_callback
publichealth.datahub.berkeley.edu:
name: publichealth.datahub.berkeley.edu
oauth_client_id: service-publichealth.datahub.berkeley.edu
oauth_redirect_uri: https://publichealth.datahub.berkeley.edu/hub/oauth_callback
stat159.datahub.berkeley.edu:
name: stat159.datahub.berkeley.edu
oauth_client_id: service-stat159.datahub.berkeley.edu
oauth_redirect_uri: https://stat159.datahub.berkeley.edu/hub/oauth_callback
stat20.datahub.berkeley.edu:
name: stat20.datahub.berkeley.edu
oauth_client_id: service-stat20.datahub.berkeley.edu
oauth_redirect_uri: https://stat20.datahub.berkeley.edu/hub/oauth_callback
shiny.datahub.berkeley.edu:
name: shiny.datahub.berkeley.edu
oauth_client_id: service-shiny.datahub.berkeley.edu
oauth_redirect_uri: https://shiny.datahub.berkeley.edu/hub/oauth_callback
a11y.datahub.berkeley.edu:
name: a11y.datahub.berkeley.edu
oauth_client_id: service-a11y.datahub.berkeley.edu
oauth_redirect_uri: https://a11y.datahub.berkeley.edu/hub/oauth_callback
db:
pvc:
# This also holds logs
Expand Down
74 changes: 0 additions & 74 deletions deployments/datahub/config/staging.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,80 +3,6 @@ nfsPVC:
shareName: shares/datahub/staging

jupyterhub:
hub:
services:
cee-staging.datahub.berkeley.edu:
name: cee-staging.datahub.berkeley.edu
oauth_client_id: service-cee-staging.datahub.berkeley.edu
oauth_redirect_uri: https://cee-staging.datahub.berkeley.edu/hub/oauth_callback
astro-staging.datahub.berkeley.edu:
name: astro-staging.datahub.berkeley.edu
oauth_client_id: service-astro-staging.datahub.berkeley.edu
oauth_redirect_uri: https://astro-staging.datahub.berkeley.edu/hub/oauth_callback
data8-staging.datahub.berkeley.edu:
name: data8-staging.datahub.berkeley.edu
oauth_client_id: service-data8-staging.datahub.berkeley.edu
oauth_redirect_uri: https://data8-staging.datahub.berkeley.edu/hub/oauth_callback
data100-staging.datahub.berkeley.edu:
name: data100-staging.datahub.berkeley.edu
oauth_client_id: service-data100-staging.datahub.berkeley.edu
oauth_redirect_uri: https://data100-staging.datahub.berkeley.edu/hub/oauth_callback
data101-staging.datahub.berkeley.edu:
name: data101-staging.datahub.berkeley.edu
oauth_client_id: service-data101-staging.datahub.berkeley.edu
oauth_redirect_uri: https://data101-staging.datahub.berkeley.edu/hub/oauth_callback
data102-staging.datahub.berkeley.edu:
name: data102-staging.datahub.berkeley.edu
oauth_client_id: service-data102-staging.datahub.berkeley.edu
oauth_redirect_uri: https://data102-staging.datahub.berkeley.edu/hub/oauth_callback
dlab-staging.datahub.berkeley.edu:
name: dlab-staging.datahub.berkeley.edu
oauth_client_id: service-dlab-staging.datahub.berkeley.edu
oauth_redirect_uri: https://dlab-staging.datahub.berkeley.edu/hub/oauth_callback
eecs-staging.datahub.berkeley.edu:
name: eecs-staging.datahub.berkeley.edu
oauth_client_id: service-eecs-staging.datahub.berkeley.edu
oauth_redirect_uri: https://eecs-staging.datahub.berkeley.edu/hub/oauth_callback
ischool-staging.datahub.berkeley.edu:
name: ischool-staging.datahub.berkeley.edu
oauth_client_id: service-ischool-staging.datahub.berkeley.edu
oauth_redirect_uri: https://ischool-staging.datahub.berkeley.edu/hub/oauth_callback
logodev-staging.datahub.berkeley.edu:
name: logodev-staging.datahub.berkeley.edu
oauth_client_id: service-logodev-staging.datahub.berkeley.edu
oauth_redirect_uri: https://logodev-staging.datahub.berkeley.edu/hub/oauth_callback
julia-staging.datahub.berkeley.edu:
name: julia-staging.datahub.berkeley.edu
oauth_client_id: service-julia-staging.datahub.berkeley.edu
oauth_redirect_uri: https://julia-staging.datahub.berkeley.edu/hub/oauth_callback
prob140-staging.datahub.berkeley.edu:
name: prob140-staging.datahub.berkeley.edu
oauth_client_id: service-prob140-staging.datahub.berkeley.edu
oauth_redirect_uri: https://prob140-staging.datahub.berkeley.edu/hub/oauth_callback
publichealth-staging.datahub.berkeley.edu:
name: publichealth-staging.datahub.berkeley.edu
oauth_client_id: service-publichealth-staging.datahub.berkeley.edu
oauth_redirect_uri: https://publichealth-staging.datahub.berkeley.edu/hub/oauth_callback
r-staging.datahub.berkeley.edu:
name: r-staging.datahub.berkeley.edu
oauth_client_id: service-r-staging.datahub.berkeley.edu
oauth_redirect_uri: https://r-staging.datahub.berkeley.edu/hub/oauth_callback
stat159-staging.datahub.berkeley.edu:
name: stat159-staging.datahub.berkeley.edu
oauth_client_id: service-stat159-staging.datahub.berkeley.edu
oauth_redirect_uri: https://stat159-staging.datahub.berkeley.edu/hub/oauth_callback
stat20-staging.datahub.berkeley.edu:
name: stat20-staging.datahub.berkeley.edu
oauth_client_id: service-stat20-staging.datahub.berkeley.edu
oauth_redirect_uri: https://stat20-staging.datahub.berkeley.edu/hub/oauth_callback
shiny-staging.datahub.berkeley.edu:
name: shiny-staging.datahub.berkeley.edu
oauth_client_id: service-shiny-staging.datahub.berkeley.edu
oauth_redirect_uri: https://shiny-staging.datahub.berkeley.edu/hub/oauth_callback
a11y-staging.datahub.berkeley.edu:
name: a11y-staging.datahub.berkeley.edu
oauth_client_id: service-a11y-staging.datahub.berkeley.edu
oauth_redirect_uri: https://a11y-staging.datahub.berkeley.edu/hub/oauth_callback
scheduling:
userPlaceholder:
enabled: false
Expand Down
Loading

0 comments on commit 7b54232

Please sign in to comment.