Resolved merge conflicts

pkg/docker/Create.go

@@ -235,7 +235,16 @@ func (h *SidecarHandler) CreateHandler(w http.ResponseWriter, r *http.Request) {
 		podUID := string(data.Pod.UID)
 		podNamespace := string(data.Pod.Namespace)
 
-		podDirectoryPath := filepath.Join(wd, h.Config.DataRootFolder+podNamespace+"-"+podUID)
+		podDirectoryPath := filepath.Join(wd, h.Config.DataRootFolder+"/"+podNamespace+"-"+podUID)
+
+		// if the podDirectoryPath does not exist, create it
+		if _, err := os.Stat(podDirectoryPath); os.IsNotExist(err) {
+			err = os.MkdirAll(podDirectoryPath, os.ModePerm)
+			if err != nil {
+				HandleErrorAndRemoveData(h, w, "An error occurred during the creation of the pod directory", err, "", "")
+				return
+			}
+		}
 
 		// call prepareDockerRuns to get the DockerRunStruct array
 		dockerRunStructs, err := h.prepareDockerRuns(data, w)
@@ -282,7 +291,7 @@ func (h *SidecarHandler) CreateHandler(w http.ResponseWriter, r *http.Request) {
 			dindContainerArgs = append(dindContainerArgs, "-v", "/cvmfs:/cvmfs")
 		}
 
-		dindContainerArgs = append(dindContainerArgs, "--privileged", "-v", "/home:/home", "-v", "/var/lib/docker/overlay2:/var/lib/docker/overlay2", "-v", "/var/lib/docker/image:/var/lib/docker/image", "-d", "--name", string(data.Pod.UID)+"_dind", dindImage)
+		dindContainerArgs = append(dindContainerArgs, "--privileged", "-v", wd+":/"+wd, "-v", "/home:/home", "-v", "/var/lib/docker/overlay2:/var/lib/docker/overlay2", "-v", "/var/lib/docker/image:/var/lib/docker/image", "-d", "--name", string(data.Pod.UID)+"_dind", dindImage)
 
 		var dindContainerID string
 		shell := exec.ExecTask{

pkg/docker/Delete.go

@@ -10,6 +10,8 @@ import (
 	exec "github.com/alexellis/go-execute/pkg/v1"
 	"github.com/containerd/containerd/log"
 	v1 "k8s.io/api/core/v1"
+
+	"path/filepath"
 )
 
 // DeleteHandler stops and deletes Docker containers from provided data
@@ -108,7 +110,18 @@ func (h *SidecarHandler) DeleteHandler(w http.ResponseWriter, r *http.Request) {
 			log.G(h.Ctx).Info("\u2705 [DELETE CALL] Deleted container " + podUID + "_dind")
 		}
 
-		os.RemoveAll(h.Config.DataRootFolder + pod.Namespace + "-" + string(pod.UID))
+		// check if the container has GPU devices attacched using the GpuManager and release them
+		wd, err := os.Getwd()
+		if err != nil {
+			HandleErrorAndRemoveData(h, w, "Unable to get current working directory", err, "", "")
+			return
+		}
+		podDirectoryPathToDelete := filepath.Join(wd, h.Config.DataRootFolder+"/"+podNamespace+"-"+podUID)
+		log.G(h.Ctx).Info("\u2705 [DELETE CALL] Deleting directory " + podDirectoryPathToDelete)
+
+		err = os.RemoveAll(podDirectoryPathToDelete)
+
+		//os.RemoveAll(h.Config.DataRootFolder + pod.Namespace + "-" + string(pod.UID))
 	}
 
 	w.WriteHeader(statusCode)