From c488fef994be1ec6c4efea7f7add638f25a56752 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix-Antoine=20Fortin?=
 <felix-antoine.fortin@calculquebec.ca>
Date: Wed, 16 Apr 2025 12:03:59 -0400
Subject: [PATCH] Introduce parameter for disabling user config

In Jupyterhub < 4.0, disabling the user config excluded disabling
user custom kernelspecs. Since 4.0, the user defined kernels are
also included by the disabling, so we introduce the ability to
allow user defined config to allow custom defined kernels.

This introduces the risk that a badly defined user config mess
with the proper launching of Jupyter, so we keep it to true by
default.
---
 files/jupyterhub_config.json | 1 -
 manifests/init.pp            | 5 ++++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/files/jupyterhub_config.json b/files/jupyterhub_config.json
index cf5de2f..1046305 100644
--- a/files/jupyterhub_config.json
+++ b/files/jupyterhub_config.json
@@ -13,7 +13,6 @@
         "service"      : "jupyterhub-login"
     },
     "Spawner": {
-        "disable_user_config": true,
         "args": [
             "--KernelSpecManager.ensure_native_kernel=False"
         ]
diff --git a/manifests/init.pp b/manifests/init.pp
index 172384e..9e408d3 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -3,12 +3,13 @@
 # @param slurm_home Path to Slurm installation folder
 # @param bind_url Public facing URL of the whole JupyterHub application
 # @param spawner_class Class name for authenticating users.
-# @param authenticator_class Class  to use for spawning single-user servers
+# @param authenticator_class Class to use for spawning single-user servers
 # @param idle_timeout Time in seconds after which an inactive notebook is culled
 # @param traefik_version Version of traefik to install on the hub instance
 # @param admin_groups List of user groups that can act as JupyterHub admin
 # @param blocked_users List of users that cannot login and that jupyterhub can't sudo as
 # @param jupyterhub_config_hash Custom hash merged to JupyterHub JSON main hash
+# @param disable_user_config Disable per-user configuration of single-user servers
 # @param prometheus_token Token that Prometheus can use to scrape JupyterHub's metrics
 class jupyterhub (
   Stdlib::Absolutepath $prefix = '/opt/jupyterhub',
@@ -21,6 +22,7 @@
   Array[String] $admin_groups = [],
   Array[String] $blocked_users = ['root', 'toor', 'admin', 'centos', 'slurm'],
   Hash $jupyterhub_config_hash = {},
+  Boolean $disable_user_config = true,
   Optional[String] $prometheus_token = undef,
 ) {
   ensure_resource('class', 'jupyterhub::base', { 'prefix' => $prefix })
@@ -195,6 +197,7 @@
       'blocked_users' => $blocked_users,
     },
     'Spawner' => {
+      'disable_user_config' => $disable_user_config,
       'cmd' => "${node_prefix}/bin/jupyterhub-singleuser",
     },
     'BatchSpawnerBase' => {