From c2ae3f46e22700a24bb50e6f4233f7341782ca4d Mon Sep 17 00:00:00 2001
From: Karen Pailozian <pailozian@cesnet.cz>
Date: Thu, 4 Jul 2024 11:34:45 +0200
Subject: [PATCH] Idle-culler moved to extraConfig, sys.executable instead of
python3
---
testing/deployments/hub.yaml | 26 +++++++++++++++-----------
1 file changed, 15 insertions(+), 11 deletions(-)
diff --git a/testing/deployments/hub.yaml b/testing/deployments/hub.yaml
index 264c85c..d87dd98 100644
--- a/testing/deployments/hub.yaml
+++ b/testing/deployments/hub.yaml
@@ -154,18 +154,22 @@ hub:
admin_access: true
authenticate_prometheus: false
authenticator_class: egi_notebooks_hub.egiauthenticator.EGICheckinAuthenticator
- services:
- - name: 'jupyterhub-idle-culler-service'
- admin: true
- command:
- - python3
- - -m
- - jupyterhub_idle_culler
- - --timeout=600
- - --cull-users=True
- - --remove-named-servers=True
# spawner_class: (in egi-notebooks-b2drop)
extraConfig:
+ define-idle-culler-service: |-
+ c.JupyterHub.services = [
+ {
+ "name": "jupyterhub-idle-culler-service",
+ "command": [
+ sys.executable,
+ "-m", "jupyterhub_idle_culler",
+ "--timeout=600",
+ "--cull-users=True",
+ "--remove-named-servers=True"
+ ],
+ "admin": True,
+ }
+ ]
assign-roles-culler: |-
c.JupyterHub.load_roles = [
{
@@ -177,7 +181,7 @@ hub:
"read:servers",
"delete:servers",
"admin:users", # if using --cull-users (to delete users)
- ],
+ ]
}
]
egi-notebooks-welcome: |-
--
GitLab