mirror of https://github.com/k3s-io/k3s
Merge pull request #51595 from WanLinghao/kubectl_cp_error
Automatic merge from submit-queue (batch tested with PRs 51438, 52182, 51607, 47912, 51595). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.. fix kubectl cp command error fix kubectl cp command error. modified: pkg/kubectl/cmd/cp.go **What this PR does / why we need it**: fix kubectl cp error. it happens when copy directory to pod and the directory path ends with '/'. for example: kubectl cp /tmp/test/ test-pod:/tmp/test/ it will fail with error: stat /tmp/test/test: no such file or directory **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes **Special notes for your reviewer**: **Release note**: ```release-note ```pull/6/head
commit
d042a1d7d1
|
@ -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)
|
||||
}
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue