Skip to content

K
k3s
Commit c00f9bc1 authored by WanLinghao's avatar WanLinghao
Browse files
Options

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
parent 4457e43e
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
pkg/kubectl/cmd/cp.go
View file @ c00f9bc1
...@@ -195,6 +195,8 @@ func makeTar(filepath string, writer io.Writer) error { ...@@ -195,6 +195,8 @@ func makeTar(filepath string, writer io.Writer) error {
// TODO: use compression here? // TODO: use compression here?
tarWriter := tar.NewWriter(writer) tarWriter := tar.NewWriter(writer)
defer tarWriter.Close() defer tarWriter.Close()
filepath = path.Clean(filepath)
return recursiveTar(path.Dir(filepath), path.Base(filepath), tarWriter) return recursiveTar(path.Dir(filepath), path.Base(filepath), tarWriter)
} }
......
pkg/kubectl/cmd/cp_test.go
View file @ c00f9bc1
...@@ -104,6 +104,7 @@ func TestTarUntar(t *testing.T) { ...@@ -104,6 +104,7 @@ func TestTarUntar(t *testing.T) {
t.Errorf("unexpected error: %v | %v", err, err2) t.Errorf("unexpected error: %v | %v", err, err2)
t.FailNow() t.FailNow()
} }
dir = dir + "/"
defer func() { defer func() {
if err := os.RemoveAll(dir); err != nil { if err := os.RemoveAll(dir); err != nil {
t.Errorf("Unexpected error cleaning up: %v", err) t.Errorf("Unexpected error cleaning up: %v", err)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment