Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make sure the configurator is disabled when appropriate #3641

Merged
merged 6 commits into from
Jan 30, 2024

Conversation

GeorgianaElena
Copy link
Member

Fixes #3635

In our schema, I believe we can set it up so that jupyterConfigurator can be true only if singleuser.profileList is empty or unset (via one of the methods described in https://stackoverflow.com/a/38781027). This should ensure that we can't have both profile lists and the configurator enabled at the same time.

Unfortunately I couldn't implement @yuvipanda's suggestion above because we do not do any validation for the jupyterhub config and we rely on it's own schema. So instead I wrote this function which is also how we validate some of the authentication configuration.

Does this make sense or should I continue to try and fiddle around with the actual schema?

Copy link

github-actions bot commented Jan 25, 2024

Merging this PR will trigger the following deployment actions.

Support and Staging deployments

Cloud Provider Cluster Name Upgrade Support? Reason for Support Redeploy Upgrade Staging? Reason for Staging Redeploy
gcp 2i2c-uk No Yes Core infrastructure has been modified
gcp hhmi No Yes Core infrastructure has been modified
gcp 2i2c No Yes Core infrastructure has been modified
aws nasa-veda No Yes Core infrastructure has been modified
kubeconfig utoronto No Yes Core infrastructure has been modified
aws nasa-ghg No Yes Core infrastructure has been modified
gcp qcl No Yes Core infrastructure has been modified
gcp pangeo-hubs No Yes Core infrastructure has been modified
aws earthscope No Yes Core infrastructure has been modified
gcp leap No Yes Core infrastructure has been modified
aws openscapes No Yes Core infrastructure has been modified
aws nasa-cryo No Yes Core infrastructure has been modified
aws gridsst No Yes Core infrastructure has been modified
gcp cloudbank No Yes Core infrastructure has been modified
aws 2i2c-aws-us No Yes Core infrastructure has been modified
gcp meom-ige No Yes Core infrastructure has been modified
aws ubc-eoas No Yes Core infrastructure has been modified
gcp linked-earth No Yes Core infrastructure has been modified
aws jupyter-meets-the-earth No Yes Core infrastructure has been modified
aws nasa-esdis No Yes Core infrastructure has been modified
aws victor No Yes Core infrastructure has been modified
aws smithsonian No Yes Core infrastructure has been modified
aws catalystproject-africa No Yes Core infrastructure has been modified
gcp catalystproject-latam No Yes Core infrastructure has been modified
gcp callysto No Yes Core infrastructure has been modified
gcp awi-ciroh No Yes Core infrastructure has been modified

Production deployments

Cloud Provider Cluster Name Hub Name Reason for Redeploy
gcp 2i2c-uk lis Core infrastructure has been modified
gcp hhmi prod Core infrastructure has been modified
gcp 2i2c imagebuilding-demo Core infrastructure has been modified
gcp 2i2c demo Core infrastructure has been modified
gcp 2i2c ohw Core infrastructure has been modified
gcp 2i2c aup Core infrastructure has been modified
gcp 2i2c temple Core infrastructure has been modified
gcp 2i2c ucmerced Core infrastructure has been modified
gcp 2i2c climatematch Core infrastructure has been modified
gcp 2i2c mtu Core infrastructure has been modified
gcp 2i2c tufts Core infrastructure has been modified
aws nasa-veda prod Core infrastructure has been modified
kubeconfig utoronto prod Core infrastructure has been modified
kubeconfig utoronto r-prod Core infrastructure has been modified
aws nasa-ghg prod Core infrastructure has been modified
gcp qcl prod Core infrastructure has been modified
gcp pangeo-hubs prod Core infrastructure has been modified
gcp pangeo-hubs coessing Core infrastructure has been modified
aws earthscope prod Core infrastructure has been modified
gcp leap prod Core infrastructure has been modified
aws openscapes prod Core infrastructure has been modified
aws nasa-cryo prod Core infrastructure has been modified
aws gridsst prod Core infrastructure has been modified
gcp cloudbank bcc Core infrastructure has been modified
gcp cloudbank ccsf Core infrastructure has been modified
gcp cloudbank csm Core infrastructure has been modified
gcp cloudbank dvc Core infrastructure has been modified
gcp cloudbank elcamino Core infrastructure has been modified
gcp cloudbank evc Core infrastructure has been modified
gcp cloudbank glendale Core infrastructure has been modified
gcp cloudbank howard Core infrastructure has been modified
gcp cloudbank miracosta Core infrastructure has been modified
gcp cloudbank skyline Core infrastructure has been modified
gcp cloudbank demo Core infrastructure has been modified
gcp cloudbank fresno Core infrastructure has been modified
gcp cloudbank humboldt Core infrastructure has been modified
gcp cloudbank laney Core infrastructure has been modified
gcp cloudbank sbcc Core infrastructure has been modified
gcp cloudbank sbcc-dev Core infrastructure has been modified
gcp cloudbank elac Core infrastructure has been modified
gcp cloudbank lacc Core infrastructure has been modified
gcp cloudbank lamission Core infrastructure has been modified
gcp cloudbank mills Core infrastructure has been modified
gcp cloudbank mission Core infrastructure has been modified
gcp cloudbank norco Core infrastructure has been modified
gcp cloudbank palomar Core infrastructure has been modified
gcp cloudbank pasadena Core infrastructure has been modified
gcp cloudbank sjcc Core infrastructure has been modified
gcp cloudbank sacramento Core infrastructure has been modified
gcp cloudbank srjc Core infrastructure has been modified
gcp cloudbank saddleback Core infrastructure has been modified
gcp cloudbank santiago Core infrastructure has been modified
gcp cloudbank sjsu Core infrastructure has been modified
gcp cloudbank sierra Core infrastructure has been modified
gcp cloudbank tuskegee Core infrastructure has been modified
gcp cloudbank wlac Core infrastructure has been modified
gcp cloudbank csulb Core infrastructure has been modified
gcp cloudbank csum Core infrastructure has been modified
aws 2i2c-aws-us showcase Core infrastructure has been modified
aws 2i2c-aws-us ncar-cisl Core infrastructure has been modified
aws 2i2c-aws-us go-bgc Core infrastructure has been modified
aws 2i2c-aws-us itcoocean Core infrastructure has been modified
aws 2i2c-aws-us cosmicds Core infrastructure has been modified
gcp meom-ige prod Core infrastructure has been modified
aws ubc-eoas prod Core infrastructure has been modified
gcp linked-earth prod Core infrastructure has been modified
aws jupyter-meets-the-earth prod Core infrastructure has been modified
aws nasa-esdis prod Core infrastructure has been modified
aws victor prod Core infrastructure has been modified
aws smithsonian prod Core infrastructure has been modified
aws catalystproject-africa nm-aist Core infrastructure has been modified
aws catalystproject-africa must Core infrastructure has been modified
gcp catalystproject-latam unitefa-conicet Core infrastructure has been modified
gcp callysto prod Core infrastructure has been modified
gcp awi-ciroh prod Core infrastructure has been modified

Copy link
Member

@sgibson91 sgibson91 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm very +1 on not trying to spend too much time trying to hack together something in an upstream schema for a 2i2c-specific feature. So long as an error is thrown at some point before deployment, this feels good enough to me.

GeorgianaElena and others added 2 commits January 26, 2024 13:58
@GeorgianaElena GeorgianaElena merged commit cfb4e64 into 2i2c-org:master Jan 30, 2024
34 checks passed
@GeorgianaElena GeorgianaElena deleted the configurator-schema branch January 30, 2024 08:46
Copy link

🎉🎉🎉🎉

Monitor the deployment of the hubs here 👉 https://github.com/2i2c-org/infrastructure/actions/runs/7708492552

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
Status: Done 🎉
Development

Successfully merging this pull request may close these issues.

Adjust our schema to turn jupyterConfigurator off if profileList is not empty
2 participants