take out scartch eos space and set correctly the RUCIO_PATH_BEGINS_AT…

… env var
vre-hub · Dec 1, 2023 · ea690be · ea690be
1 parent 0f20ef3
commit ea690be
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 10 deletions.
diff --git a/infrastructure/cluster/flux-v2/jhub/jhub-release.yaml b/infrastructure/cluster/flux-v2/jhub/jhub-release.yaml
@@ -173,10 +173,7 @@ spec:
               claimName: cvmfs
           - name: eulake-cern-eos-rse # mounts the EOS RSE needed for the Rucio JupiterLab extension
             hostPath:
-              path: /var/eos/eulake/escape/data
-          - name: eulake-scratch-data # mounts the EOS scratch space which is not an RSE
-            hostPath:
-              path: /var/eos/eulake/escape/tmp_data
+              path: /var/eos/eulake # This is pointing to /eos/eulake/escape/data, defined on the eosxd/configmap  
         extraVolumeMounts:
           - name: cvmfs-cern-instance 
             mountPath: /cvmfs
@@ -186,9 +183,6 @@ spec:
             mountPath: /eos/cern-eos-rse
             mountPropagation: HostToContainer
             readOnly: true 
-          - name: eulake-scratch-data 
-            mountPath: /eos/scratch-space
-            mountPropagation: HostToContainer
       image:
         name: ghcr.io/vre-hub/vre-singleuser
         tag: sha-423e01a
@@ -214,7 +208,7 @@ spec:
         RUCIO_DEFAULT_INSTANCE: "vre-rucio.cern.ch"
         RUCIO_DESTINATION_RSE: "CERN-EOS"
         RUCIO_RSE_MOUNT_PATH: "/eos/cern-eos-rse"
-        RUCIO_PATH_BEGINS_AT: "4"
+        RUCIO_PATH_BEGINS_AT: "2"
         RUCIO_CA_CERT: "/certs/rucio_ca.pem"
         OAUTH2_TOKEN: "FILE:/tmp/eos_oauth.token"
     ingress:

diff --git a/infrastructure/cluster/manual/eos/README.md b/infrastructure/cluster/manual/eos/README.md
@@ -11,8 +11,21 @@ The `eulake` instance is not configured by default on the CERN OpenStack cluster
 Then, add the `eulake` keytab secret as described below. The keytab srcret string can be find on the cern-ver `tbag`.
 
 ```bash
-> kubectl -n kube-system patch configmap eosxd-config -p '{"data": {"fuse.eulake.conf": "{\"name\": \"eulake\", \"hostport\": \"eoseulake.cern.ch\", \"remotemountdir\": \"/eos/eulake/escape/data\", \"localmountdir\": \"/eos/eulake\"}"}}'
+> kubectl -n kube-system patch configmap eosxd-config -p '{"data": {"fuse.eulake.conf": "{\"name\": \"eulake\", \"hostport\": \"eoseulake.cern.ch\", \"remotemountdir\": \"/eos/eulake/escape/data\", \"localmountdir\": \"/eos/eulake\", \"auth\": {\"ssskeytab\": \"/etc/eos.keytab\"}}"}}'
 > kubectl -n kube-system patch secret eosxd-keytab -p '{"stringData": {"fuse.sss.keytab": "<KEYSTAB_SECRET_STRING>"}}'
 ```
 
-Now you can add this volumes on the jupyter hub deployment to access the instance from any pod or jupyter session.
+Now you can add this volumes on the jupyter hub deployment to access the instance from any pod or jupyter session. On the jupyter hub helm release
+
+```yaml
+        extraVolumes:
+          - name: eulake-cern-eos-rse 
+            hostPath:
+              # This is pointing to /eos/eulake/escape/data, as defined on the eosxd/configmap  
+              path: /var/eos/eulake 
+        extraVolumeMounts:
+          - name: eulake-cern-eos-rse # mounts the EOS RSE needed for the Rucio JupiterLab extension
+            mountPath: /eos/cern-eos-rse
+            mountPropagation: HostToContainer
+            readOnly: true 
+```