feat(k8s): adding lifecycle for datastore sidecar

Author: etlstrauss

reana_workflow_controller/k8s.py

@@ -88,7 +88,7 @@ def __init__(
             name=self.deployment_name, image=self.image, env=[], volume_mounts=[], ports=[client.V1ContainerPort(container_port=self.port)]
         )
         self._s3_container = client.V1Container(
-            name="datastore", image=REANA_DATASTORE_IMAGE, env=[], volume_mounts=[], ports=[], image_pull_policy="Always"
+            name="datastore", image=REANA_DATASTORE_IMAGE, env=[], volume_mounts=[], ports=[], image_pull_policy="Always", lifecycle=[]
         )
         self._pod_spec = client.V1PodSpec(
             containers=[self._session_container, self._s3_container],
@@ -268,6 +268,17 @@ def setup_s3_sidecar(self):
         )
         self._s3_container.security_context = security_context
 
+        # adding umount for correct termination
+        lifecycle_dict = {
+            "preStop": {
+                "exec": {
+                    "command": ["/bin/sh", "-c", "xargs umount -l < /etc/active_mounts.txt || true"]
+                }
+            }
+        }
+
+        self._s3_container.lifecycle = lifecycle_dict
+
     def add_cvmfs_repo_mounts(self, cvmfs_repos):
         """Add mounts for the provided CVMFS repositories to the deployment.
 

sidecars/datastore/app.py

@@ -51,6 +51,8 @@ def createS3Mounts(aliases, base_dir):
                 )
             else:
                 print(f"Successfully mounted '{aliases[i][0]}'")
+                with open("/etc/active_mounts.txt", "a") as f:
+                    f.write(f"{target_path}\n")
             os.system("rm .passwd-s3fs")
         except Exception as e:
             print(f"A error accrued during the mounting of alias {aliases[i][0]}: {e}")

sidecars/datastore/entrypoint.sh

@@ -5,4 +5,4 @@ echo "Starting Python S3 Data Manager..."
 python3 /app/app.py
 echo "Initialization complete."
 
-tail -f /dev/null
+exec tail -f /dev/null