From 6bbc638ee24e1eac9413e815c89758c5d49fcd61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jarom=C3=ADr=20Hradil?= <jaromir.hradil@cesnet.cz>
Date: Mon, 7 Oct 2024 14:29:27 +0200
Subject: [PATCH] Updating docker image versions
Adding setting to enable/disable RTC mode
Adding introspect URL for latest EGI hub introspect PR
---
cesnet-central/deployments/fullhub.yaml | 11 +++++++++--
common/deployments/hub-production.yaml | 11 +++++++++--
common/deployments/hub-staging.yaml | 11 +++++++++--
common/playbooks/files/jupyterhub-jwt.yaml | 2 +-
testing/deployments/hub.yaml | 11 +++++++++--
5 files changed, 37 insertions(+), 9 deletions(-)
diff --git a/cesnet-central/deployments/fullhub.yaml b/cesnet-central/deployments/fullhub.yaml
index 7ad4bad..3ccc80d 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 618ed53..d3d50ce 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,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/deployments/hub-staging.yaml b/common/deployments/hub-staging.yaml
index 40ed42b..42ecb45 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 71e1d4e..16117a2 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 1226186..2e4b3b5 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"
--
GitLab