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

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

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