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

Upgrading eosc images with user sharing extension on staging

parent 6f8d2b39
No related branches found
No related tags found
1 merge request!31Upgrading eosc images with user sharing extension + enabling user-initiated sharing on staging
...@@ -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-7052495" 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,8 +59,6 @@ singleuser: ...@@ -59,8 +59,6 @@ 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:
...@@ -71,8 +69,6 @@ singleuser: ...@@ -71,8 +69,6 @@ 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
...@@ -87,8 +83,6 @@ singleuser: ...@@ -87,8 +83,6 @@ 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
...@@ -166,6 +160,10 @@ hub: ...@@ -166,6 +160,10 @@ hub:
name: eginotebooks/hub name: eginotebooks/hub
# k8s-hub 4.0.0 # k8s-hub 4.0.0
tag: "sha-b20ead2" 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
...@@ -321,6 +319,13 @@ hub: ...@@ -321,6 +319,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.
Finish editing this message first!
Please register or to comment