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.

Sign up for GitHub

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

Update hub image again #1856

Merged
merged 4 commits into from
Nov 2, 2022
Merged

Update hub image again #1856

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
27667b5
Update kubespawner to latest main commit
GeorgianaElena Nov 2, 2022
90aeef5
Update hub image
GeorgianaElena Nov 2, 2022
1be7151
Remove special casing also, now that we're using latest kubespawner
GeorgianaElena Nov 2, 2022
0d0eb51
Remove user_options entirely
GeorgianaElena Nov 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions deployer/tests/test_hub_health.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,6 @@ async def check_hub_health(hub_url, test_notebook_path, service_api_token):
# This is because we would have lost its api token from the previous run.
await hub.delete_user(username)

# Temporary fix for https://github.com/2i2c-org/infrastructure/issues/1611
# FIXME: Remove this once https://github.com/jupyterhub/kubespawner/pull/631 gets merged
user_options = None
if ("openscapes" in hub_url) or ("carbonplan" in hub_url):
user_options = {"profile": "small", "image": "python"}
# Create a new user, start a server and execute a notebook
await execute_notebook(
hub_url,
Expand All @@ -57,7 +52,6 @@ async def check_hub_health(hub_url, test_notebook_path, service_api_token):
delete_user=False, # To be able to delete its server in case of failure
stop_server=True, # If the health check succeeds, this will delete the server
validate=False, # Don't validate notebook outputs. We only care that it runs top-to-bottom without error.
user_options=user_options,
)
finally:
if orig_service_token:
Expand Down
2 changes: 1 addition & 1 deletion helm-charts/basehub/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ jupyterhub:
admin: true
image:
name: quay.io/2i2c/pilot-hub
tag: "0.0.1-n4340.ha8608773"
tag: "0.0.1-n4378.h27667b54"
nodeSelector:
hub.jupyter.org/node-purpose: core
networkPolicy:
Expand Down
2 changes: 1 addition & 1 deletion helm-charts/images/hub/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
oauthenticator==15.1.0
git+https://github.com/yuvipanda/jupyterhub-configurator@ed7e3a0df1e3d625d10903ef7d7fd9c2fbb548db
# Reference https://github.com/2i2c-org/infrastructure/issues/1825
git+https://github.com/jupyterhub/kubespawner@fa19acdbb056c8d105baab13bbaa2b8b59dfa962
git+https://github.com/jupyterhub/kubespawner@a666d22609f0acd2db4bd3dd62472f9fb82867a0