From 3dffdca945773530f6333473a99df33dfef09796 Mon Sep 17 00:00:00 2001 From: ryanlovett Date: Thu, 28 Sep 2023 20:41:05 -0700 Subject: [PATCH 1/6] Enable named servers on dev-r. --- deployments/dev-r/config/common.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/deployments/dev-r/config/common.yaml b/deployments/dev-r/config/common.yaml index d791e717f..f07761f80 100644 --- a/deployments/dev-r/config/common.yaml +++ b/deployments/dev-r/config/common.yaml @@ -14,6 +14,7 @@ jupyterhub: hub.jupyter.org/pool-name: core-pool-2023-07-11 hub: + allowNamedServers: true nodeSelector: hub.jupyter.org/pool-name: core-pool-2023-07-11 config: From 0a44943f180a1616f267f60d5f4b152003e3fba4 Mon Sep 17 00:00:00 2001 From: ryanlovett Date: Thu, 28 Sep 2023 20:52:22 -0700 Subject: [PATCH 2/6] Cull named servers too. --- deployments/dev-r/config/common.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/deployments/dev-r/config/common.yaml b/deployments/dev-r/config/common.yaml index f07761f80..c6d76eab3 100644 --- a/deployments/dev-r/config/common.yaml +++ b/deployments/dev-r/config/common.yaml @@ -13,6 +13,9 @@ jupyterhub: nodeSelector: hub.jupyter.org/pool-name: core-pool-2023-07-11 + cull: + removeNamedServers: true + hub: allowNamedServers: true nodeSelector: From 4e1ac7bdc900861cb8db9a54801549c76f2bfd5f Mon Sep 17 00:00:00 2001 From: ryanlovett Date: Thu, 28 Sep 2023 20:52:41 -0700 Subject: [PATCH 3/6] Land user at /hub/home. Explore encouraging users to choose which server to start. --- deployments/dev-r/config/common.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployments/dev-r/config/common.yaml b/deployments/dev-r/config/common.yaml index c6d76eab3..8ab90519e 100644 --- a/deployments/dev-r/config/common.yaml +++ b/deployments/dev-r/config/common.yaml @@ -46,7 +46,7 @@ jupyterhub: - course::1524699::enrollment_type::ta singleuser: - defaultUrl: /rstudio + defaultUrl: /hub/home profileList: - display_name: "Dockerfile image" description: "This is the original dev-r image." From a7d13c01be0d3e78c04724ac3f0610dcc30585bb Mon Sep 17 00:00:00 2001 From: ryanlovett Date: Thu, 28 Sep 2023 22:11:55 -0700 Subject: [PATCH 4/6] Set /hub/home to be hub's default url. This drops the user into the named server choice. --- deployments/dev-r/config/common.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/deployments/dev-r/config/common.yaml b/deployments/dev-r/config/common.yaml index 8ab90519e..6242591ae 100644 --- a/deployments/dev-r/config/common.yaml +++ b/deployments/dev-r/config/common.yaml @@ -30,7 +30,11 @@ jupyterhub: #- rylo #- sknapp - # List of other admin users + extraConfig: + 20-hubHome: | + # Direct users to named server list + c.JupyterHub.default_url = '/hub/home' + loadRoles: course-staff-1524699: description: Enable course staff to view and access servers. From 2886bd335e738a710da0f1867e06daedd263a521 Mon Sep 17 00:00:00 2001 From: ryanlovett Date: Thu, 28 Sep 2023 22:12:36 -0700 Subject: [PATCH 5/6] Restore /rstudio as singleuser url. --- deployments/dev-r/config/common.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployments/dev-r/config/common.yaml b/deployments/dev-r/config/common.yaml index 6242591ae..eea23fb9e 100644 --- a/deployments/dev-r/config/common.yaml +++ b/deployments/dev-r/config/common.yaml @@ -50,7 +50,7 @@ jupyterhub: - course::1524699::enrollment_type::ta singleuser: - defaultUrl: /hub/home + defaultUrl: /rstudio profileList: - display_name: "Dockerfile image" description: "This is the original dev-r image." From e008a2b22d52196a2ab26a9d4f6a583086f8a750 Mon Sep 17 00:00:00 2001 From: ryanlovett Date: Thu, 28 Sep 2023 22:12:56 -0700 Subject: [PATCH 6/6] Create a per-course profile. This one sets the user's mounted home path to be a subpath of their NFS home directory. This could be useful to separate user's files by their class. --- deployments/dev-r/config/common.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/deployments/dev-r/config/common.yaml b/deployments/dev-r/config/common.yaml index eea23fb9e..0f29855cc 100644 --- a/deployments/dev-r/config/common.yaml +++ b/deployments/dev-r/config/common.yaml @@ -59,6 +59,14 @@ jupyterhub: description: "A newer repo2docker-based image with similar components as the primary." kubespawner_override: image: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/dev-r-secondary:5c55c90 + - display_name: "1524699: DataHub Infrastructure" + slug: "1524699" + description: "Regular image with per-course subpath." + kubespawner_override: + volume_mounts: + - name: home + mountPath: /home/jovyan + subPath: "{username}/1524699" nodeSelector: hub.jupyter.org/pool-name: small-courses-pool storage: