From c05b9697f10d853866972825f154b5f8020f617c Mon Sep 17 00:00:00 2001 From: Nicholas Irving Date: Tue, 16 Oct 2018 22:12:52 +1100 Subject: [PATCH 1/2] this attempts to resolve https://github.com/kubernetes/minikube/issues/2768 for Windows, by converting \ in directory string to / and using `path.Join` instead of `filepath.Join` which uses Unix format instead of using he current OS directory delimeter. --- pkg/minikube/assets/addons.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index e4c7357bfb2b..af7e479b775e 100644 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -20,6 +20,7 @@ import ( "fmt" "os" "path/filepath" + "path" "strconv" "github.com/pkg/errors" @@ -305,7 +306,8 @@ func addMinikubeDirToAssets(basedir, vmpath string, assets *[]CopyableFile) erro return errors.Wrap(err, "generating relative path") } rPath = filepath.Dir(rPath) - vmpath = filepath.Join("/", rPath) + rPath = filepath.ToSlash(rPath) + vmpath = path.Join("/", rPath) } permString := fmt.Sprintf("%o", info.Mode().Perm()) // The conversion will strip the leading 0 if present, so add it back From aca02f4fa534702bc053bfefd49d6f4bf64cf71d Mon Sep 17 00:00:00 2001 From: Nicholas Irving Date: Tue, 16 Oct 2018 22:26:52 +1100 Subject: [PATCH 2/2] Resolved ordering issue --- pkg/minikube/assets/addons.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index af7e479b775e..8cfc7efd1618 100644 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -19,8 +19,8 @@ package assets import ( "fmt" "os" - "path/filepath" "path" + "path/filepath" "strconv" "github.com/pkg/errors"