diff --git a/cesnet-central/deployments/fullhub.yaml b/cesnet-central/deployments/fullhub.yaml
index 7ad4badf34ff02c5a468c4fbdff596e83a92e198..3ccc80d728c9d96d11274a1ba1824aec5a38f485 100644
--- a/cesnet-central/deployments/fullhub.yaml
+++ b/cesnet-central/deployments/fullhub.yaml
@@ -52,7 +52,7 @@ singleuser:
defaultUrl: "/lab"
image:
name: eginotebooks/single-user-eosc
- tag: "sha-3473906"
+ tag: "sha-dea4fa2"
profileList:
- display_name: Small Environment - 2 vCPU / 4 GB RAM (non-collaboratice)
description: >
@@ -150,6 +150,12 @@ 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
+ fi
+
cd .
exec jupyterhub-singleuser \
--FileCheckpoints.checkpoint_dir='/home/jovyan/.notebookCheckpoints' \
@@ -169,7 +175,7 @@ hub:
# recommended to keep in sync with common/playbooks/files/jupyterhub-jwt.yaml
image:
name: eginotebooks/hub
- tag: "sha-df106d8"
+ tag: "sha-ea893ce"
config:
Authenticator:
enable_auth_state: true
@@ -189,6 +195,7 @@ hub:
authorize_url: "https://{{ secret['checkin_host'] }}/OIDC/authorization"
token_url: "https://{{ secret['checkin_host'] }}/OIDC/token"
userdata_url: "https://{{ secret['checkin_host'] }}/OIDC/userinfo"
+ introspect_url: "https://{{ secret['checkin_host'] }}/OIDC/introspect"
client_id: "{{ secret['client_id'] }}"
client_secret: "{{ secret['client_secret'] }}"
oauth_callback_url: "https://{{ notebooks_hostname }}/hub/oauth_callback"
diff --git a/common/deployments/hub-production.yaml b/common/deployments/hub-production.yaml
index 618ed5323070b5fea9f40d7d28cfa0048817ca9d..3a06556878ffe91ae97bba44a5f0adcb424c7cc5 100644
--- a/common/deployments/hub-production.yaml
+++ b/common/deployments/hub-production.yaml
@@ -52,7 +52,7 @@ singleuser:
defaultUrl: "/lab"
image:
name: eginotebooks/single-user-eosc
- tag: "sha-3473906"
+ tag: "sha-dea4fa2"
profileList:
- display_name: Small Environment - 2 vCPU / 4 GB RAM
description: >
@@ -132,6 +132,17 @@ singleuser:
#
/usr/local/bin/jupyterhub-wait-remote-home
+ # Disables RTC extension. To enable it set this env variable in kubespawner_override
+ if [ -z JUPYTERHUB_ALLOW_TOKEN_IN_URL ]; then
+ jupyter-labextension disable @jupyter/collaboration-extension
+ fi
+
+ # 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
+ fi
+
cd .
exec jupyterhub-singleuser \
--FileCheckpoints.checkpoint_dir='/home/jovyan/.notebookCheckpoints' \
@@ -151,7 +162,7 @@ hub:
# recommended to keep in sync with common/playbooks/files/jupyterhub-jwt.yaml
image:
name: eginotebooks/hub
- tag: "sha-df106d8"
+ tag: "sha-ea893ce"
config:
Authenticator:
enable_auth_state: true
@@ -170,6 +181,7 @@ hub:
authorize_url: "https://{{ secret['checkin_host'] }}/OIDC/authorization"
token_url: "https://{{ secret['checkin_host'] }}/OIDC/token"
userdata_url: "https://{{ secret['checkin_host'] }}/OIDC/userinfo"
+ introspect_url: "https://{{ secret['checkin_host'] }}/OIDC/introspect"
client_id: "{{ secret['client_id'] }}"
client_secret: "{{ secret['client_secret'] }}"
oauth_callback_url: "https://{{ notebooks_hostname }}/hub/oauth_callback"
diff --git a/common/deployments/hub-staging.yaml b/common/deployments/hub-staging.yaml
index 40ed42b3ba6b4a27ea6c9feb8e4507a86cff6281..42ecb45b68207e5b76d86e739b1865aaca0d4245 100644
--- a/common/deployments/hub-staging.yaml
+++ b/common/deployments/hub-staging.yaml
@@ -52,7 +52,7 @@ singleuser:
defaultUrl: "/lab"
image:
name: eginotebooks/single-user-eosc
- tag: "sha-3473906"
+ tag: "sha-dea4fa2"
profileList:
- display_name: Small Environment - 2 vCPU / 4 GB RAM
description: >
@@ -132,6 +132,12 @@ 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
+ fi
+
cd .
exec jupyterhub-singleuser \
--FileCheckpoints.checkpoint_dir='/home/jovyan/.notebookCheckpoints' \
@@ -151,7 +157,7 @@ hub:
# recommended to keep in sync with common/playbooks/files/jupyterhub-jwt.yaml
image:
name: eginotebooks/hub
- tag: "sha-df106d8"
+ tag: "sha-ea893ce"
config:
Authenticator:
enable_auth_state: true
@@ -170,6 +176,7 @@ hub:
authorize_url: "https://{{ secret['checkin_host'] }}/OIDC/authorization"
token_url: "https://{{ secret['checkin_host'] }}/OIDC/token"
userdata_url: "https://{{ secret['checkin_host'] }}/OIDC/userinfo"
+ introspect_url: "https://{{ secret['checkin_host'] }}/OIDC/introspect"
client_id: "{{ secret['client_id'] }}"
client_secret: "{{ secret['client_secret'] }}"
oauth_callback_url: "https://{{ notebooks_hostname }}/hub/oauth_callback"
diff --git a/common/playbooks/files/jupyterhub-jwt.yaml b/common/playbooks/files/jupyterhub-jwt.yaml
index 71e1d4efd1ef01d1b7abfc1121450a9e5cf88a4a..16117a22f7f56ca8a105694866c9c5d5d9bfc386 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-df106d8
+ image: eginotebooks/hub:sha-ea893ce
args:
- fastapi
- run
diff --git a/testing/deployments/hub.yaml b/testing/deployments/hub.yaml
index 1226186ccd1e56d0c5125f80301e5d39d5a8f0fd..2e4b3b53f52df6d58bc7e579f996746af17b8066 100644
--- a/testing/deployments/hub.yaml
+++ b/testing/deployments/hub.yaml
@@ -53,7 +53,7 @@ singleuser:
defaultUrl: "/lab"
image:
name: eginotebooks/single-user-eosc
- tag: "sha-3473906"
+ tag: "sha-dea4fa2"
profileList:
- display_name: Small Environment - 2 vCPU / 4 GB RAM
description: >
@@ -133,6 +133,12 @@ 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
+ fi
+
cd .
exec jupyterhub-singleuser \
--FileCheckpoints.checkpoint_dir='/home/jovyan/.notebookCheckpoints' \
@@ -152,7 +158,7 @@ hub:
# recommended to keep in sync with common/playbooks/files/jupyterhub-jwt.yaml
image:
name: eginotebooks/hub
- tag: "sha-df106d8"
+ tag: "sha-ea893ce"
config:
Authenticator:
enable_auth_state: true
@@ -171,6 +177,7 @@ hub:
authorize_url: "https://{{ secret['checkin_host'] }}/OIDC/authorization"
token_url: "https://{{ secret['checkin_host'] }}/OIDC/token"
userdata_url: "https://{{ secret['checkin_host'] }}/OIDC/userinfo"
+ introspect_url: "https://{{ secret['checkin_host'] }}/OIDC/introspect"
client_id: "{{ secret['client_id'] }}"
client_secret: "{{ secret['client_secret'] }}"
oauth_callback_url: "https://{{ notebooks_hostname }}/hub/oauth_callback"