From 7e590618b981bd90cce4ff9b9edab09cc997b4a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= <valtri@civ.zcu.cz>
Date: Fri, 10 May 2024 07:22:31 +0000
Subject: [PATCH] Devel fullhub: experiments with ownCloud as home directory

---
 cesnet-central/deployments/fullhub.yaml | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/cesnet-central/deployments/fullhub.yaml b/cesnet-central/deployments/fullhub.yaml
index 3e0553b..e1ad86c 100644
--- a/cesnet-central/deployments/fullhub.yaml
+++ b/cesnet-central/deployments/fullhub.yaml
@@ -21,11 +21,7 @@ singleuser:
   # - documentation/content/en/users/dev-env/notebooks/data/_index.md
   # - profileList
   storage:
-    capacity: 20Gi
-    dynamic:
-      pvcNameTemplate: claim-{userid}{servername}
-      volumeNameTemplate: vol-{userid}{servername}
-      storageAccessModes: ["ReadWriteMany"]
+    type: none
     extraVolumes:
       - name: cvmfs-host
         hostPath:
@@ -52,14 +48,11 @@ singleuser:
       - name: cvmfs-host
         mountPath: "/cvmfs:shared"
       - name: b2drop
-        mountPath: '/mnt/b2drop:shared'
+        mountPath: '/home/jovyan/b2drop:shared'
       - name: owncloud
-        mountPath: '/mnt/owncloud:shared'
+        mountPath: '/home/jovyan:shared'
       - name: scratch
         mountPath: '/scratch'
-  lifecycleHooks:
-    postStart:
-      exec: { "command": ["/bin/sh", "-c", "ln -snf /mnt/b2drop $HOME/b2drop; ln -snf /mnt/owncloud $HOME/owncloud; for d in cvmfs scratch; do if ! test -e $HOME/$d; then ln -snf /$d $HOME/$d; fi; done; mkdir -p /home/jovyan/.notebookCheckpoints"] }
   memory:
     limit: 6G
     guarantee: 128M
@@ -228,11 +221,13 @@ hub:
               spawner.extra_containers.append(
                 {
                     "name": "owncloud",
-                    "image": "valtri/webdav-rclone-sidecar:sha-1e36c50",
+                    "image": "valtri/webdav-rclone-sidecar:95629ff",
                     "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"},
+                        # XXX: strict permissions needed for .local/share/jupyter/runtime/jupyter_cookie_secret
+                        {"name": "MOUNT_OPTS", "value": "--file-perms=0600 --dir-perms=0770"},
                         {"name": "MOUNT_PATH", "value": "/owncloud"},
                     ],
                     "resources": self.sidecar_resources,
-- 
GitLab