From 9294c5ca4274215ff8ec3f2dfaafd1be8fef89b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= <valtri@civ.zcu.cz>
Date: Tue, 18 Jun 2024 15:07:55 +0000
Subject: [PATCH] Do not unmount ownloud explicitly - fixes notebooks pods
termination
---
cesnet-central/deployments/fullhub.yaml | 7 +------
testing/deployments/hub.yaml | 7 +------
2 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/cesnet-central/deployments/fullhub.yaml b/cesnet-central/deployments/fullhub.yaml
index 52b386d..403d472 100644
--- a/cesnet-central/deployments/fullhub.yaml
+++ b/cesnet-central/deployments/fullhub.yaml
@@ -246,7 +246,7 @@ hub:
"args": ["bearer_token_command=cat " + token_path],
"env": [
{"name": "WEBDAV_URL", "value": "https://ocis.aaitest.owncloud.works/remote.php/webdav/"},
- {"name": "WEBDAV_VENDOR", "value": "other"},
+ {"name": "WEBDAV_VENDOR", "value": "owncloud"},
# XXX: strict permissions needed for .local/share/jupyter/runtime/jupyter_cookie_secret
# quicker directory cache and polling
{"name": "MOUNT_OPTS", "value": "--file-perms=0600 --dir-perms=0770 --dir-cache-time=1m0s --poll-interval=0m20s"},
@@ -263,11 +263,6 @@ hub:
"capabilities": {"add": ["SYS_ADMIN"]},
},
"volumeMounts": volume_mounts,
- "lifecycle": {
- "preStop": {
- "exec": {"command": ["fusermount", "-u", "-z", "/owncloud"]}
- },
- },
}
)
diff --git a/testing/deployments/hub.yaml b/testing/deployments/hub.yaml
index 9340778..e342db0 100644
--- a/testing/deployments/hub.yaml
+++ b/testing/deployments/hub.yaml
@@ -270,7 +270,7 @@ hub:
"args": ["bearer_token_command=cat " + token_path],
"env": [
{"name": "WEBDAV_URL", "value": "https://ocis.aaitest.owncloud.works/remote.php/webdav/"},
- {"name": "WEBDAV_VENDOR", "value": "other"},
+ {"name": "WEBDAV_VENDOR", "value": "owncloud"},
# XXX: strict permissions needed for .local/share/jupyter/runtime/jupyter_cookie_secret
# quicker directory cache and polling
{"name": "MOUNT_OPTS", "value": "--file-perms=0600 --dir-perms=0770 --dir-cache-time=1m0s --poll-interval=0m20s"},
@@ -287,11 +287,6 @@ hub:
"capabilities": {"add": ["SYS_ADMIN"]},
},
"volumeMounts": volume_mounts,
- "lifecycle": {
- "preStop": {
- "exec": {"command": ["fusermount", "-u", "-z", "/owncloud"]}
- },
- },
}
)
--
GitLab