From 27667b54ee124668b7a7393e69355611566770f3 Mon Sep 17 00:00:00 2001 From: GeorgianaElena Date: Wed, 2 Nov 2022 19:59:23 +0200 Subject: [PATCH 1/4] Update kubespawner to latest main commit --- helm-charts/images/hub/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm-charts/images/hub/requirements.txt b/helm-charts/images/hub/requirements.txt index 2607afd099..66c64b6f21 100644 --- a/helm-charts/images/hub/requirements.txt +++ b/helm-charts/images/hub/requirements.txt @@ -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 From 90aeef5ca0f9b47eda952023f0a637abbb102d48 Mon Sep 17 00:00:00 2001 From: GeorgianaElena Date: Wed, 2 Nov 2022 20:08:44 +0200 Subject: [PATCH 2/4] Update hub image --- helm-charts/basehub/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm-charts/basehub/values.yaml b/helm-charts/basehub/values.yaml index d9c029b4e6..d9c36fada4 100644 --- a/helm-charts/basehub/values.yaml +++ b/helm-charts/basehub/values.yaml @@ -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: From 1be71516f4c04d1f2266c51d28bc93e657a406b5 Mon Sep 17 00:00:00 2001 From: GeorgianaElena Date: Wed, 2 Nov 2022 20:13:37 +0200 Subject: [PATCH 3/4] Remove special casing also, now that we're using latest kubespawner --- deployer/tests/test_hub_health.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/deployer/tests/test_hub_health.py b/deployer/tests/test_hub_health.py index 529f16c387..9b81f11c3a 100644 --- a/deployer/tests/test_hub_health.py +++ b/deployer/tests/test_hub_health.py @@ -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, From 0d0eb512972c6ea80b2eabeb7105ff89aebc6d53 Mon Sep 17 00:00:00 2001 From: GeorgianaElena Date: Wed, 2 Nov 2022 20:21:56 +0200 Subject: [PATCH 4/4] Remove user_options entirely --- deployer/tests/test_hub_health.py | 1 - 1 file changed, 1 deletion(-) diff --git a/deployer/tests/test_hub_health.py b/deployer/tests/test_hub_health.py index 9b81f11c3a..f2c0061bc0 100644 --- a/deployer/tests/test_hub_health.py +++ b/deployer/tests/test_hub_health.py @@ -52,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: