Skip to content
Snippets Groups Projects
Commit 8e9a129f authored by František Dvořák's avatar František Dvořák
Browse files

EGI devel: update image versions

parent a0ec1bc3
No related branches found
No related tags found
No related merge requests found
...@@ -72,7 +72,7 @@ singleuser: ...@@ -72,7 +72,7 @@ singleuser:
app.kubernetes.io/instance: cluster-ingress app.kubernetes.io/instance: cluster-ingress
image: image:
name: eginotebooks/single-user name: eginotebooks/single-user
tag: "sha-0e47d79" tag: "sha-14443de"
profileList: profileList:
- display_name: Default EGI environment - 6 GB RAM / 2 core - display_name: Default EGI environment - 6 GB RAM / 2 core
description: > description: >
...@@ -87,7 +87,7 @@ singleuser: ...@@ -87,7 +87,7 @@ singleuser:
kubespawner_override: kubespawner_override:
args: args:
- "--CondaKernelSpecManager.env_filter='/opt/conda$'" - "--CondaKernelSpecManager.env_filter='/opt/conda$'"
image: "eginotebooks/single-user-ai:sha-0e47d79" image: "eginotebooks/single-user-ai:sha-14443de"
- display_name: RELIANCE project environment - 12 GB RAM / 2 core - display_name: RELIANCE project environment - 12 GB RAM / 2 core
description: > description: >
Notebook environment for RELIANCE project includes Python, R, Julia and Octave kernels Notebook environment for RELIANCE project includes Python, R, Julia and Octave kernels
...@@ -141,12 +141,15 @@ hub: ...@@ -141,12 +141,15 @@ hub:
status: status:
url: "http://status-web/" url: "http://status-web/"
admin: true admin: true
jwt:
url: "http://jwt/"
display: false
# recommended to keep in sync with common/playbooks/files/jupyterhub-jwt.yaml # recommended to keep in sync with common/playbooks/files/jupyterhub-jwt.yaml
# 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 4.0.0 # k8s-hub 4.2.0
tag: "sha-aef23d2" tag: "sha-bd95b14"
config: config:
Authenticator: Authenticator:
enable_auth_state: true enable_auth_state: true
...@@ -198,13 +201,15 @@ hub: ...@@ -198,13 +201,15 @@ hub:
authorize_url: "https://{{ secrets['checkin_host'] }}/auth/realms/egi/protocol/openid-connect/auth" authorize_url: "https://{{ secrets['checkin_host'] }}/auth/realms/egi/protocol/openid-connect/auth"
token_url: "https://{{ secrets['checkin_host'] }}/auth/realms/egi/protocol/openid-connect/token" token_url: "https://{{ secrets['checkin_host'] }}/auth/realms/egi/protocol/openid-connect/token"
userdata_url: "https://{{ secrets['checkin_host'] }}/auth/realms/egi/protocol/openid-connect/userinfo" userdata_url: "https://{{ secrets['checkin_host'] }}/auth/realms/egi/protocol/openid-connect/userinfo"
introspect_url: "https://{{ secrets['checkin_host'] }}/auth/realms/egi/protocol/openid-connect/introspect"
client_id: "{{ secrets['client_id'] }}" client_id: "{{ secrets['client_id'] }}"
client_secret: "{{ secrets['client_secret'] }}" client_secret: "{{ secrets['client_secret'] }}"
oauth_callback_url: "https://{{ notebooks_hostname }}/hub/oauth_callback" oauth_callback_url: "https://{{ notebooks_hostname }}/hub/oauth_callback"
openid_configuration_url: "https://{{ secrets['checkin_host'] }}/auth/realms/egi/.well-known/openid-configuration"
scope: ["openid", "profile", "email", "offline_access", "eduperson_scoped_affiliation", "eduperson_entitlement"] scope: ["openid", "profile", "email", "offline_access", "eduperson_scoped_affiliation", "eduperson_entitlement"]
username_key: "sub" username_claim: "sub"
OnedataSpawner: OnedataSpawner:
sidecar_image: "eginotebooks/oneclient-sidecar:sha-9789b9a" sidecar_image: "eginotebooks/oneclient-sidecar:sha-dd3068b"
force_direct_io: true force_direct_io: true
http_timeout: 60 http_timeout: 60
args: args:
...@@ -267,7 +272,7 @@ hub: ...@@ -267,7 +272,7 @@ hub:
spawner.extra_containers.append( spawner.extra_containers.append(
{ {
"name": "b2drop", "name": "b2drop",
"image": "eginotebooks/webdav-sidecar:sha-e5e8df2", "image": "eginotebooks/webdav-sidecar:sha-0a62679",
"env": [ "env": [
{"name": "WEBDAV_URL", "value": "https://b2drop.eudat.eu/remote.php/webdav"}, {"name": "WEBDAV_URL", "value": "https://b2drop.eudat.eu/remote.php/webdav"},
{"name": "WEBDAV_PWD", "value": b2drop_pwd}, {"name": "WEBDAV_PWD", "value": b2drop_pwd},
...@@ -303,7 +308,7 @@ hub: ...@@ -303,7 +308,7 @@ hub:
return data return data
c.JupyterHub.spawner_class = B2DropSpawner c.JupyterHub.spawner_class = B2DropSpawner
c.B2DropSpawner.http_timeout = 60 c.B2DropSpawner.http_timeout = 90
c.B2DropSpawner.args = ["--FileCheckpoints.checkpoint_dir='/home/jovyan/.notebookCheckpoints'"] c.B2DropSpawner.args = ["--FileCheckpoints.checkpoint_dir='/home/jovyan/.notebookCheckpoints'"]
c.B2DropSpawner.profile_form_template = """ c.B2DropSpawner.profile_form_template = """
<style> <style>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment