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

Merge branch 'owncloud_remote_dir' into 'master' 

Adding ownCloud backend remote mount path + fixing resource-extension commentary

See merge request !12
parents 1a0071d6 b72ae3e2
No related branches found
No related tags found
1 merge request!12Adding ownCloud backend remote mount path + fixing resource-extension commentary
Show whitespace changes
Inline Side-by-side
cesnet-central/deployments/fullhub.yaml
+ 13
− 5
View file @ 4133fd0e
......@@ -136,9 +136,9 @@ singleuser:
#
#LabApp.custom_css=True allows to use custom CSS for EOSC style
#
#ResourceUseDisplay.mem_warning_threshold=0.75 sets memory warning at 75%
#threshold for resource-usage extension which is also used by EGI
#notebooks-resource-warning extension
#ResourceUseDisplay.mem_warning_threshold=0.25 sets for resource-usage
#extension to warn about used memory when only 25% of memory is available
#which is also used by EGI notebooks-resource-warning extension
stringData: |-
#! /bin/sh
#
......@@ -250,9 +250,15 @@ hub:
return
if type == "home":
#Jupyter side
subpath = ""
#ownCloud backend side
remote_path = "/notebooks_service"
else:
#Jupyter side
subpath = "/" + type.capitalize()
#ownCloud backend side
remote_path = "/"
env = [
{"name": "WEBDAV_URL", "value": owncloud_url},
{"name": "WEBDAV_VENDOR", "value": "owncloud"},
......@@ -262,6 +268,8 @@ hub:
{"name": "MOUNT_PATH", "value": "/owncloud" + subpath},
# default mode is "full"
{"name": "VFS_CACHE_MODE", "value": "full"},
# remote path to mount on ownCloud backend
{"name": "REMOTE_PATH", "value": remote_path}
]
if type != "home":
env.append({"name": "MOUNT_WAIT_POINT", "value": "webdav-fs: /owncloud fuse.rclone"})
......@@ -272,7 +280,7 @@ hub:
spawner.extra_containers.append(
{
"name": "owncloud-" + type,
"image": "eginotebooks/webdav-rclone-sidecar:sha-0a62679",
"image": "eginotebooks/webdav-rclone-sidecar:sha-0f42313",
"args": ["bearer_token_command=cat " + self.token_path],
"env": env,
"resources": self.sidecar_resources,
......
common/deployments/hub-production.yaml
+ 13
− 5
View file @ 4133fd0e
......@@ -118,9 +118,9 @@ singleuser:
#
#LabApp.custom_css=True allows to use custom CSS for EOSC style
#
#ResourceUseDisplay.mem_warning_threshold=0.75 sets memory warning at 75%
#threshold for resource-usage extension which is also used by EGI
#notebooks-resource-warning extension
#ResourceUseDisplay.mem_warning_threshold=0.25 sets for resource-usage
#extension to warn about used memory when only 25% of memory is available
#which is also used by EGI notebooks-resource-warning extension
stringData: |-
#! /bin/sh
#
......@@ -233,9 +233,15 @@ hub:
return
if type == "home":
#Jupyter side
subpath = ""
#ownCloud backend side
remote_path = "/notebooks_service"
else:
#Jupyter side
subpath = "/" + type.capitalize()
#ownCloud backend side
remote_path = "/"
env = [
{"name": "WEBDAV_URL", "value": owncloud_url},
{"name": "WEBDAV_VENDOR", "value": "owncloud"},
......@@ -245,6 +251,8 @@ hub:
{"name": "MOUNT_PATH", "value": "/owncloud" + subpath},
# default mode is "full"
{"name": "VFS_CACHE_MODE", "value": "full"},
# remote path to mount on ownCloud backend
{"name": "REMOTE_PATH", "value": remote_path}
]
if type != "home":
env.append({"name": "MOUNT_WAIT_POINT", "value": "webdav-fs: /owncloud fuse.rclone"})
......@@ -255,7 +263,7 @@ hub:
spawner.extra_containers.append(
{
"name": "owncloud-" + type,
"image": "eginotebooks/webdav-rclone-sidecar:sha-0a62679",
"image": "eginotebooks/webdav-rclone-sidecar:sha-0f42313",
"args": ["bearer_token_command=cat " + self.token_path],
"env": env,
"resources": self.sidecar_resources,
......
common/deployments/hub-staging.yaml
+ 13
− 5
View file @ 4133fd0e
......@@ -118,9 +118,9 @@ singleuser:
#
#LabApp.custom_css=True allows to use custom CSS for EOSC style
#
#ResourceUseDisplay.mem_warning_threshold=0.75 sets memory warning at 75%
#threshold for resource-usage extension which is also used by EGI
#notebooks-resource-warning extension
#ResourceUseDisplay.mem_warning_threshold=0.25 sets for resource-usage
#extension to warn about used memory when only 25% of memory is available
#which is also used by EGI notebooks-resource-warning extension
stringData: |-
#! /bin/sh
#
......@@ -231,9 +231,15 @@ hub:
return
if type == "home":
#Jupyter side
subpath = ""
#ownCloud backend side
remote_path = "/notebooks_service"
else:
#Jupyter side
subpath = "/" + type.capitalize()
#ownCloud backend side
remote_path = "/"
env = [
{"name": "WEBDAV_URL", "value": owncloud_url},
{"name": "WEBDAV_VENDOR", "value": "owncloud"},
......@@ -243,6 +249,8 @@ hub:
{"name": "MOUNT_PATH", "value": "/owncloud" + subpath},
# default mode is "full"
{"name": "VFS_CACHE_MODE", "value": "full"},
# remote path to mount on ownCloud backend
{"name": "REMOTE_PATH", "value": remote_path}
]
if type != "home":
env.append({"name": "MOUNT_WAIT_POINT", "value": "webdav-fs: /owncloud fuse.rclone"})
......@@ -253,7 +261,7 @@ hub:
spawner.extra_containers.append(
{
"name": "owncloud-" + type,
"image": "eginotebooks/webdav-rclone-sidecar:sha-0a62679",
"image": "eginotebooks/webdav-rclone-sidecar:sha-0f42313",
"args": ["bearer_token_command=cat " + self.token_path],
"env": env,
"resources": self.sidecar_resources,
......
testing/deployments/hub.yaml
+ 10
− 2
View file @ 4133fd0e
......@@ -233,9 +233,15 @@ hub:
return
if type == "home":
#Jupyter side
subpath = ""
#ownCloud backend side
remote_path = "/notebooks_service"
else:
#Jupyter side
subpath = "/" + type.capitalize()
#ownCloud backend side
remote_path = "/"
env = [
{"name": "WEBDAV_URL", "value": owncloud_url},
{"name": "WEBDAV_VENDOR", "value": "owncloud"},
......@@ -245,6 +251,8 @@ hub:
{"name": "MOUNT_PATH", "value": "/owncloud" + subpath},
# default mode is "full"
{"name": "VFS_CACHE_MODE", "value": "full"},
# remote path to mount on ownCloud backend
{"name": "REMOTE_PATH", "value": remote_path}
]
if type != "home":
env.append({"name": "MOUNT_WAIT_POINT", "value": "webdav-fs: /owncloud fuse.rclone"})
......@@ -255,7 +263,7 @@ hub:
spawner.extra_containers.append(
{
"name": "owncloud-" + type,
"image": "eginotebooks/webdav-rclone-sidecar:sha-0a62679",
"image": "eginotebooks/webdav-rclone-sidecar:sha-0f42313",
"args": ["bearer_token_command=cat " + self.token_path],
"env": env,
"resources": self.sidecar_resources,
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment