Skip to content
Snippets Groups Projects
Verified Commit b71123b5 authored by Jaromír Hradil's avatar Jaromír Hradil
Browse files

Upgrading to Hub 5 + enabling RTC and user-initiated sharing on production

parent 476c7019
No related branches found
No related tags found
No related merge requests found
...@@ -50,7 +50,7 @@ singleuser: ...@@ -50,7 +50,7 @@ singleuser:
k8s-app: cluster-ingress k8s-app: cluster-ingress
image: image:
name: eginotebooks/single-user-eosc name: eginotebooks/single-user-eosc
tag: "sha-dea4fa2" tag: "sha-d822021"
profileList: profileList:
- display_name: Small Environment - 2 vCPU / 4 GB RAM - display_name: Small Environment - 2 vCPU / 4 GB RAM
description: > description: >
...@@ -59,6 +59,8 @@ singleuser: ...@@ -59,6 +59,8 @@ singleuser:
kubespawner_override: kubespawner_override:
args: args:
- "--CondaKernelSpecManager.env_filter='/opt/conda$'" - "--CondaKernelSpecManager.env_filter='/opt/conda$'"
environment:
JUPYTERHUB_ALLOW_TOKEN_IN_URL: "1"
extra_annotations: extra_annotations:
"egi.eu/flavor": "small-environment-2-vcpu-4-gb-ram" "egi.eu/flavor": "small-environment-2-vcpu-4-gb-ram"
vo_claims: vo_claims:
...@@ -69,6 +71,8 @@ singleuser: ...@@ -69,6 +71,8 @@ singleuser:
kubespawner_override: kubespawner_override:
args: args:
- "--CondaKernelSpecManager.env_filter='/opt/conda$'" - "--CondaKernelSpecManager.env_filter='/opt/conda$'"
environment:
JUPYTERHUB_ALLOW_TOKEN_IN_URL: "1"
extra_annotations: extra_annotations:
"egi.eu/flavor": "medium-environment-4-vcpu-8-gb-ram" "egi.eu/flavor": "medium-environment-4-vcpu-8-gb-ram"
cpu_guarantee: 0.4 cpu_guarantee: 0.4
...@@ -83,6 +87,8 @@ singleuser: ...@@ -83,6 +87,8 @@ singleuser:
kubespawner_override: kubespawner_override:
args: args:
- "--CondaKernelSpecManager.env_filter='/opt/conda$'" - "--CondaKernelSpecManager.env_filter='/opt/conda$'"
environment:
JUPYTERHUB_ALLOW_TOKEN_IN_URL: "1"
cpu_guarantee: 0.8 cpu_guarantee: 0.8
cpu_limit: 8 cpu_limit: 8
mem_guarantee: 2G mem_guarantee: 2G
...@@ -130,12 +136,9 @@ singleuser: ...@@ -130,12 +136,9 @@ singleuser:
# #
/usr/local/bin/jupyterhub-wait-remote-home /usr/local/bin/jupyterhub-wait-remote-home
# Disables RTC extension. To enable it set this env variable in kubespawner_override # Disables RTC and RTC ui extensions by default.
# to JUPYTERHUB_ALLOW_TOKEN_IN_URL="1"
if [ -z "$JUPYTERHUB_ALLOW_TOKEN_IN_URL" ]; then
jupyter-labextension disable @jupyter/collaboration-extension jupyter-labextension disable @jupyter/collaboration-extension
jupyter-labextension lock @jupyter/collaboration-extension jupyter-labextension disable @jupyter/docprovider-extension
fi
cd . cd .
exec jupyterhub-singleuser \ exec jupyterhub-singleuser \
...@@ -161,8 +164,12 @@ hub: ...@@ -161,8 +164,12 @@ hub:
# keep k8s-hub version in sync with ../playbooks/notebooks.yaml # keep k8s-hub version in sync with ../playbooks/notebooks.yaml
image: image:
name: eginotebooks/hub name: eginotebooks/hub
# k8s-hub 3.3.8 # k8s-hub 4.0.0
tag: "sha-f5af1a3" tag: "sha-b20ead2"
loadRoles:
#user scopes required for user initiated sharing API
user:
scopes: ["self", "shares!user"]
config: config:
Authenticator: Authenticator:
enable_auth_state: true enable_auth_state: true
...@@ -320,6 +327,13 @@ hub: ...@@ -320,6 +327,13 @@ hub:
c.JupyterHub.spawner_class = WebDavOIDCSpawner c.JupyterHub.spawner_class = WebDavOIDCSpawner
c.WebDavOIDCSpawner.token_mount_path = "/var/run/secrets/oidc/" c.WebDavOIDCSpawner.token_mount_path = "/var/run/secrets/oidc/"
c.WebDavOIDCSpawner.http_timeout = 90 c.WebDavOIDCSpawner.http_timeout = 90
#Scopes for user sharing api extension to be able to
#use browser token for API queries
c.WebDavOIDCSpawner.oauth_client_allowed_scopes = [
"access:servers!server",
"shares!server"
]
{% endraw %} {% endraw %}
templatePaths: templatePaths:
- /egi-notebooks-hub/ec-templates - /egi-notebooks-hub/ec-templates
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment