fix kubectl cp command error.

it happens when copy directory to pod and the directory path ends with '/'. for example: kubectl cp /XX/XX/ XX-POD:/XX/XX modified: pkg/kubectl/cmd/cp.go modified: pkg/kubectl/cmd/cp_test.go

fix kubectl cp command error.
c00f9bc1 · WanLinghao · 4457e43e · c00f9bc1 · c00f9bc1
Commit c00f9bc1 authored Aug 30, 2017 by WanLinghao
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

cp.go pkg/kubectl/cmd/cp.go +2 -0

cp_test.go pkg/kubectl/cmd/cp_test.go +1 -0

No files found.
--- a/pkg/kubectl/cmd/cp.go
+++ b/pkg/kubectl/cmd/cp.go
@@ -195,6 +195,8 @@ func makeTar(filepath string, writer io.Writer) error {
 	// TODO: use compression here?
 	tarWriter := tar.NewWriter(writer)
 	defer tarWriter.Close()
+
+	filepath = path.Clean(filepath)
 	return recursiveTar(path.Dir(filepath), path.Base(filepath), tarWriter)
 }


--- a/pkg/kubectl/cmd/cp_test.go
+++ b/pkg/kubectl/cmd/cp_test.go
@@ -104,6 +104,7 @@ func TestTarUntar(t *testing.T) {
 		t.Errorf("unexpected error: %v | %v", err, err2)
 		t.FailNow()
 	}
+	dir = dir + "/"
 	defer func() {
 		if err := os.RemoveAll(dir); err != nil {
 			t.Errorf("Unexpected error cleaning up: %v", err)