From d5953991d9915ebb0f548b43b7163c19d70d2bf8 Mon Sep 17 00:00:00 2001 From: Janet Kuo Date: Wed, 2 Mar 2016 10:36:43 -0800 Subject: [PATCH] Fix kubectl edit: no such file --- hack/test-cmd.sh | 2 +- pkg/kubectl/cmd/edit.go | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hack/test-cmd.sh b/hack/test-cmd.sh index 83a2dd5651..15cc1a0046 100755 --- a/hack/test-cmd.sh +++ b/hack/test-cmd.sh @@ -574,7 +574,7 @@ __EOF__ ## kubectl edit can update the image field of a POD. tmp-editor.sh is a fake editor echo -e '#!/bin/bash\nsed -i "s/nginx/gcr.io\/google_containers\/serve_hostname/g" $1' > /tmp/tmp-editor.sh chmod +x /tmp/tmp-editor.sh - EDITOR=/tmp/tmp-editor.sh kubectl edit "${kube_flags[@]}" pods/valid-pod + EDITOR=/tmp/tmp-editor.sh ${KUBE_OUTPUT_HOSTBIN}/kubectl edit "${kube_flags[@]}" pods/valid-pod # Post-condition: valid-pod POD has image gcr.io/google_containers/serve_hostname kube::test::get_object_assert pods "{{range.items}}{{$image_field}}:{{end}}" 'gcr.io/google_containers/serve_hostname:' # cleaning diff --git a/pkg/kubectl/cmd/edit.go b/pkg/kubectl/cmd/edit.go index d89b9a7c1e..42b2e9c7cd 100644 --- a/pkg/kubectl/cmd/edit.go +++ b/pkg/kubectl/cmd/edit.go @@ -22,6 +22,7 @@ import ( "fmt" "io" "os" + "path" gruntime "runtime" "strings" @@ -199,7 +200,7 @@ outter: // launch the editor editedDiff := edited - edited, file, err = edit.LaunchTempFile(fmt.Sprintf("%s-edit-", os.Args[0]), ext, buf) + edited, file, err = edit.LaunchTempFile(fmt.Sprintf("%s-edit-", path.Base(os.Args[0])), ext, buf) if err != nil { return preservedFile(err, results.file, out) }