diff --git a/pkg/kubectl/cmd/annotate.go b/pkg/kubectl/cmd/annotate/annotate.go similarity index 99% rename from pkg/kubectl/cmd/annotate.go rename to pkg/kubectl/cmd/annotate/annotate.go index 0cf8e532829..4bfb907bf3d 100644 --- a/pkg/kubectl/cmd/annotate.go +++ b/pkg/kubectl/cmd/annotate/annotate.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cmd +package annotate import ( "bytes" diff --git a/pkg/kubectl/cmd/annotate_test.go b/pkg/kubectl/cmd/annotate/annotate_test.go similarity index 99% rename from pkg/kubectl/cmd/annotate_test.go rename to pkg/kubectl/cmd/annotate/annotate_test.go index 7469cc553b8..0361aa7b47f 100644 --- a/pkg/kubectl/cmd/annotate_test.go +++ b/pkg/kubectl/cmd/annotate/annotate_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cmd +package annotate import ( "net/http" diff --git a/pkg/kubectl/cmd/apiresources.go b/pkg/kubectl/cmd/apiresources/apiresources.go similarity index 99% rename from pkg/kubectl/cmd/apiresources.go rename to pkg/kubectl/cmd/apiresources/apiresources.go index 7d5124a784d..3f33cc5e2f4 100644 --- a/pkg/kubectl/cmd/apiresources.go +++ b/pkg/kubectl/cmd/apiresources/apiresources.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cmd +package apiresources import ( "fmt" diff --git a/pkg/kubectl/cmd/apiversions.go b/pkg/kubectl/cmd/apiresources/apiversions.go similarity index 99% rename from pkg/kubectl/cmd/apiversions.go rename to pkg/kubectl/cmd/apiresources/apiversions.go index fafd7e2932e..2eac871fb08 100644 --- a/pkg/kubectl/cmd/apiversions.go +++ b/pkg/kubectl/cmd/apiresources/apiversions.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cmd +package apiresources import ( "fmt" diff --git a/pkg/kubectl/cmd/apply.go b/pkg/kubectl/cmd/apply/apply.go similarity index 99% rename from pkg/kubectl/cmd/apply.go rename to pkg/kubectl/cmd/apply/apply.go index 834e4d99ec0..409e232f5e5 100644 --- a/pkg/kubectl/cmd/apply.go +++ b/pkg/kubectl/cmd/apply/apply.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cmd +package apply import ( "fmt" diff --git a/pkg/kubectl/cmd/apply_edit_last_applied.go b/pkg/kubectl/cmd/apply/apply_edit_last_applied.go similarity index 99% rename from pkg/kubectl/cmd/apply_edit_last_applied.go rename to pkg/kubectl/cmd/apply/apply_edit_last_applied.go index 5a3fa438cf4..fab66cdd164 100644 --- a/pkg/kubectl/cmd/apply_edit_last_applied.go +++ b/pkg/kubectl/cmd/apply/apply_edit_last_applied.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cmd +package apply import ( "github.com/spf13/cobra" diff --git a/pkg/kubectl/cmd/apply_set_last_applied.go b/pkg/kubectl/cmd/apply/apply_set_last_applied.go similarity index 99% rename from pkg/kubectl/cmd/apply_set_last_applied.go rename to pkg/kubectl/cmd/apply/apply_set_last_applied.go index e7ddad85585..ba41f1ed792 100644 --- a/pkg/kubectl/cmd/apply_set_last_applied.go +++ b/pkg/kubectl/cmd/apply/apply_set_last_applied.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cmd +package apply import ( "bytes" diff --git a/pkg/kubectl/cmd/apply_test.go b/pkg/kubectl/cmd/apply/apply_test.go similarity index 99% rename from pkg/kubectl/cmd/apply_test.go rename to pkg/kubectl/cmd/apply/apply_test.go index 1bdf0109d69..e7ee15f09b0 100644 --- a/pkg/kubectl/cmd/apply_test.go +++ b/pkg/kubectl/cmd/apply/apply_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cmd +package apply import ( "bytes" diff --git a/pkg/kubectl/cmd/apply_view_last_applied.go b/pkg/kubectl/cmd/apply/apply_view_last_applied.go similarity index 99% rename from pkg/kubectl/cmd/apply_view_last_applied.go rename to pkg/kubectl/cmd/apply/apply_view_last_applied.go index 33900ccb858..96a0a8883c5 100644 --- a/pkg/kubectl/cmd/apply_view_last_applied.go +++ b/pkg/kubectl/cmd/apply/apply_view_last_applied.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cmd +package apply import ( "bytes" diff --git a/pkg/kubectl/cmd/attach.go b/pkg/kubectl/cmd/attach/attach.go similarity index 99% rename from pkg/kubectl/cmd/attach.go rename to pkg/kubectl/cmd/attach/attach.go index 8b11539f0be..9f4ac1d1c9e 100644 --- a/pkg/kubectl/cmd/attach.go +++ b/pkg/kubectl/cmd/attach/attach.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cmd +package attach import ( "fmt" diff --git a/pkg/kubectl/cmd/attach_test.go b/pkg/kubectl/cmd/attach/attach_test.go similarity index 99% rename from pkg/kubectl/cmd/attach_test.go rename to pkg/kubectl/cmd/attach/attach_test.go index 9b0e8dc1b50..62cccc1de8e 100644 --- a/pkg/kubectl/cmd/attach_test.go +++ b/pkg/kubectl/cmd/attach/attach_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cmd +package attach import ( "fmt" diff --git a/pkg/kubectl/cmd/autoscale.go b/pkg/kubectl/cmd/autoscale/autoscale.go similarity index 99% rename from pkg/kubectl/cmd/autoscale.go rename to pkg/kubectl/cmd/autoscale/autoscale.go index 5c9333472d3..f6dc07e71c6 100644 --- a/pkg/kubectl/cmd/autoscale.go +++ b/pkg/kubectl/cmd/autoscale/autoscale.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cmd +package autoscale import ( "fmt" diff --git a/pkg/kubectl/cmd/certificates.go b/pkg/kubectl/cmd/certificates/certificates.go similarity index 99% rename from pkg/kubectl/cmd/certificates.go rename to pkg/kubectl/cmd/certificates/certificates.go index 82a4e2aa40a..5bb10861ebf 100644 --- a/pkg/kubectl/cmd/certificates.go +++ b/pkg/kubectl/cmd/certificates/certificates.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cmd +package certificates import ( "fmt" diff --git a/pkg/kubectl/cmd/clusterinfo.go b/pkg/kubectl/cmd/clusterinfo/clusterinfo.go similarity index 99% rename from pkg/kubectl/cmd/clusterinfo.go rename to pkg/kubectl/cmd/clusterinfo/clusterinfo.go index 8d27c8a3335..a5488648fac 100644 --- a/pkg/kubectl/cmd/clusterinfo.go +++ b/pkg/kubectl/cmd/clusterinfo/clusterinfo.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cmd +package clusterinfo import ( "fmt" diff --git a/pkg/kubectl/cmd/clusterinfo_dump.go b/pkg/kubectl/cmd/clusterinfo/clusterinfo_dump.go similarity index 99% rename from pkg/kubectl/cmd/clusterinfo_dump.go rename to pkg/kubectl/cmd/clusterinfo/clusterinfo_dump.go index 741ab6ecc89..7c2b678d6f7 100644 --- a/pkg/kubectl/cmd/clusterinfo_dump.go +++ b/pkg/kubectl/cmd/clusterinfo/clusterinfo_dump.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cmd +package clusterinfo import ( "fmt" diff --git a/pkg/kubectl/cmd/clusterinfo_dump_test.go b/pkg/kubectl/cmd/clusterinfo/clusterinfo_dump_test.go similarity index 98% rename from pkg/kubectl/cmd/clusterinfo_dump_test.go rename to pkg/kubectl/cmd/clusterinfo/clusterinfo_dump_test.go index 217f7f2d34d..bbe62f0be6d 100644 --- a/pkg/kubectl/cmd/clusterinfo_dump_test.go +++ b/pkg/kubectl/cmd/clusterinfo/clusterinfo_dump_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cmd +package clusterinfo import ( "io/ioutil" diff --git a/pkg/kubectl/cmd/completion.go b/pkg/kubectl/cmd/completion/completion.go similarity index 99% rename from pkg/kubectl/cmd/completion.go rename to pkg/kubectl/cmd/completion/completion.go index 3e9c4457005..c6141f3b19e 100644 --- a/pkg/kubectl/cmd/completion.go +++ b/pkg/kubectl/cmd/completion/completion.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cmd +package completion import ( "bytes" @@ -264,7 +264,7 @@ __kubectl_quote() { # Leave out first character printf %q "${1:1}" else - printf %q "$1" + printf %q "$1" fi } diff --git a/pkg/kubectl/cmd/convert.go b/pkg/kubectl/cmd/convert/convert.go similarity index 99% rename from pkg/kubectl/cmd/convert.go rename to pkg/kubectl/cmd/convert/convert.go index 72dc6671581..cf6c266d92e 100644 --- a/pkg/kubectl/cmd/convert.go +++ b/pkg/kubectl/cmd/convert/convert.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cmd +package convert import ( "fmt" diff --git a/pkg/kubectl/cmd/convert_test.go b/pkg/kubectl/cmd/convert/convert_test.go similarity index 99% rename from pkg/kubectl/cmd/convert_test.go rename to pkg/kubectl/cmd/convert/convert_test.go index 59fc9ed0f23..189f4f4b555 100644 --- a/pkg/kubectl/cmd/convert_test.go +++ b/pkg/kubectl/cmd/convert/convert_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cmd +package convert import ( "bytes" diff --git a/pkg/kubectl/cmd/cp.go b/pkg/kubectl/cmd/cp/cp.go similarity index 99% rename from pkg/kubectl/cmd/cp.go rename to pkg/kubectl/cmd/cp/cp.go index 441c508cdee..8ef04fdf47f 100644 --- a/pkg/kubectl/cmd/cp.go +++ b/pkg/kubectl/cmd/cp/cp.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cmd +package cp import ( "archive/tar" diff --git a/pkg/kubectl/cmd/cp_test.go b/pkg/kubectl/cmd/cp/cp_test.go similarity index 99% rename from pkg/kubectl/cmd/cp_test.go rename to pkg/kubectl/cmd/cp/cp_test.go index 162f3dc3d15..ff70230d615 100644 --- a/pkg/kubectl/cmd/cp_test.go +++ b/pkg/kubectl/cmd/cp/cp_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cmd +package cp import ( "archive/tar" diff --git a/pkg/kubectl/cmd/delete.go b/pkg/kubectl/cmd/delete/delete.go similarity index 99% rename from pkg/kubectl/cmd/delete.go rename to pkg/kubectl/cmd/delete/delete.go index 4d4bf5778da..0ddf8eaefab 100644 --- a/pkg/kubectl/cmd/delete.go +++ b/pkg/kubectl/cmd/delete/delete.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cmd +package delete import ( "fmt" diff --git a/pkg/kubectl/cmd/delete_flags.go b/pkg/kubectl/cmd/delete/delete_flags.go similarity index 99% rename from pkg/kubectl/cmd/delete_flags.go rename to pkg/kubectl/cmd/delete/delete_flags.go index 94ae78e61e0..f6dcc74d95f 100644 --- a/pkg/kubectl/cmd/delete_flags.go +++ b/pkg/kubectl/cmd/delete/delete_flags.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cmd +package delete import ( "time" diff --git a/pkg/kubectl/cmd/delete_test.go b/pkg/kubectl/cmd/delete/delete_test.go similarity index 99% rename from pkg/kubectl/cmd/delete_test.go rename to pkg/kubectl/cmd/delete/delete_test.go index e28b5c937f8..ef67f3eb7f2 100644 --- a/pkg/kubectl/cmd/delete_test.go +++ b/pkg/kubectl/cmd/delete/delete_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cmd +package delete import ( "encoding/json" diff --git a/pkg/kubectl/cmd/describe.go b/pkg/kubectl/cmd/describe/describe.go similarity index 99% rename from pkg/kubectl/cmd/describe.go rename to pkg/kubectl/cmd/describe/describe.go index 9f04d2cb186..0772ca09119 100644 --- a/pkg/kubectl/cmd/describe.go +++ b/pkg/kubectl/cmd/describe/describe.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cmd +package describe import ( "fmt" @@ -39,7 +39,7 @@ var ( Show details of a specific resource or group of resources Print a detailed description of the selected resources, including related resources such - as events or controllers. You may select a single object by name, all objects of that + as events or controllers. You may select a single object by name, all objects of that type, provide a name prefix, or label selector. For example: $ kubectl describe TYPE NAME_PREFIX diff --git a/pkg/kubectl/cmd/describe_test.go b/pkg/kubectl/cmd/describe/describe_test.go similarity index 99% rename from pkg/kubectl/cmd/describe_test.go rename to pkg/kubectl/cmd/describe/describe_test.go index d35e99f2e4c..b56df005ec3 100644 --- a/pkg/kubectl/cmd/describe_test.go +++ b/pkg/kubectl/cmd/describe/describe_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cmd +package describe import ( "fmt" diff --git a/pkg/kubectl/cmd/diff.go b/pkg/kubectl/cmd/diff/diff.go similarity index 99% rename from pkg/kubectl/cmd/diff.go rename to pkg/kubectl/cmd/diff/diff.go index d32bdd24b88..0229a99a777 100644 --- a/pkg/kubectl/cmd/diff.go +++ b/pkg/kubectl/cmd/diff/diff.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cmd +package diff import ( "fmt" diff --git a/pkg/kubectl/cmd/diff_test.go b/pkg/kubectl/cmd/diff/diff_test.go similarity index 99% rename from pkg/kubectl/cmd/diff_test.go rename to pkg/kubectl/cmd/diff/diff_test.go index c7e14d53db5..9a88512ee58 100644 --- a/pkg/kubectl/cmd/diff_test.go +++ b/pkg/kubectl/cmd/diff/diff_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cmd +package diff import ( "bytes" diff --git a/pkg/kubectl/cmd/drain.go b/pkg/kubectl/cmd/drain/drain.go similarity index 99% rename from pkg/kubectl/cmd/drain.go rename to pkg/kubectl/cmd/drain/drain.go index 55d451ddb0e..2fda6f8e3e9 100644 --- a/pkg/kubectl/cmd/drain.go +++ b/pkg/kubectl/cmd/drain/drain.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cmd +package drain import ( "errors" diff --git a/pkg/kubectl/cmd/drain_test.go b/pkg/kubectl/cmd/drain/drain_test.go similarity index 99% rename from pkg/kubectl/cmd/drain_test.go rename to pkg/kubectl/cmd/drain/drain_test.go index e93b4d0ed17..2835ef63194 100644 --- a/pkg/kubectl/cmd/drain_test.go +++ b/pkg/kubectl/cmd/drain/drain_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cmd +package drain import ( "errors" diff --git a/pkg/kubectl/cmd/edit.go b/pkg/kubectl/cmd/edit/edit.go similarity index 99% rename from pkg/kubectl/cmd/edit.go rename to pkg/kubectl/cmd/edit/edit.go index f7156b1b5bd..0e778f09e30 100644 --- a/pkg/kubectl/cmd/edit.go +++ b/pkg/kubectl/cmd/edit/edit.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cmd +package edit import ( "fmt" diff --git a/pkg/kubectl/cmd/edit_test.go b/pkg/kubectl/cmd/edit/edit_test.go similarity index 99% rename from pkg/kubectl/cmd/edit_test.go rename to pkg/kubectl/cmd/edit/edit_test.go index 03c5caf188b..6a6fe3a5c71 100644 --- a/pkg/kubectl/cmd/edit_test.go +++ b/pkg/kubectl/cmd/edit/edit_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cmd +package edit import ( "bytes" diff --git a/pkg/kubectl/cmd/testdata/edit/BUILD b/pkg/kubectl/cmd/edit/testdata/BUILD similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/BUILD rename to pkg/kubectl/cmd/edit/testdata/BUILD diff --git a/pkg/kubectl/cmd/testdata/edit/README b/pkg/kubectl/cmd/edit/testdata/README similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/README rename to pkg/kubectl/cmd/edit/testdata/README diff --git a/pkg/kubectl/cmd/testdata/edit/record.go b/pkg/kubectl/cmd/edit/testdata/record.go similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/record.go rename to pkg/kubectl/cmd/edit/testdata/record.go diff --git a/pkg/kubectl/cmd/testdata/edit/record_editor.sh b/pkg/kubectl/cmd/edit/testdata/record_editor.sh similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/record_editor.sh rename to pkg/kubectl/cmd/edit/testdata/record_editor.sh diff --git a/pkg/kubectl/cmd/testdata/edit/record_testcase.sh b/pkg/kubectl/cmd/edit/testdata/record_testcase.sh similarity index 99% rename from pkg/kubectl/cmd/testdata/edit/record_testcase.sh rename to pkg/kubectl/cmd/edit/testdata/record_testcase.sh index 1181912dcb4..c7685c4d3b5 100755 --- a/pkg/kubectl/cmd/testdata/edit/record_testcase.sh +++ b/pkg/kubectl/cmd/edit/testdata/record_testcase.sh @@ -64,7 +64,7 @@ kind: Config users: [] " > "${edit_kubeconfig}" export KUBECONFIG="${edit_kubeconfig}" - + echo "Starting subshell. Type exit when finished." bash popd diff --git a/pkg/kubectl/cmd/testdata/edit/test_editor.sh b/pkg/kubectl/cmd/edit/testdata/test_editor.sh similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/test_editor.sh rename to pkg/kubectl/cmd/edit/testdata/test_editor.sh diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list-fail/0.request b/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/0.request similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list-fail/0.request rename to pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/0.request diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list-fail/0.response b/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/0.response similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list-fail/0.response rename to pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/0.response diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list-fail/1.request b/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/1.request similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list-fail/1.request rename to pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/1.request diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list-fail/1.response b/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/1.response similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list-fail/1.response rename to pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/1.response diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list-fail/2.edited b/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/2.edited similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list-fail/2.edited rename to pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/2.edited diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list-fail/2.original b/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/2.original similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list-fail/2.original rename to pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/2.original diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list-fail/3.edited b/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/3.edited similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list-fail/3.edited rename to pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/3.edited diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list-fail/3.original b/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/3.original similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list-fail/3.original rename to pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/3.original diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list-fail/4.request b/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/4.request similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list-fail/4.request rename to pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/4.request diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list-fail/4.response b/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/4.response similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list-fail/4.response rename to pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/4.response diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list-fail/5.request b/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/5.request similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list-fail/5.request rename to pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/5.request diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list-fail/5.response b/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/5.response similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list-fail/5.response rename to pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/5.response diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list-fail/test.yaml b/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/test.yaml similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list-fail/test.yaml rename to pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/test.yaml diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list/0.request b/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list/0.request similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list/0.request rename to pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list/0.request diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list/0.response b/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list/0.response similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list/0.response rename to pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list/0.response diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list/1.request b/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list/1.request similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list/1.request rename to pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list/1.request diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list/1.response b/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list/1.response similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list/1.response rename to pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list/1.response diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list/2.edited b/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list/2.edited similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list/2.edited rename to pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list/2.edited diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list/2.original b/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list/2.original similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list/2.original rename to pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list/2.original diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list/3.request b/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list/3.request similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list/3.request rename to pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list/3.request diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list/3.response b/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list/3.response similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list/3.response rename to pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list/3.response diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list/4.request b/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list/4.request similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list/4.request rename to pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list/4.request diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list/4.response b/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list/4.response similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list/4.response rename to pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list/4.response diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list/test.yaml b/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list/test.yaml similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list/test.yaml rename to pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list/test.yaml diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-syntax-error/0.request b/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-syntax-error/0.request similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-syntax-error/0.request rename to pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-syntax-error/0.request diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-syntax-error/0.response b/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-syntax-error/0.response similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-syntax-error/0.response rename to pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-syntax-error/0.response diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-syntax-error/1.edited b/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-syntax-error/1.edited similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-syntax-error/1.edited rename to pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-syntax-error/1.edited diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-syntax-error/1.original b/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-syntax-error/1.original similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-syntax-error/1.original rename to pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-syntax-error/1.original diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-syntax-error/2.edited b/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-syntax-error/2.edited similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-syntax-error/2.edited rename to pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-syntax-error/2.edited diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-syntax-error/2.original b/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-syntax-error/2.original similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-syntax-error/2.original rename to pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-syntax-error/2.original diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-syntax-error/3.request b/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-syntax-error/3.request similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-syntax-error/3.request rename to pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-syntax-error/3.request diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-syntax-error/3.response b/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-syntax-error/3.response similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-syntax-error/3.response rename to pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-syntax-error/3.response diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-syntax-error/test.yaml b/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-syntax-error/test.yaml similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-syntax-error/test.yaml rename to pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-syntax-error/test.yaml diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied/0.request b/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied/0.request similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied/0.request rename to pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied/0.request diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied/0.response b/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied/0.response similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied/0.response rename to pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied/0.response diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied/1.edited b/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied/1.edited similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied/1.edited rename to pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied/1.edited diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied/1.original b/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied/1.original similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied/1.original rename to pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied/1.original diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied/2.request b/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied/2.request similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied/2.request rename to pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied/2.request diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied/2.response b/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied/2.response similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied/2.response rename to pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied/2.response diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied/test.yaml b/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied/test.yaml similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied/test.yaml rename to pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied/test.yaml diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-create-list-error/0.edited b/pkg/kubectl/cmd/edit/testdata/testcase-create-list-error/0.edited similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-create-list-error/0.edited rename to pkg/kubectl/cmd/edit/testdata/testcase-create-list-error/0.edited diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-create-list-error/0.original b/pkg/kubectl/cmd/edit/testdata/testcase-create-list-error/0.original similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-create-list-error/0.original rename to pkg/kubectl/cmd/edit/testdata/testcase-create-list-error/0.original diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-create-list-error/1.request b/pkg/kubectl/cmd/edit/testdata/testcase-create-list-error/1.request similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-create-list-error/1.request rename to pkg/kubectl/cmd/edit/testdata/testcase-create-list-error/1.request diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-create-list-error/1.response b/pkg/kubectl/cmd/edit/testdata/testcase-create-list-error/1.response similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-create-list-error/1.response rename to pkg/kubectl/cmd/edit/testdata/testcase-create-list-error/1.response diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-create-list-error/2.edited b/pkg/kubectl/cmd/edit/testdata/testcase-create-list-error/2.edited similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-create-list-error/2.edited rename to pkg/kubectl/cmd/edit/testdata/testcase-create-list-error/2.edited diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-create-list-error/2.original b/pkg/kubectl/cmd/edit/testdata/testcase-create-list-error/2.original similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-create-list-error/2.original rename to pkg/kubectl/cmd/edit/testdata/testcase-create-list-error/2.original diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-create-list-error/3.request b/pkg/kubectl/cmd/edit/testdata/testcase-create-list-error/3.request similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-create-list-error/3.request rename to pkg/kubectl/cmd/edit/testdata/testcase-create-list-error/3.request diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-create-list-error/3.response b/pkg/kubectl/cmd/edit/testdata/testcase-create-list-error/3.response similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-create-list-error/3.response rename to pkg/kubectl/cmd/edit/testdata/testcase-create-list-error/3.response diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-create-list-error/svc.yaml b/pkg/kubectl/cmd/edit/testdata/testcase-create-list-error/svc.yaml similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-create-list-error/svc.yaml rename to pkg/kubectl/cmd/edit/testdata/testcase-create-list-error/svc.yaml diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-create-list-error/test.yaml b/pkg/kubectl/cmd/edit/testdata/testcase-create-list-error/test.yaml similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-create-list-error/test.yaml rename to pkg/kubectl/cmd/edit/testdata/testcase-create-list-error/test.yaml diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-create-list/0.edited b/pkg/kubectl/cmd/edit/testdata/testcase-create-list/0.edited similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-create-list/0.edited rename to pkg/kubectl/cmd/edit/testdata/testcase-create-list/0.edited diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-create-list/0.original b/pkg/kubectl/cmd/edit/testdata/testcase-create-list/0.original similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-create-list/0.original rename to pkg/kubectl/cmd/edit/testdata/testcase-create-list/0.original diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-create-list/1.request b/pkg/kubectl/cmd/edit/testdata/testcase-create-list/1.request similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-create-list/1.request rename to pkg/kubectl/cmd/edit/testdata/testcase-create-list/1.request diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-create-list/1.response b/pkg/kubectl/cmd/edit/testdata/testcase-create-list/1.response similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-create-list/1.response rename to pkg/kubectl/cmd/edit/testdata/testcase-create-list/1.response diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-create-list/2.edited b/pkg/kubectl/cmd/edit/testdata/testcase-create-list/2.edited similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-create-list/2.edited rename to pkg/kubectl/cmd/edit/testdata/testcase-create-list/2.edited diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-create-list/2.original b/pkg/kubectl/cmd/edit/testdata/testcase-create-list/2.original similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-create-list/2.original rename to pkg/kubectl/cmd/edit/testdata/testcase-create-list/2.original diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-create-list/3.request b/pkg/kubectl/cmd/edit/testdata/testcase-create-list/3.request similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-create-list/3.request rename to pkg/kubectl/cmd/edit/testdata/testcase-create-list/3.request diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-create-list/3.response b/pkg/kubectl/cmd/edit/testdata/testcase-create-list/3.response similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-create-list/3.response rename to pkg/kubectl/cmd/edit/testdata/testcase-create-list/3.response diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-create-list/svc.yaml b/pkg/kubectl/cmd/edit/testdata/testcase-create-list/svc.yaml similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-create-list/svc.yaml rename to pkg/kubectl/cmd/edit/testdata/testcase-create-list/svc.yaml diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-create-list/test.yaml b/pkg/kubectl/cmd/edit/testdata/testcase-create-list/test.yaml similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-create-list/test.yaml rename to pkg/kubectl/cmd/edit/testdata/testcase-create-list/test.yaml diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-edit-error-reedit/0.request b/pkg/kubectl/cmd/edit/testdata/testcase-edit-error-reedit/0.request similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-edit-error-reedit/0.request rename to pkg/kubectl/cmd/edit/testdata/testcase-edit-error-reedit/0.request diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-edit-error-reedit/0.response b/pkg/kubectl/cmd/edit/testdata/testcase-edit-error-reedit/0.response similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-edit-error-reedit/0.response rename to pkg/kubectl/cmd/edit/testdata/testcase-edit-error-reedit/0.response diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-edit-error-reedit/1.edited b/pkg/kubectl/cmd/edit/testdata/testcase-edit-error-reedit/1.edited similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-edit-error-reedit/1.edited rename to pkg/kubectl/cmd/edit/testdata/testcase-edit-error-reedit/1.edited diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-edit-error-reedit/1.original b/pkg/kubectl/cmd/edit/testdata/testcase-edit-error-reedit/1.original similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-edit-error-reedit/1.original rename to pkg/kubectl/cmd/edit/testdata/testcase-edit-error-reedit/1.original diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-edit-error-reedit/2.request b/pkg/kubectl/cmd/edit/testdata/testcase-edit-error-reedit/2.request similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-edit-error-reedit/2.request rename to pkg/kubectl/cmd/edit/testdata/testcase-edit-error-reedit/2.request diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-edit-error-reedit/2.response b/pkg/kubectl/cmd/edit/testdata/testcase-edit-error-reedit/2.response similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-edit-error-reedit/2.response rename to pkg/kubectl/cmd/edit/testdata/testcase-edit-error-reedit/2.response diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-edit-error-reedit/3.edited b/pkg/kubectl/cmd/edit/testdata/testcase-edit-error-reedit/3.edited similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-edit-error-reedit/3.edited rename to pkg/kubectl/cmd/edit/testdata/testcase-edit-error-reedit/3.edited diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-edit-error-reedit/3.original b/pkg/kubectl/cmd/edit/testdata/testcase-edit-error-reedit/3.original similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-edit-error-reedit/3.original rename to pkg/kubectl/cmd/edit/testdata/testcase-edit-error-reedit/3.original diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-edit-error-reedit/4.request b/pkg/kubectl/cmd/edit/testdata/testcase-edit-error-reedit/4.request similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-edit-error-reedit/4.request rename to pkg/kubectl/cmd/edit/testdata/testcase-edit-error-reedit/4.request diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-edit-error-reedit/4.response b/pkg/kubectl/cmd/edit/testdata/testcase-edit-error-reedit/4.response similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-edit-error-reedit/4.response rename to pkg/kubectl/cmd/edit/testdata/testcase-edit-error-reedit/4.response diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-edit-error-reedit/test.yaml b/pkg/kubectl/cmd/edit/testdata/testcase-edit-error-reedit/test.yaml similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-edit-error-reedit/test.yaml rename to pkg/kubectl/cmd/edit/testdata/testcase-edit-error-reedit/test.yaml diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-edit-from-empty/0.request b/pkg/kubectl/cmd/edit/testdata/testcase-edit-from-empty/0.request similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-edit-from-empty/0.request rename to pkg/kubectl/cmd/edit/testdata/testcase-edit-from-empty/0.request diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-edit-from-empty/0.response b/pkg/kubectl/cmd/edit/testdata/testcase-edit-from-empty/0.response similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-edit-from-empty/0.response rename to pkg/kubectl/cmd/edit/testdata/testcase-edit-from-empty/0.response diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-edit-from-empty/test.yaml b/pkg/kubectl/cmd/edit/testdata/testcase-edit-from-empty/test.yaml similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-edit-from-empty/test.yaml rename to pkg/kubectl/cmd/edit/testdata/testcase-edit-from-empty/test.yaml diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-edit-output-patch/0.request b/pkg/kubectl/cmd/edit/testdata/testcase-edit-output-patch/0.request similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-edit-output-patch/0.request rename to pkg/kubectl/cmd/edit/testdata/testcase-edit-output-patch/0.request diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-update-annotation/0.response b/pkg/kubectl/cmd/edit/testdata/testcase-edit-output-patch/0.response similarity index 99% rename from pkg/kubectl/cmd/testdata/edit/testcase-update-annotation/0.response rename to pkg/kubectl/cmd/edit/testdata/testcase-edit-output-patch/0.response index 9d4d9c7750a..b4693de4941 100755 --- a/pkg/kubectl/cmd/testdata/edit/testcase-update-annotation/0.response +++ b/pkg/kubectl/cmd/edit/testdata/testcase-edit-output-patch/0.response @@ -35,4 +35,3 @@ "loadBalancer": {} } } - diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-edit-output-patch/1.edited b/pkg/kubectl/cmd/edit/testdata/testcase-edit-output-patch/1.edited similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-edit-output-patch/1.edited rename to pkg/kubectl/cmd/edit/testdata/testcase-edit-output-patch/1.edited diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-edit-output-patch/1.original b/pkg/kubectl/cmd/edit/testdata/testcase-edit-output-patch/1.original similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-edit-output-patch/1.original rename to pkg/kubectl/cmd/edit/testdata/testcase-edit-output-patch/1.original diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-edit-output-patch/2.request b/pkg/kubectl/cmd/edit/testdata/testcase-edit-output-patch/2.request similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-edit-output-patch/2.request rename to pkg/kubectl/cmd/edit/testdata/testcase-edit-output-patch/2.request diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-edit-output-patch/2.response b/pkg/kubectl/cmd/edit/testdata/testcase-edit-output-patch/2.response similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-edit-output-patch/2.response rename to pkg/kubectl/cmd/edit/testdata/testcase-edit-output-patch/2.response diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-edit-output-patch/test.yaml b/pkg/kubectl/cmd/edit/testdata/testcase-edit-output-patch/test.yaml similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-edit-output-patch/test.yaml rename to pkg/kubectl/cmd/edit/testdata/testcase-edit-output-patch/test.yaml diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-immutable-name/0.request b/pkg/kubectl/cmd/edit/testdata/testcase-immutable-name/0.request similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-immutable-name/0.request rename to pkg/kubectl/cmd/edit/testdata/testcase-immutable-name/0.request diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-immutable-name/0.response b/pkg/kubectl/cmd/edit/testdata/testcase-immutable-name/0.response similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-immutable-name/0.response rename to pkg/kubectl/cmd/edit/testdata/testcase-immutable-name/0.response diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-immutable-name/1.edited b/pkg/kubectl/cmd/edit/testdata/testcase-immutable-name/1.edited similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-immutable-name/1.edited rename to pkg/kubectl/cmd/edit/testdata/testcase-immutable-name/1.edited diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-immutable-name/1.original b/pkg/kubectl/cmd/edit/testdata/testcase-immutable-name/1.original similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-immutable-name/1.original rename to pkg/kubectl/cmd/edit/testdata/testcase-immutable-name/1.original diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-immutable-name/test.yaml b/pkg/kubectl/cmd/edit/testdata/testcase-immutable-name/test.yaml similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-immutable-name/test.yaml rename to pkg/kubectl/cmd/edit/testdata/testcase-immutable-name/test.yaml diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-list-errors/0.request b/pkg/kubectl/cmd/edit/testdata/testcase-list-errors/0.request similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-list-errors/0.request rename to pkg/kubectl/cmd/edit/testdata/testcase-list-errors/0.request diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-list-errors/0.response b/pkg/kubectl/cmd/edit/testdata/testcase-list-errors/0.response similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-list-errors/0.response rename to pkg/kubectl/cmd/edit/testdata/testcase-list-errors/0.response diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-list-errors/1.request b/pkg/kubectl/cmd/edit/testdata/testcase-list-errors/1.request similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-list-errors/1.request rename to pkg/kubectl/cmd/edit/testdata/testcase-list-errors/1.request diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-list-errors/1.response b/pkg/kubectl/cmd/edit/testdata/testcase-list-errors/1.response similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-list-errors/1.response rename to pkg/kubectl/cmd/edit/testdata/testcase-list-errors/1.response diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-list-errors/10.request b/pkg/kubectl/cmd/edit/testdata/testcase-list-errors/10.request similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-list-errors/10.request rename to pkg/kubectl/cmd/edit/testdata/testcase-list-errors/10.request diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-list-errors/10.response b/pkg/kubectl/cmd/edit/testdata/testcase-list-errors/10.response similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-list-errors/10.response rename to pkg/kubectl/cmd/edit/testdata/testcase-list-errors/10.response diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-list-errors/2.edited b/pkg/kubectl/cmd/edit/testdata/testcase-list-errors/2.edited similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-list-errors/2.edited rename to pkg/kubectl/cmd/edit/testdata/testcase-list-errors/2.edited diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-list-errors/2.original b/pkg/kubectl/cmd/edit/testdata/testcase-list-errors/2.original similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-list-errors/2.original rename to pkg/kubectl/cmd/edit/testdata/testcase-list-errors/2.original diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-list-errors/3.request b/pkg/kubectl/cmd/edit/testdata/testcase-list-errors/3.request similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-list-errors/3.request rename to pkg/kubectl/cmd/edit/testdata/testcase-list-errors/3.request diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-list-errors/3.response b/pkg/kubectl/cmd/edit/testdata/testcase-list-errors/3.response similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-list-errors/3.response rename to pkg/kubectl/cmd/edit/testdata/testcase-list-errors/3.response diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-list-errors/4.request b/pkg/kubectl/cmd/edit/testdata/testcase-list-errors/4.request similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-list-errors/4.request rename to pkg/kubectl/cmd/edit/testdata/testcase-list-errors/4.request diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-list-errors/4.response b/pkg/kubectl/cmd/edit/testdata/testcase-list-errors/4.response similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-list-errors/4.response rename to pkg/kubectl/cmd/edit/testdata/testcase-list-errors/4.response diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-list-errors/5.edited b/pkg/kubectl/cmd/edit/testdata/testcase-list-errors/5.edited similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-list-errors/5.edited rename to pkg/kubectl/cmd/edit/testdata/testcase-list-errors/5.edited diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-list-errors/5.original b/pkg/kubectl/cmd/edit/testdata/testcase-list-errors/5.original similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-list-errors/5.original rename to pkg/kubectl/cmd/edit/testdata/testcase-list-errors/5.original diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-list-errors/6.request b/pkg/kubectl/cmd/edit/testdata/testcase-list-errors/6.request similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-list-errors/6.request rename to pkg/kubectl/cmd/edit/testdata/testcase-list-errors/6.request diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-list-errors/6.response b/pkg/kubectl/cmd/edit/testdata/testcase-list-errors/6.response similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-list-errors/6.response rename to pkg/kubectl/cmd/edit/testdata/testcase-list-errors/6.response diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-list-errors/7.request b/pkg/kubectl/cmd/edit/testdata/testcase-list-errors/7.request similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-list-errors/7.request rename to pkg/kubectl/cmd/edit/testdata/testcase-list-errors/7.request diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-list-errors/7.response b/pkg/kubectl/cmd/edit/testdata/testcase-list-errors/7.response similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-list-errors/7.response rename to pkg/kubectl/cmd/edit/testdata/testcase-list-errors/7.response diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-list-errors/8.edited b/pkg/kubectl/cmd/edit/testdata/testcase-list-errors/8.edited similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-list-errors/8.edited rename to pkg/kubectl/cmd/edit/testdata/testcase-list-errors/8.edited diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-list-errors/8.original b/pkg/kubectl/cmd/edit/testdata/testcase-list-errors/8.original similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-list-errors/8.original rename to pkg/kubectl/cmd/edit/testdata/testcase-list-errors/8.original diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-list-errors/9.request b/pkg/kubectl/cmd/edit/testdata/testcase-list-errors/9.request similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-list-errors/9.request rename to pkg/kubectl/cmd/edit/testdata/testcase-list-errors/9.request diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-list-errors/9.response b/pkg/kubectl/cmd/edit/testdata/testcase-list-errors/9.response similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-list-errors/9.response rename to pkg/kubectl/cmd/edit/testdata/testcase-list-errors/9.response diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-list-errors/test.yaml b/pkg/kubectl/cmd/edit/testdata/testcase-list-errors/test.yaml similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-list-errors/test.yaml rename to pkg/kubectl/cmd/edit/testdata/testcase-list-errors/test.yaml diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-list-record/0.request b/pkg/kubectl/cmd/edit/testdata/testcase-list-record/0.request similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-list-record/0.request rename to pkg/kubectl/cmd/edit/testdata/testcase-list-record/0.request diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-list-record/0.response b/pkg/kubectl/cmd/edit/testdata/testcase-list-record/0.response similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-list-record/0.response rename to pkg/kubectl/cmd/edit/testdata/testcase-list-record/0.response diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-list-record/1.request b/pkg/kubectl/cmd/edit/testdata/testcase-list-record/1.request similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-list-record/1.request rename to pkg/kubectl/cmd/edit/testdata/testcase-list-record/1.request diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-list-record/1.response b/pkg/kubectl/cmd/edit/testdata/testcase-list-record/1.response similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-list-record/1.response rename to pkg/kubectl/cmd/edit/testdata/testcase-list-record/1.response diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-list-record/2.edited b/pkg/kubectl/cmd/edit/testdata/testcase-list-record/2.edited similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-list-record/2.edited rename to pkg/kubectl/cmd/edit/testdata/testcase-list-record/2.edited diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-list-record/2.original b/pkg/kubectl/cmd/edit/testdata/testcase-list-record/2.original similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-list-record/2.original rename to pkg/kubectl/cmd/edit/testdata/testcase-list-record/2.original diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-list-record/3.request b/pkg/kubectl/cmd/edit/testdata/testcase-list-record/3.request similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-list-record/3.request rename to pkg/kubectl/cmd/edit/testdata/testcase-list-record/3.request diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-list-record/3.response b/pkg/kubectl/cmd/edit/testdata/testcase-list-record/3.response similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-list-record/3.response rename to pkg/kubectl/cmd/edit/testdata/testcase-list-record/3.response diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-list-record/4.request b/pkg/kubectl/cmd/edit/testdata/testcase-list-record/4.request similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-list-record/4.request rename to pkg/kubectl/cmd/edit/testdata/testcase-list-record/4.request diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-list-record/4.response b/pkg/kubectl/cmd/edit/testdata/testcase-list-record/4.response similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-list-record/4.response rename to pkg/kubectl/cmd/edit/testdata/testcase-list-record/4.response diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-list-record/test.yaml b/pkg/kubectl/cmd/edit/testdata/testcase-list-record/test.yaml similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-list-record/test.yaml rename to pkg/kubectl/cmd/edit/testdata/testcase-list-record/test.yaml diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-list/0.request b/pkg/kubectl/cmd/edit/testdata/testcase-list/0.request similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-list/0.request rename to pkg/kubectl/cmd/edit/testdata/testcase-list/0.request diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-list/0.response b/pkg/kubectl/cmd/edit/testdata/testcase-list/0.response similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-list/0.response rename to pkg/kubectl/cmd/edit/testdata/testcase-list/0.response diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-list/1.request b/pkg/kubectl/cmd/edit/testdata/testcase-list/1.request similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-list/1.request rename to pkg/kubectl/cmd/edit/testdata/testcase-list/1.request diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-list/1.response b/pkg/kubectl/cmd/edit/testdata/testcase-list/1.response similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-list/1.response rename to pkg/kubectl/cmd/edit/testdata/testcase-list/1.response diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-list/2.edited b/pkg/kubectl/cmd/edit/testdata/testcase-list/2.edited similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-list/2.edited rename to pkg/kubectl/cmd/edit/testdata/testcase-list/2.edited diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-list/2.original b/pkg/kubectl/cmd/edit/testdata/testcase-list/2.original similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-list/2.original rename to pkg/kubectl/cmd/edit/testdata/testcase-list/2.original diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-list/3.request b/pkg/kubectl/cmd/edit/testdata/testcase-list/3.request similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-list/3.request rename to pkg/kubectl/cmd/edit/testdata/testcase-list/3.request diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-list/3.response b/pkg/kubectl/cmd/edit/testdata/testcase-list/3.response similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-list/3.response rename to pkg/kubectl/cmd/edit/testdata/testcase-list/3.response diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-list/4.request b/pkg/kubectl/cmd/edit/testdata/testcase-list/4.request similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-list/4.request rename to pkg/kubectl/cmd/edit/testdata/testcase-list/4.request diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-list/4.response b/pkg/kubectl/cmd/edit/testdata/testcase-list/4.response similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-list/4.response rename to pkg/kubectl/cmd/edit/testdata/testcase-list/4.response diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-list/test.yaml b/pkg/kubectl/cmd/edit/testdata/testcase-list/test.yaml similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-list/test.yaml rename to pkg/kubectl/cmd/edit/testdata/testcase-list/test.yaml diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-missing-service/0.request b/pkg/kubectl/cmd/edit/testdata/testcase-missing-service/0.request similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-missing-service/0.request rename to pkg/kubectl/cmd/edit/testdata/testcase-missing-service/0.request diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-missing-service/0.response b/pkg/kubectl/cmd/edit/testdata/testcase-missing-service/0.response similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-missing-service/0.response rename to pkg/kubectl/cmd/edit/testdata/testcase-missing-service/0.response diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-missing-service/test.yaml b/pkg/kubectl/cmd/edit/testdata/testcase-missing-service/test.yaml similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-missing-service/test.yaml rename to pkg/kubectl/cmd/edit/testdata/testcase-missing-service/test.yaml diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-no-op/0.request b/pkg/kubectl/cmd/edit/testdata/testcase-no-op/0.request similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-no-op/0.request rename to pkg/kubectl/cmd/edit/testdata/testcase-no-op/0.request diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-no-op/0.response b/pkg/kubectl/cmd/edit/testdata/testcase-no-op/0.response similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-no-op/0.response rename to pkg/kubectl/cmd/edit/testdata/testcase-no-op/0.response diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-no-op/1.edited b/pkg/kubectl/cmd/edit/testdata/testcase-no-op/1.edited similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-no-op/1.edited rename to pkg/kubectl/cmd/edit/testdata/testcase-no-op/1.edited diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-no-op/1.original b/pkg/kubectl/cmd/edit/testdata/testcase-no-op/1.original similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-no-op/1.original rename to pkg/kubectl/cmd/edit/testdata/testcase-no-op/1.original diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-no-op/test.yaml b/pkg/kubectl/cmd/edit/testdata/testcase-no-op/test.yaml similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-no-op/test.yaml rename to pkg/kubectl/cmd/edit/testdata/testcase-no-op/test.yaml diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-not-update-annotation/0.request b/pkg/kubectl/cmd/edit/testdata/testcase-not-update-annotation/0.request similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-not-update-annotation/0.request rename to pkg/kubectl/cmd/edit/testdata/testcase-not-update-annotation/0.request diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-edit-output-patch/0.response b/pkg/kubectl/cmd/edit/testdata/testcase-not-update-annotation/0.response similarity index 99% rename from pkg/kubectl/cmd/testdata/edit/testcase-edit-output-patch/0.response rename to pkg/kubectl/cmd/edit/testdata/testcase-not-update-annotation/0.response index 9d4d9c7750a..b4693de4941 100755 --- a/pkg/kubectl/cmd/testdata/edit/testcase-edit-output-patch/0.response +++ b/pkg/kubectl/cmd/edit/testdata/testcase-not-update-annotation/0.response @@ -35,4 +35,3 @@ "loadBalancer": {} } } - diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-not-update-annotation/1.edited b/pkg/kubectl/cmd/edit/testdata/testcase-not-update-annotation/1.edited similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-not-update-annotation/1.edited rename to pkg/kubectl/cmd/edit/testdata/testcase-not-update-annotation/1.edited diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-not-update-annotation/1.original b/pkg/kubectl/cmd/edit/testdata/testcase-not-update-annotation/1.original similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-not-update-annotation/1.original rename to pkg/kubectl/cmd/edit/testdata/testcase-not-update-annotation/1.original diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-not-update-annotation/2.request b/pkg/kubectl/cmd/edit/testdata/testcase-not-update-annotation/2.request similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-not-update-annotation/2.request rename to pkg/kubectl/cmd/edit/testdata/testcase-not-update-annotation/2.request diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-not-update-annotation/2.response b/pkg/kubectl/cmd/edit/testdata/testcase-not-update-annotation/2.response similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-not-update-annotation/2.response rename to pkg/kubectl/cmd/edit/testdata/testcase-not-update-annotation/2.response diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-not-update-annotation/test.yaml b/pkg/kubectl/cmd/edit/testdata/testcase-not-update-annotation/test.yaml similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-not-update-annotation/test.yaml rename to pkg/kubectl/cmd/edit/testdata/testcase-not-update-annotation/test.yaml diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-repeat-error/0.request b/pkg/kubectl/cmd/edit/testdata/testcase-repeat-error/0.request similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-repeat-error/0.request rename to pkg/kubectl/cmd/edit/testdata/testcase-repeat-error/0.request diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-repeat-error/0.response b/pkg/kubectl/cmd/edit/testdata/testcase-repeat-error/0.response similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-repeat-error/0.response rename to pkg/kubectl/cmd/edit/testdata/testcase-repeat-error/0.response diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-repeat-error/1.edited b/pkg/kubectl/cmd/edit/testdata/testcase-repeat-error/1.edited similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-repeat-error/1.edited rename to pkg/kubectl/cmd/edit/testdata/testcase-repeat-error/1.edited diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-repeat-error/1.original b/pkg/kubectl/cmd/edit/testdata/testcase-repeat-error/1.original similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-repeat-error/1.original rename to pkg/kubectl/cmd/edit/testdata/testcase-repeat-error/1.original diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-repeat-error/2.request b/pkg/kubectl/cmd/edit/testdata/testcase-repeat-error/2.request similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-repeat-error/2.request rename to pkg/kubectl/cmd/edit/testdata/testcase-repeat-error/2.request diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-repeat-error/2.response b/pkg/kubectl/cmd/edit/testdata/testcase-repeat-error/2.response similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-repeat-error/2.response rename to pkg/kubectl/cmd/edit/testdata/testcase-repeat-error/2.response diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-repeat-error/3.edited b/pkg/kubectl/cmd/edit/testdata/testcase-repeat-error/3.edited similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-repeat-error/3.edited rename to pkg/kubectl/cmd/edit/testdata/testcase-repeat-error/3.edited diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-repeat-error/3.original b/pkg/kubectl/cmd/edit/testdata/testcase-repeat-error/3.original similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-repeat-error/3.original rename to pkg/kubectl/cmd/edit/testdata/testcase-repeat-error/3.original diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-repeat-error/test.yaml b/pkg/kubectl/cmd/edit/testdata/testcase-repeat-error/test.yaml similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-repeat-error/test.yaml rename to pkg/kubectl/cmd/edit/testdata/testcase-repeat-error/test.yaml diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-schemaless-list/0.request b/pkg/kubectl/cmd/edit/testdata/testcase-schemaless-list/0.request similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-schemaless-list/0.request rename to pkg/kubectl/cmd/edit/testdata/testcase-schemaless-list/0.request diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-schemaless-list/0.response b/pkg/kubectl/cmd/edit/testdata/testcase-schemaless-list/0.response similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-schemaless-list/0.response rename to pkg/kubectl/cmd/edit/testdata/testcase-schemaless-list/0.response diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-schemaless-list/1.request b/pkg/kubectl/cmd/edit/testdata/testcase-schemaless-list/1.request similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-schemaless-list/1.request rename to pkg/kubectl/cmd/edit/testdata/testcase-schemaless-list/1.request diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-schemaless-list/1.response b/pkg/kubectl/cmd/edit/testdata/testcase-schemaless-list/1.response similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-schemaless-list/1.response rename to pkg/kubectl/cmd/edit/testdata/testcase-schemaless-list/1.response diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-schemaless-list/2.request b/pkg/kubectl/cmd/edit/testdata/testcase-schemaless-list/2.request similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-schemaless-list/2.request rename to pkg/kubectl/cmd/edit/testdata/testcase-schemaless-list/2.request diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-schemaless-list/2.response b/pkg/kubectl/cmd/edit/testdata/testcase-schemaless-list/2.response similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-schemaless-list/2.response rename to pkg/kubectl/cmd/edit/testdata/testcase-schemaless-list/2.response diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-schemaless-list/3.edited b/pkg/kubectl/cmd/edit/testdata/testcase-schemaless-list/3.edited similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-schemaless-list/3.edited rename to pkg/kubectl/cmd/edit/testdata/testcase-schemaless-list/3.edited diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-schemaless-list/3.original b/pkg/kubectl/cmd/edit/testdata/testcase-schemaless-list/3.original similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-schemaless-list/3.original rename to pkg/kubectl/cmd/edit/testdata/testcase-schemaless-list/3.original diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-schemaless-list/4.request b/pkg/kubectl/cmd/edit/testdata/testcase-schemaless-list/4.request similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-schemaless-list/4.request rename to pkg/kubectl/cmd/edit/testdata/testcase-schemaless-list/4.request diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-schemaless-list/4.response b/pkg/kubectl/cmd/edit/testdata/testcase-schemaless-list/4.response similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-schemaless-list/4.response rename to pkg/kubectl/cmd/edit/testdata/testcase-schemaless-list/4.response diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-schemaless-list/5.request b/pkg/kubectl/cmd/edit/testdata/testcase-schemaless-list/5.request similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-schemaless-list/5.request rename to pkg/kubectl/cmd/edit/testdata/testcase-schemaless-list/5.request diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-schemaless-list/5.response b/pkg/kubectl/cmd/edit/testdata/testcase-schemaless-list/5.response similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-schemaless-list/5.response rename to pkg/kubectl/cmd/edit/testdata/testcase-schemaless-list/5.response diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-schemaless-list/6.request b/pkg/kubectl/cmd/edit/testdata/testcase-schemaless-list/6.request similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-schemaless-list/6.request rename to pkg/kubectl/cmd/edit/testdata/testcase-schemaless-list/6.request diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-schemaless-list/6.response b/pkg/kubectl/cmd/edit/testdata/testcase-schemaless-list/6.response similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-schemaless-list/6.response rename to pkg/kubectl/cmd/edit/testdata/testcase-schemaless-list/6.response diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-schemaless-list/test.yaml b/pkg/kubectl/cmd/edit/testdata/testcase-schemaless-list/test.yaml similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-schemaless-list/test.yaml rename to pkg/kubectl/cmd/edit/testdata/testcase-schemaless-list/test.yaml diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-single-service/0.request b/pkg/kubectl/cmd/edit/testdata/testcase-single-service/0.request similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-single-service/0.request rename to pkg/kubectl/cmd/edit/testdata/testcase-single-service/0.request diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-single-service/0.response b/pkg/kubectl/cmd/edit/testdata/testcase-single-service/0.response similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-single-service/0.response rename to pkg/kubectl/cmd/edit/testdata/testcase-single-service/0.response diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-single-service/1.edited b/pkg/kubectl/cmd/edit/testdata/testcase-single-service/1.edited similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-single-service/1.edited rename to pkg/kubectl/cmd/edit/testdata/testcase-single-service/1.edited diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-single-service/1.original b/pkg/kubectl/cmd/edit/testdata/testcase-single-service/1.original similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-single-service/1.original rename to pkg/kubectl/cmd/edit/testdata/testcase-single-service/1.original diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-single-service/2.request b/pkg/kubectl/cmd/edit/testdata/testcase-single-service/2.request similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-single-service/2.request rename to pkg/kubectl/cmd/edit/testdata/testcase-single-service/2.request diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-single-service/2.response b/pkg/kubectl/cmd/edit/testdata/testcase-single-service/2.response similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-single-service/2.response rename to pkg/kubectl/cmd/edit/testdata/testcase-single-service/2.response diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-single-service/test.yaml b/pkg/kubectl/cmd/edit/testdata/testcase-single-service/test.yaml similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-single-service/test.yaml rename to pkg/kubectl/cmd/edit/testdata/testcase-single-service/test.yaml diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-syntax-error/0.request b/pkg/kubectl/cmd/edit/testdata/testcase-syntax-error/0.request similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-syntax-error/0.request rename to pkg/kubectl/cmd/edit/testdata/testcase-syntax-error/0.request diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-syntax-error/0.response b/pkg/kubectl/cmd/edit/testdata/testcase-syntax-error/0.response similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-syntax-error/0.response rename to pkg/kubectl/cmd/edit/testdata/testcase-syntax-error/0.response diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-syntax-error/1.edited b/pkg/kubectl/cmd/edit/testdata/testcase-syntax-error/1.edited similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-syntax-error/1.edited rename to pkg/kubectl/cmd/edit/testdata/testcase-syntax-error/1.edited diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-syntax-error/1.original b/pkg/kubectl/cmd/edit/testdata/testcase-syntax-error/1.original similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-syntax-error/1.original rename to pkg/kubectl/cmd/edit/testdata/testcase-syntax-error/1.original diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-syntax-error/2.edited b/pkg/kubectl/cmd/edit/testdata/testcase-syntax-error/2.edited similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-syntax-error/2.edited rename to pkg/kubectl/cmd/edit/testdata/testcase-syntax-error/2.edited diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-syntax-error/2.original b/pkg/kubectl/cmd/edit/testdata/testcase-syntax-error/2.original similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-syntax-error/2.original rename to pkg/kubectl/cmd/edit/testdata/testcase-syntax-error/2.original diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-syntax-error/3.request b/pkg/kubectl/cmd/edit/testdata/testcase-syntax-error/3.request similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-syntax-error/3.request rename to pkg/kubectl/cmd/edit/testdata/testcase-syntax-error/3.request diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-syntax-error/3.response b/pkg/kubectl/cmd/edit/testdata/testcase-syntax-error/3.response similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-syntax-error/3.response rename to pkg/kubectl/cmd/edit/testdata/testcase-syntax-error/3.response diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-syntax-error/test.yaml b/pkg/kubectl/cmd/edit/testdata/testcase-syntax-error/test.yaml similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-syntax-error/test.yaml rename to pkg/kubectl/cmd/edit/testdata/testcase-syntax-error/test.yaml diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-unknown-field-known-group-kind/0.request b/pkg/kubectl/cmd/edit/testdata/testcase-unknown-field-known-group-kind/0.request similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-unknown-field-known-group-kind/0.request rename to pkg/kubectl/cmd/edit/testdata/testcase-unknown-field-known-group-kind/0.request diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-unknown-field-known-group-kind/0.response b/pkg/kubectl/cmd/edit/testdata/testcase-unknown-field-known-group-kind/0.response similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-unknown-field-known-group-kind/0.response rename to pkg/kubectl/cmd/edit/testdata/testcase-unknown-field-known-group-kind/0.response diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-unknown-field-known-group-kind/1.edited b/pkg/kubectl/cmd/edit/testdata/testcase-unknown-field-known-group-kind/1.edited similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-unknown-field-known-group-kind/1.edited rename to pkg/kubectl/cmd/edit/testdata/testcase-unknown-field-known-group-kind/1.edited diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-unknown-field-known-group-kind/1.original b/pkg/kubectl/cmd/edit/testdata/testcase-unknown-field-known-group-kind/1.original similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-unknown-field-known-group-kind/1.original rename to pkg/kubectl/cmd/edit/testdata/testcase-unknown-field-known-group-kind/1.original diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-unknown-field-known-group-kind/2.request b/pkg/kubectl/cmd/edit/testdata/testcase-unknown-field-known-group-kind/2.request similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-unknown-field-known-group-kind/2.request rename to pkg/kubectl/cmd/edit/testdata/testcase-unknown-field-known-group-kind/2.request diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-unknown-field-known-group-kind/2.response b/pkg/kubectl/cmd/edit/testdata/testcase-unknown-field-known-group-kind/2.response similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-unknown-field-known-group-kind/2.response rename to pkg/kubectl/cmd/edit/testdata/testcase-unknown-field-known-group-kind/2.response diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-unknown-field-known-group-kind/test.yaml b/pkg/kubectl/cmd/edit/testdata/testcase-unknown-field-known-group-kind/test.yaml similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-unknown-field-known-group-kind/test.yaml rename to pkg/kubectl/cmd/edit/testdata/testcase-unknown-field-known-group-kind/test.yaml diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-unknown-version-known-group-kind/0.request b/pkg/kubectl/cmd/edit/testdata/testcase-unknown-version-known-group-kind/0.request similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-unknown-version-known-group-kind/0.request rename to pkg/kubectl/cmd/edit/testdata/testcase-unknown-version-known-group-kind/0.request diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-unknown-version-known-group-kind/0.response b/pkg/kubectl/cmd/edit/testdata/testcase-unknown-version-known-group-kind/0.response similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-unknown-version-known-group-kind/0.response rename to pkg/kubectl/cmd/edit/testdata/testcase-unknown-version-known-group-kind/0.response diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-unknown-version-known-group-kind/1.edited b/pkg/kubectl/cmd/edit/testdata/testcase-unknown-version-known-group-kind/1.edited similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-unknown-version-known-group-kind/1.edited rename to pkg/kubectl/cmd/edit/testdata/testcase-unknown-version-known-group-kind/1.edited diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-unknown-version-known-group-kind/1.original b/pkg/kubectl/cmd/edit/testdata/testcase-unknown-version-known-group-kind/1.original similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-unknown-version-known-group-kind/1.original rename to pkg/kubectl/cmd/edit/testdata/testcase-unknown-version-known-group-kind/1.original diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-unknown-version-known-group-kind/2.request b/pkg/kubectl/cmd/edit/testdata/testcase-unknown-version-known-group-kind/2.request similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-unknown-version-known-group-kind/2.request rename to pkg/kubectl/cmd/edit/testdata/testcase-unknown-version-known-group-kind/2.request diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-unknown-version-known-group-kind/2.response b/pkg/kubectl/cmd/edit/testdata/testcase-unknown-version-known-group-kind/2.response similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-unknown-version-known-group-kind/2.response rename to pkg/kubectl/cmd/edit/testdata/testcase-unknown-version-known-group-kind/2.response diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-unknown-version-known-group-kind/test.yaml b/pkg/kubectl/cmd/edit/testdata/testcase-unknown-version-known-group-kind/test.yaml similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-unknown-version-known-group-kind/test.yaml rename to pkg/kubectl/cmd/edit/testdata/testcase-unknown-version-known-group-kind/test.yaml diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-update-annotation/0.request b/pkg/kubectl/cmd/edit/testdata/testcase-update-annotation/0.request similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-update-annotation/0.request rename to pkg/kubectl/cmd/edit/testdata/testcase-update-annotation/0.request diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-not-update-annotation/0.response b/pkg/kubectl/cmd/edit/testdata/testcase-update-annotation/0.response similarity index 99% rename from pkg/kubectl/cmd/testdata/edit/testcase-not-update-annotation/0.response rename to pkg/kubectl/cmd/edit/testdata/testcase-update-annotation/0.response index 9d4d9c7750a..b4693de4941 100755 --- a/pkg/kubectl/cmd/testdata/edit/testcase-not-update-annotation/0.response +++ b/pkg/kubectl/cmd/edit/testdata/testcase-update-annotation/0.response @@ -35,4 +35,3 @@ "loadBalancer": {} } } - diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-update-annotation/1.edited b/pkg/kubectl/cmd/edit/testdata/testcase-update-annotation/1.edited similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-update-annotation/1.edited rename to pkg/kubectl/cmd/edit/testdata/testcase-update-annotation/1.edited diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-update-annotation/1.original b/pkg/kubectl/cmd/edit/testdata/testcase-update-annotation/1.original similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-update-annotation/1.original rename to pkg/kubectl/cmd/edit/testdata/testcase-update-annotation/1.original diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-update-annotation/2.request b/pkg/kubectl/cmd/edit/testdata/testcase-update-annotation/2.request similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-update-annotation/2.request rename to pkg/kubectl/cmd/edit/testdata/testcase-update-annotation/2.request diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-update-annotation/2.response b/pkg/kubectl/cmd/edit/testdata/testcase-update-annotation/2.response similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-update-annotation/2.response rename to pkg/kubectl/cmd/edit/testdata/testcase-update-annotation/2.response diff --git a/pkg/kubectl/cmd/testdata/edit/testcase-update-annotation/test.yaml b/pkg/kubectl/cmd/edit/testdata/testcase-update-annotation/test.yaml similarity index 100% rename from pkg/kubectl/cmd/testdata/edit/testcase-update-annotation/test.yaml rename to pkg/kubectl/cmd/edit/testdata/testcase-update-annotation/test.yaml diff --git a/pkg/kubectl/cmd/exec.go b/pkg/kubectl/cmd/exec/exec.go similarity index 99% rename from pkg/kubectl/cmd/exec.go rename to pkg/kubectl/cmd/exec/exec.go index 30e0b4d214c..0c3050858b6 100644 --- a/pkg/kubectl/cmd/exec.go +++ b/pkg/kubectl/cmd/exec/exec.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cmd +package exec import ( "fmt" diff --git a/pkg/kubectl/cmd/exec_test.go b/pkg/kubectl/cmd/exec/exec_test.go similarity index 99% rename from pkg/kubectl/cmd/exec_test.go rename to pkg/kubectl/cmd/exec/exec_test.go index b4eb9cef2b8..5503b1f6a9f 100644 --- a/pkg/kubectl/cmd/exec_test.go +++ b/pkg/kubectl/cmd/exec/exec_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cmd +package exec import ( "bytes" diff --git a/pkg/kubectl/cmd/explain.go b/pkg/kubectl/cmd/explain/explain.go similarity index 99% rename from pkg/kubectl/cmd/explain.go rename to pkg/kubectl/cmd/explain/explain.go index 40233aedb7d..4efecbeeee4 100644 --- a/pkg/kubectl/cmd/explain.go +++ b/pkg/kubectl/cmd/explain/explain.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cmd +package explain import ( "fmt" diff --git a/pkg/kubectl/cmd/expose.go b/pkg/kubectl/cmd/expose/expose.go similarity index 99% rename from pkg/kubectl/cmd/expose.go rename to pkg/kubectl/cmd/expose/expose.go index 47e1dba484a..51b0992ee0a 100644 --- a/pkg/kubectl/cmd/expose.go +++ b/pkg/kubectl/cmd/expose/expose.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cmd +package expose import ( "regexp" diff --git a/pkg/kubectl/cmd/expose_test.go b/pkg/kubectl/cmd/expose/expose_test.go similarity index 99% rename from pkg/kubectl/cmd/expose_test.go rename to pkg/kubectl/cmd/expose/expose_test.go index c968facd9f4..1ef02501d0c 100644 --- a/pkg/kubectl/cmd/expose_test.go +++ b/pkg/kubectl/cmd/expose/expose_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cmd +package expose import ( "fmt" diff --git a/pkg/kubectl/cmd/help.go b/pkg/kubectl/cmd/help/help.go similarity index 99% rename from pkg/kubectl/cmd/help.go rename to pkg/kubectl/cmd/help/help.go index 508fd1d7d50..7b530545e90 100644 --- a/pkg/kubectl/cmd/help.go +++ b/pkg/kubectl/cmd/help/help.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cmd +package help import ( "strings" diff --git a/pkg/kubectl/cmd/label.go b/pkg/kubectl/cmd/label/label.go similarity index 99% rename from pkg/kubectl/cmd/label.go rename to pkg/kubectl/cmd/label/label.go index 23d1d1ad7cd..948f552c325 100644 --- a/pkg/kubectl/cmd/label.go +++ b/pkg/kubectl/cmd/label/label.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cmd +package label import ( "fmt" diff --git a/pkg/kubectl/cmd/label_test.go b/pkg/kubectl/cmd/label/label_test.go similarity index 99% rename from pkg/kubectl/cmd/label_test.go rename to pkg/kubectl/cmd/label/label_test.go index 1d5e3d038f5..5f0395ce1de 100644 --- a/pkg/kubectl/cmd/label_test.go +++ b/pkg/kubectl/cmd/label/label_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cmd +package label import ( "bytes" diff --git a/pkg/kubectl/cmd/logs.go b/pkg/kubectl/cmd/logs/logs.go similarity index 99% rename from pkg/kubectl/cmd/logs.go rename to pkg/kubectl/cmd/logs/logs.go index c4a4ca4a61b..540e84986b3 100644 --- a/pkg/kubectl/cmd/logs.go +++ b/pkg/kubectl/cmd/logs/logs.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cmd +package logs import ( "errors" diff --git a/pkg/kubectl/cmd/logs_test.go b/pkg/kubectl/cmd/logs/logs_test.go similarity index 99% rename from pkg/kubectl/cmd/logs_test.go rename to pkg/kubectl/cmd/logs/logs_test.go index 6e5ca1286c3..d7329d91e42 100644 --- a/pkg/kubectl/cmd/logs_test.go +++ b/pkg/kubectl/cmd/logs/logs_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cmd +package logs import ( "errors" diff --git a/pkg/kubectl/cmd/options.go b/pkg/kubectl/cmd/options/options.go similarity index 98% rename from pkg/kubectl/cmd/options.go rename to pkg/kubectl/cmd/options/options.go index 77230675ad6..dc9ab09f430 100644 --- a/pkg/kubectl/cmd/options.go +++ b/pkg/kubectl/cmd/options/options.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cmd +package options import ( "io" diff --git a/pkg/kubectl/cmd/patch.go b/pkg/kubectl/cmd/patch/patch.go similarity index 99% rename from pkg/kubectl/cmd/patch.go rename to pkg/kubectl/cmd/patch/patch.go index bd794b5f892..aee94c40a1f 100644 --- a/pkg/kubectl/cmd/patch.go +++ b/pkg/kubectl/cmd/patch/patch.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cmd +package patch import ( "fmt" diff --git a/pkg/kubectl/cmd/patch_test.go b/pkg/kubectl/cmd/patch/patch_test.go similarity index 99% rename from pkg/kubectl/cmd/patch_test.go rename to pkg/kubectl/cmd/patch/patch_test.go index 22e73c95fdc..b50243304da 100644 --- a/pkg/kubectl/cmd/patch_test.go +++ b/pkg/kubectl/cmd/patch/patch_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cmd +package patch import ( "net/http" diff --git a/pkg/kubectl/cmd/plugin.go b/pkg/kubectl/cmd/plugin/plugin.go similarity index 99% rename from pkg/kubectl/cmd/plugin.go rename to pkg/kubectl/cmd/plugin/plugin.go index 31b514dfb26..582c35f07e2 100644 --- a/pkg/kubectl/cmd/plugin.go +++ b/pkg/kubectl/cmd/plugin/plugin.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cmd +package plugin import ( "fmt" diff --git a/pkg/kubectl/cmd/testdata/plugin/kubectl-foo b/pkg/kubectl/cmd/plugin/testdata/kubectl-foo similarity index 100% rename from pkg/kubectl/cmd/testdata/plugin/kubectl-foo rename to pkg/kubectl/cmd/plugin/testdata/kubectl-foo diff --git a/pkg/kubectl/cmd/testdata/plugin/kubectl-version b/pkg/kubectl/cmd/plugin/testdata/kubectl-version similarity index 100% rename from pkg/kubectl/cmd/testdata/plugin/kubectl-version rename to pkg/kubectl/cmd/plugin/testdata/kubectl-version diff --git a/pkg/kubectl/cmd/portforward.go b/pkg/kubectl/cmd/portforward/portforward.go similarity index 99% rename from pkg/kubectl/cmd/portforward.go rename to pkg/kubectl/cmd/portforward/portforward.go index a29a0fa5011..3cc08ed1e3a 100644 --- a/pkg/kubectl/cmd/portforward.go +++ b/pkg/kubectl/cmd/portforward/portforward.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cmd +package portforward import ( "fmt" diff --git a/pkg/kubectl/cmd/portforward_test.go b/pkg/kubectl/cmd/portforward/portforward_test.go similarity index 99% rename from pkg/kubectl/cmd/portforward_test.go rename to pkg/kubectl/cmd/portforward/portforward_test.go index 684d4712134..25c629cce06 100644 --- a/pkg/kubectl/cmd/portforward_test.go +++ b/pkg/kubectl/cmd/portforward/portforward_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cmd +package portforward import ( "fmt" diff --git a/pkg/kubectl/cmd/proxy.go b/pkg/kubectl/cmd/proxy/proxy.go similarity index 99% rename from pkg/kubectl/cmd/proxy.go rename to pkg/kubectl/cmd/proxy/proxy.go index d57aa3d1909..ae29e9e40a0 100644 --- a/pkg/kubectl/cmd/proxy.go +++ b/pkg/kubectl/cmd/proxy/proxy.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cmd +package proxy import ( "errors" @@ -36,9 +36,9 @@ import ( var ( defaultPort = 8001 proxyLong = templates.LongDesc(i18n.T(` - Creates a proxy server or application-level gateway between localhost and - the Kubernetes API Server. It also allows serving static content over specified - HTTP path. All incoming data enters through one port and gets forwarded to + Creates a proxy server or application-level gateway between localhost and + the Kubernetes API Server. It also allows serving static content over specified + HTTP path. All incoming data enters through one port and gets forwarded to the remote kubernetes API Server port, except for the path matching the static content path.`)) proxyExample = templates.Examples(i18n.T(` diff --git a/pkg/kubectl/cmd/replace.go b/pkg/kubectl/cmd/replace/replace.go similarity index 99% rename from pkg/kubectl/cmd/replace.go rename to pkg/kubectl/cmd/replace/replace.go index 53d8fa07f26..6a148d2366c 100644 --- a/pkg/kubectl/cmd/replace.go +++ b/pkg/kubectl/cmd/replace/replace.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cmd +package replace import ( "fmt" diff --git a/pkg/kubectl/cmd/replace_test.go b/pkg/kubectl/cmd/replace/replace_test.go similarity index 99% rename from pkg/kubectl/cmd/replace_test.go rename to pkg/kubectl/cmd/replace/replace_test.go index f939bd553ec..ec9beff2f28 100644 --- a/pkg/kubectl/cmd/replace_test.go +++ b/pkg/kubectl/cmd/replace/replace_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cmd +package replace import ( "net/http" diff --git a/pkg/kubectl/cmd/rollingupdate.go b/pkg/kubectl/cmd/rollingupdate/rollingupdate.go similarity index 99% rename from pkg/kubectl/cmd/rollingupdate.go rename to pkg/kubectl/cmd/rollingupdate/rollingupdate.go index 9504f524b56..a21022780cb 100644 --- a/pkg/kubectl/cmd/rollingupdate.go +++ b/pkg/kubectl/cmd/rollingupdate/rollingupdate.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cmd +package rollingupdate import ( "bytes" diff --git a/pkg/kubectl/cmd/rollingupdate_test.go b/pkg/kubectl/cmd/rollingupdate/rollingupdate_test.go similarity index 98% rename from pkg/kubectl/cmd/rollingupdate_test.go rename to pkg/kubectl/cmd/rollingupdate/rollingupdate_test.go index 2b9fbefb051..d063c6cbdd2 100644 --- a/pkg/kubectl/cmd/rollingupdate_test.go +++ b/pkg/kubectl/cmd/rollingupdate/rollingupdate_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cmd +package rollingupdate import ( "testing" diff --git a/pkg/kubectl/cmd/run.go b/pkg/kubectl/cmd/run/run.go similarity index 99% rename from pkg/kubectl/cmd/run.go rename to pkg/kubectl/cmd/run/run.go index 8fa3df9baea..6a5f57d92e9 100644 --- a/pkg/kubectl/cmd/run.go +++ b/pkg/kubectl/cmd/run/run.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cmd +package run import ( "context" diff --git a/pkg/kubectl/cmd/run_test.go b/pkg/kubectl/cmd/run/run_test.go similarity index 99% rename from pkg/kubectl/cmd/run_test.go rename to pkg/kubectl/cmd/run/run_test.go index e8a5c1d1b80..6862e0ff88d 100644 --- a/pkg/kubectl/cmd/run_test.go +++ b/pkg/kubectl/cmd/run/run_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cmd +package run import ( "bytes" diff --git a/pkg/kubectl/cmd/scale.go b/pkg/kubectl/cmd/scale/scale.go similarity index 94% rename from pkg/kubectl/cmd/scale.go rename to pkg/kubectl/cmd/scale/scale.go index eef3de67699..e442c56cd1d 100644 --- a/pkg/kubectl/cmd/scale.go +++ b/pkg/kubectl/cmd/scale/scale.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cmd +package scale import ( "fmt" @@ -32,7 +32,6 @@ import ( "k8s.io/client-go/kubernetes" batchclient "k8s.io/client-go/kubernetes/typed/batch/v1" "k8s.io/kubernetes/pkg/kubectl" - "k8s.io/kubernetes/pkg/kubectl/cmd/scalejob" "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/util/i18n" @@ -262,20 +261,20 @@ func (o *ScaleOptions) RunScale() error { } func ScaleJob(info *resource.Info, jobsClient batchclient.JobsGetter, count uint, preconditions *kubectl.ScalePrecondition, retry, waitForReplicas *kubectl.RetryParams) error { - scaler := scalejob.JobPsuedoScaler{ + scaler := JobPsuedoScaler{ JobsClient: jobsClient, } - var jobPreconditions *scalejob.ScalePrecondition + var jobPreconditions *ScalePrecondition if preconditions != nil { - jobPreconditions = &scalejob.ScalePrecondition{Size: preconditions.Size, ResourceVersion: preconditions.ResourceVersion} + jobPreconditions = &ScalePrecondition{Size: preconditions.Size, ResourceVersion: preconditions.ResourceVersion} } - var jobRetry *scalejob.RetryParams + var jobRetry *RetryParams if retry != nil { - jobRetry = &scalejob.RetryParams{Interval: retry.Interval, Timeout: retry.Timeout} + jobRetry = &RetryParams{Interval: retry.Interval, Timeout: retry.Timeout} } - var jobWaitForReplicas *scalejob.RetryParams + var jobWaitForReplicas *RetryParams if waitForReplicas != nil { - jobWaitForReplicas = &scalejob.RetryParams{Interval: waitForReplicas.Interval, Timeout: waitForReplicas.Timeout} + jobWaitForReplicas = &RetryParams{Interval: waitForReplicas.Interval, Timeout: waitForReplicas.Timeout} } return scaler.Scale(info.Namespace, info.Name, count, jobPreconditions, jobRetry, jobWaitForReplicas) diff --git a/pkg/kubectl/cmd/scalejob/scalejob.go b/pkg/kubectl/cmd/scale/scalejob.go similarity index 99% rename from pkg/kubectl/cmd/scalejob/scalejob.go rename to pkg/kubectl/cmd/scale/scalejob.go index 5324c33219b..590bc4d05eb 100644 --- a/pkg/kubectl/cmd/scalejob/scalejob.go +++ b/pkg/kubectl/cmd/scale/scalejob.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package scalejob +package scale import ( "fmt" diff --git a/pkg/kubectl/cmd/scalejob/scalejob_test.go b/pkg/kubectl/cmd/scale/scalejob_test.go similarity index 99% rename from pkg/kubectl/cmd/scalejob/scalejob_test.go rename to pkg/kubectl/cmd/scale/scalejob_test.go index 550f0b82873..ec1734cafa4 100644 --- a/pkg/kubectl/cmd/scalejob/scalejob_test.go +++ b/pkg/kubectl/cmd/scale/scalejob_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package scalejob +package scale import ( "errors" diff --git a/pkg/kubectl/cmd/scalejob/BUILD b/pkg/kubectl/cmd/scalejob/BUILD deleted file mode 100644 index a7147bc217f..00000000000 --- a/pkg/kubectl/cmd/scalejob/BUILD +++ /dev/null @@ -1,47 +0,0 @@ -load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") - -go_library( - name = "go_default_library", - srcs = [ - "doc.go", - "scalejob.go", - ], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/scalejob", - visibility = ["//visibility:public"], - deps = [ - "//staging/src/k8s.io/api/batch/v1:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library", - "//staging/src/k8s.io/client-go/kubernetes/typed/batch/v1:go_default_library", - ], -) - -go_test( - name = "go_default_test", - srcs = ["scalejob_test.go"], - embed = [":go_default_library"], - deps = [ - "//staging/src/k8s.io/api/batch/v1:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/apis/testapigroup/v1:go_default_library", - "//staging/src/k8s.io/client-go/kubernetes/fake:go_default_library", - "//staging/src/k8s.io/client-go/kubernetes/typed/batch/v1:go_default_library", - "//staging/src/k8s.io/client-go/testing:go_default_library", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], - visibility = ["//visibility:public"], -) diff --git a/pkg/kubectl/cmd/scalejob/doc.go b/pkg/kubectl/cmd/scalejob/doc.go deleted file mode 100644 index 589fa1a64ad..00000000000 --- a/pkg/kubectl/cmd/scalejob/doc.go +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2018 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -// Package scalejob is deprecated This package contains deprecated functions used to "scale" jobs in a way inconsistent with normal scaling rules -package scalejob diff --git a/pkg/kubectl/cmd/taint.go b/pkg/kubectl/cmd/taint/taint.go similarity index 99% rename from pkg/kubectl/cmd/taint.go rename to pkg/kubectl/cmd/taint/taint.go index 0227afbeb1d..7646b7da9a3 100644 --- a/pkg/kubectl/cmd/taint.go +++ b/pkg/kubectl/cmd/taint/taint.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cmd +package taint import ( "encoding/json" diff --git a/pkg/kubectl/cmd/taint_test.go b/pkg/kubectl/cmd/taint/taint_test.go similarity index 99% rename from pkg/kubectl/cmd/taint_test.go rename to pkg/kubectl/cmd/taint/taint_test.go index 05ecbf228b7..7b986734661 100644 --- a/pkg/kubectl/cmd/taint_test.go +++ b/pkg/kubectl/cmd/taint/taint_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cmd +package taint import ( "io/ioutil" diff --git a/pkg/kubectl/cmd/top.go b/pkg/kubectl/cmd/top/top.go similarity index 99% rename from pkg/kubectl/cmd/top.go rename to pkg/kubectl/cmd/top/top.go index 79608aa6777..a1830b9bd72 100644 --- a/pkg/kubectl/cmd/top.go +++ b/pkg/kubectl/cmd/top/top.go @@ -14,17 +14,17 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cmd +package top import ( + "github.com/spf13/cobra" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/cli-runtime/pkg/genericclioptions" + "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/util/i18n" metricsapi "k8s.io/metrics/pkg/apis/metrics" - - "github.com/spf13/cobra" - "k8s.io/cli-runtime/pkg/genericclioptions" - "k8s.io/kubernetes/pkg/kubectl/cmd/templates" ) var ( diff --git a/pkg/kubectl/cmd/top_node.go b/pkg/kubectl/cmd/top/top_node.go similarity index 99% rename from pkg/kubectl/cmd/top_node.go rename to pkg/kubectl/cmd/top/top_node.go index a60eaeacade..01ac151d16c 100644 --- a/pkg/kubectl/cmd/top_node.go +++ b/pkg/kubectl/cmd/top/top_node.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cmd +package top import ( "errors" diff --git a/pkg/kubectl/cmd/top_node_test.go b/pkg/kubectl/cmd/top/top_node_test.go similarity index 99% rename from pkg/kubectl/cmd/top_node_test.go rename to pkg/kubectl/cmd/top/top_node_test.go index ec81d7fd8e0..9fdbf4f54c0 100644 --- a/pkg/kubectl/cmd/top_node_test.go +++ b/pkg/kubectl/cmd/top/top_node_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cmd +package top import ( "bytes" diff --git a/pkg/kubectl/cmd/top_pod.go b/pkg/kubectl/cmd/top/top_pod.go similarity index 99% rename from pkg/kubectl/cmd/top_pod.go rename to pkg/kubectl/cmd/top/top_pod.go index 39efa624d4d..1e93be1c09d 100644 --- a/pkg/kubectl/cmd/top_pod.go +++ b/pkg/kubectl/cmd/top/top_pod.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cmd +package top import ( "errors" diff --git a/pkg/kubectl/cmd/top_pod_test.go b/pkg/kubectl/cmd/top/top_pod_test.go similarity index 99% rename from pkg/kubectl/cmd/top_pod_test.go rename to pkg/kubectl/cmd/top/top_pod_test.go index 96148c49e02..0b1f53fcf5a 100644 --- a/pkg/kubectl/cmd/top_pod_test.go +++ b/pkg/kubectl/cmd/top/top_pod_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cmd +package top import ( "bytes" diff --git a/pkg/kubectl/cmd/top_test.go b/pkg/kubectl/cmd/top/top_test.go similarity index 99% rename from pkg/kubectl/cmd/top_test.go rename to pkg/kubectl/cmd/top/top_test.go index 5e1302927fc..0bdf1b0838a 100644 --- a/pkg/kubectl/cmd/top_test.go +++ b/pkg/kubectl/cmd/top/top_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cmd +package top import ( "bytes" diff --git a/pkg/kubectl/cmd/version.go b/pkg/kubectl/cmd/version/version.go similarity index 99% rename from pkg/kubectl/cmd/version.go rename to pkg/kubectl/cmd/version/version.go index 7e616cbf8d5..8581b1c1c44 100644 --- a/pkg/kubectl/cmd/version.go +++ b/pkg/kubectl/cmd/version/version.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cmd +package version import ( "encoding/json"