Skip to content

Commit 1bdb75a

Browse files
committed
#645 feat: jupyterhub skip profile list form for now
1 parent 5dacdff commit 1bdb75a

1 file changed

Lines changed: 16 additions & 1 deletion

File tree

  • applications/jupyterhub/src/harness_jupyter/harness_jupyter

applications/jupyterhub/src/harness_jupyter/harness_jupyter/jupyterhub.py

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,31 @@
1111
handler.setLevel(logging.DEBUG)
1212
logging.getLogger().addHandler(handler)
1313

14+
15+
def custom_options_form(spawner, abc):
16+
# let's skip the profile selection form for now
17+
# ToDo: for future we can remove this hook
18+
spawner.profile_list = []
19+
# ref: https://github.com/jupyterhub/kubespawner/blob/37a80abb0a6c826e5c118a068fa1cf2725738038/kubespawner/spawner.py#L1885-L1935
20+
return spawner._options_form_default()
21+
22+
1423
def harness_hub():
1524
"""Wraps the method to change spawner configuration"""
1625
KubeSpawner.get_pod_manifest_base = KubeSpawner.get_pod_manifest
1726
KubeSpawner.get_pod_manifest = spawner_pod_manifest
27+
# let's skip the profile selection form for now
28+
# TODO: for future we can remove this hook
29+
KubeSpawner.options_form = custom_options_form
30+
1831

1932
def spawner_pod_manifest(self: KubeSpawner):
2033
print("Cloudharness: changing pod manifest")
2134
change_pod_manifest(self)
2235

2336
return KubeSpawner.get_pod_manifest_base(self)
2437

38+
2539
def affinity_spec(key, value):
2640
return {
2741

@@ -38,6 +52,7 @@ def affinity_spec(key, value):
3852
'topologyKey': 'kubernetes.io/hostname'
3953
}
4054

55+
4156
def set_user_volume_affinity(self: KubeSpawner):
4257
# Add labels to use for affinity
4358
labels = {
@@ -69,7 +84,7 @@ def change_pod_manifest(self: KubeSpawner):
6984
image_plus_tag = task_images[task_image]
7085
if ws_image in image_plus_tag:
7186
ws_image = image_plus_tag
72-
logging.info(f'Found tag for image: {ws_image}')
87+
logging.error(f'Found tag for image: {ws_image}')
7388
break
7489
else:
7590
if app['name'] != 'jupyterhub': # Would use the hub image in that case, which we don't want.

0 commit comments

Comments
 (0)