Merge pull request #671 from microsoft/katiewasnothere/plan9hostpath

Change parsing of hostpath string for plan9 file mounting

internal/hcsoci/resources_lcow.go

@@ -10,6 +10,7 @@ import (
 	"fmt"
 	"os"
 	"path"
+	"path/filepath"
 	"strconv"
 	"strings"
 
@@ -110,7 +111,7 @@ func allocateLinuxResources(ctx context.Context, coi *createOptionsInternal, res
 					// Map the containing directory in, but restrict the share to a single
 					// file.
 					var fileName string
-					hostPath, fileName = path.Split(hostPath)
+					hostPath, fileName = filepath.Split(hostPath)
 					allowedNames = append(allowedNames, fileName)
 					restrictAccess = true
 					uvmPathForFile = path.Join(uvmPathForShare, fileName)

test/cri-containerd/createcontainer_test.go

@@ -5,6 +5,8 @@ package cri_containerd
 import (
 	"context"
 	"fmt"
+	"io/ioutil"
+	"os"
 	"testing"
 
 	runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
@@ -793,3 +795,79 @@ func Test_CreateContainer_CPUShares_LCOW(t *testing.T) {
 	}
 	runCreateContainerTest(t, lcowRuntimeHandler, request)
 }
+
+func Test_CreateContainer_File_Hostpath_LCOW(t *testing.T) {
+	pullRequiredLcowImages(t, []string{imageLcowK8sPause, imageLcowAlpine})
+
+	tempFile, err := ioutil.TempFile("", "test")
+
+	if err != nil {
+		t.Fatalf("Failed to create temp file: %s", err)
+	}
+
+	tempFile.Close()
+
+	defer func() {
+		if err := os.Remove(tempFile.Name()); err != nil {
+			t.Fatalf("Failed to remove temp file: %s", err)
+		}
+	}()
+
+	containerFilePath := "/foo/test.txt"
+
+	request := &runtime.CreateContainerRequest{
+		Config: &runtime.ContainerConfig{
+			Metadata: &runtime.ContainerMetadata{
+				Name: t.Name() + "-Container",
+			},
+			Mounts: []*runtime.Mount{
+				{
+					HostPath:      tempFile.Name(),
+					ContainerPath: containerFilePath,
+				},
+			},
+			Image: &runtime.ImageSpec{
+				Image: imageLcowAlpine,
+			},
+			Command: []string{
+				"top",
+			},
+			Linux: &runtime.LinuxContainerConfig{},
+		},
+	}
+	runCreateContainerTest(t, lcowRuntimeHandler, request)
+}
+
+func Test_CreateContainer_Dir_Hostpath_LCOW(t *testing.T) {
+	pullRequiredLcowImages(t, []string{imageLcowK8sPause, imageLcowAlpine})
+
+	tempDir, err := ioutil.TempDir("", "")
+
+	if err != nil {
+		t.Fatalf("Failed to create temp dir: %s", err)
+	}
+
+	containerFilePath := "/foo"
+
+	request := &runtime.CreateContainerRequest{
+		Config: &runtime.ContainerConfig{
+			Metadata: &runtime.ContainerMetadata{
+				Name: t.Name() + "-Container",
+			},
+			Mounts: []*runtime.Mount{
+				{
+					HostPath:      tempDir,
+					ContainerPath: containerFilePath,
+				},
+			},
+			Image: &runtime.ImageSpec{
+				Image: imageLcowAlpine,
+			},
+			Command: []string{
+				"top",
+			},
+			Linux: &runtime.LinuxContainerConfig{},
+		},
+	}
+	runCreateContainerTest(t, lcowRuntimeHandler, request)
+}