cli: update ctrsMapTreePath to allow rootless dir

Before using the default ctrsMapTrePath, check whether the runtime
is being ran rootlessly, and if so set the ctrsMapTreePath to the
rootlessRuntimeDir configured by the libpod rootless library.

Fixes: kata-containers#1358

Signed-off-by: Gabi Beyer <[email protected]>

pkg/katautils/oci.go

@@ -11,6 +11,8 @@ import (
 	"io/ioutil"
 	"os"
 	"path/filepath"
+
+	"github.com/kata-containers/runtime/pkg/rootless"
 )
 
 const ctrsMappingDirMode = os.FileMode(0750)
@@ -31,6 +33,14 @@ func FetchContainerIDMapping(containerID string) (string, error) {
 		return "", fmt.Errorf("Missing container ID")
 	}
 
+	if rootless.IsRootless() {
+		path, err := rootless.GetRootlessRuntimeDir()
+		if err != nil {
+			return "", err
+		}
+		SetCtrsMapTreePath(path)
+	}
+
 	dirPath := filepath.Join(ctrsMapTreePath, containerID)
 
 	files, err := ioutil.ReadDir(dirPath)
@@ -62,6 +72,13 @@ func AddContainerIDMapping(ctx context.Context, containerID, sandboxID string) e
 		return fmt.Errorf("Missing sandbox ID")
 	}
 
+	if rootless.IsRootless() {
+		path, err := rootless.GetRootlessRuntimeDir()
+		if err != nil {
+			return err
+		}
+		SetCtrsMapTreePath(path)
+	}
 	parentPath := filepath.Join(ctrsMapTreePath, containerID)
 
 	if err := os.RemoveAll(parentPath); err != nil {
@@ -86,6 +103,13 @@ func DelContainerIDMapping(ctx context.Context, containerID string) error {
 		return fmt.Errorf("Missing container ID")
 	}
 
+	if rootless.IsRootless() {
+		path, err := rootless.GetRootlessRuntimeDir()
+		if err != nil {
+			return err
+		}
+		SetCtrsMapTreePath(path)
+	}
 	path := filepath.Join(ctrsMapTreePath, containerID)
 
 	return os.RemoveAll(path)