diff --git a/cesnet-central/deployments/fullhub.yaml b/cesnet-central/deployments/fullhub.yaml index f731bca12cda0f3c6116cf2a57639e7d59da5103..ffe9eeeac8cd153c5454e03ef3d98585003f5df7 100644 --- a/cesnet-central/deployments/fullhub.yaml +++ b/cesnet-central/deployments/fullhub.yaml @@ -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: - subpath = "/" + type.capitalize() + #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, diff --git a/common/deployments/hub-production.yaml b/common/deployments/hub-production.yaml index fd78cadbd042a614ce129b9233b452f99c176ae9..cda893fb5e08365ab8b8712d89bd3fbb01baba5d 100644 --- a/common/deployments/hub-production.yaml +++ b/common/deployments/hub-production.yaml @@ -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: - subpath = "/" + type.capitalize() + #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, diff --git a/common/deployments/hub-staging.yaml b/common/deployments/hub-staging.yaml index 502fa30b86cb656ccc85ef3400bbbc8c731aa2fa..ad8c2c135d3e75bf24e68e020f5bb29a3a50bfa7 100644 --- a/common/deployments/hub-staging.yaml +++ b/common/deployments/hub-staging.yaml @@ -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: - subpath = "/" + type.capitalize() + #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, diff --git a/testing/deployments/hub.yaml b/testing/deployments/hub.yaml index 1276c86136259d4dafcfc90a7f82409282b2d829..2a10106fdb57636c3b27a95586fde7c1080dc956 100644 --- a/testing/deployments/hub.yaml +++ b/testing/deployments/hub.yaml @@ -233,9 +233,15 @@ hub: return if type == "home": + #Jupyter side subpath = "" + #ownCloud backend side + remote_path = "/notebooks_service" else: - subpath = "/" + type.capitalize() + #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,