From f86946d7d19f4930b6e6ba37f21858db309b0af9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jarom=C3=ADr=20Hradil?= <jaromir.hradil@cesnet.cz>
Date: Tue, 26 Nov 2024 09:00:42 +0100
Subject: [PATCH] Upgrading to Hub 5 + enabling RTC on stage
---
common/deployments/hub-staging.yaml | 21 ++++++++++++---------
common/playbooks/files/jupyterhub-jwt.yaml | 2 +-
2 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/common/deployments/hub-staging.yaml b/common/deployments/hub-staging.yaml
index 52f9740..96f8e5a 100644
--- a/common/deployments/hub-staging.yaml
+++ b/common/deployments/hub-staging.yaml
@@ -50,7 +50,7 @@ singleuser:
k8s-app: cluster-ingress
image:
name: eginotebooks/single-user-eosc
- tag: "sha-dea4fa2"
+ tag: "sha-7052495"
profileList:
- display_name: Small Environment - 2 vCPU / 4 GB RAM
description: >
@@ -59,6 +59,8 @@ singleuser:
kubespawner_override:
args:
- "--CondaKernelSpecManager.env_filter='/opt/conda$'"
+ environment:
+ JUPYTERHUB_ALLOW_TOKEN_IN_URL: "1"
extra_annotations:
"egi.eu/flavor": "small-environment-2-vcpu-4-gb-ram"
vo_claims:
@@ -69,6 +71,8 @@ singleuser:
kubespawner_override:
args:
- "--CondaKernelSpecManager.env_filter='/opt/conda$'"
+ environment:
+ JUPYTERHUB_ALLOW_TOKEN_IN_URL: "1"
extra_annotations:
"egi.eu/flavor": "medium-environment-4-vcpu-8-gb-ram"
cpu_guarantee: 0.4
@@ -83,6 +87,8 @@ singleuser:
kubespawner_override:
args:
- "--CondaKernelSpecManager.env_filter='/opt/conda$'"
+ environment:
+ JUPYTERHUB_ALLOW_TOKEN_IN_URL: "1"
cpu_guarantee: 0.8
cpu_limit: 8
mem_guarantee: 2G
@@ -130,12 +136,9 @@ singleuser:
#
/usr/local/bin/jupyterhub-wait-remote-home
- # Disables RTC extension. To enable it set this env variable in kubespawner_override
- # to JUPYTERHUB_ALLOW_TOKEN_IN_URL="1"
- if [ -z "$JUPYTERHUB_ALLOW_TOKEN_IN_URL" ]; then
- jupyter-labextension disable @jupyter/collaboration-extension
- jupyter-labextension lock @jupyter/collaboration-extension
- fi
+ # Disables RTC and RTC ui extensions by default.
+ jupyter-labextension disable @jupyter/collaboration-extension
+ jupyter-labextension disable @jupyter/docprovider-extension
cd .
exec jupyterhub-singleuser \
@@ -161,8 +164,8 @@ hub:
# keep k8s-hub version in sync with ../playbooks/notebooks.yaml
image:
name: eginotebooks/hub
- # k8s-hub 3.3.8
- tag: "sha-f5af1a3"
+ # k8s-hub 4.0.0
+ tag: "sha-b20ead2"
config:
Authenticator:
enable_auth_state: true
diff --git a/common/playbooks/files/jupyterhub-jwt.yaml b/common/playbooks/files/jupyterhub-jwt.yaml
index 2f9c188..09bd516 100644
--- a/common/playbooks/files/jupyterhub-jwt.yaml
+++ b/common/playbooks/files/jupyterhub-jwt.yaml
@@ -20,7 +20,7 @@ spec:
containers:
- name: jwt
# recommended to keep it in sync with */deployments/*.yaml
- image: eginotebooks/hub:sha-6edf89c
+ image: eginotebooks/hub:sha-b20ead2
args:
- fastapi
- run
--
GitLab