From 0e0ea523392f1121f61f99ac30a9bc2043eaed90 Mon Sep 17 00:00:00 2001 From: Sean Sullivan Date: Thu, 1 Aug 2019 11:01:40 -0700 Subject: [PATCH 1/7] Move pkg/kubectl/cmd/{command} to staging --- {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/BUILD | 0 {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/alpha.go | 0 .../kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/annotate/BUILD | 0 .../src/k8s.io/kubectl/pkg}/cmd/annotate/annotate.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/annotate/annotate_test.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/apiresources/BUILD | 0 .../src/k8s.io/kubectl/pkg}/cmd/apiresources/apiresources.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/apiresources/apiversions.go | 0 {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/apply/BUILD | 0 .../kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/apply/apply.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/apply/apply_edit_last_applied.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/apply/apply_set_last_applied.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/apply/apply_test.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/apply/apply_view_last_applied.go | 0 {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/attach/BUILD | 0 .../src/k8s.io/kubectl/pkg}/cmd/attach/attach.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/attach/attach_test.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/autoscale/BUILD | 0 .../src/k8s.io/kubectl/pkg}/cmd/autoscale/autoscale.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/certificates/BUILD | 0 .../src/k8s.io/kubectl/pkg}/cmd/certificates/certificates.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/clusterinfo/BUILD | 0 .../src/k8s.io/kubectl/pkg}/cmd/clusterinfo/clusterinfo.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/clusterinfo/clusterinfo_dump.go | 0 .../k8s.io/kubectl/pkg}/cmd/clusterinfo/clusterinfo_dump_test.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/completion/BUILD | 0 .../src/k8s.io/kubectl/pkg}/cmd/completion/completion.go | 0 {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/config/BUILD | 0 .../src/k8s.io/kubectl/pkg}/cmd/config/config.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/config/config_test.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/config/create_authinfo.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/config/create_authinfo_test.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/config/create_cluster.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/config/create_cluster_test.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/config/create_context.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/config/create_context_test.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/config/current_context.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/config/current_context_test.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/config/delete_cluster.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/config/delete_cluster_test.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/config/delete_context.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/config/delete_context_test.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/config/get_clusters.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/config/get_clusters_test.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/config/get_contexts.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/config/get_contexts_test.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/config/navigation_step_parser.go | 0 .../k8s.io/kubectl/pkg}/cmd/config/navigation_step_parser_test.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/config/rename_context.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/config/rename_context_test.go | 0 {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/config/set.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/config/set_test.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/config/unset.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/config/unset_test.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/config/use_context.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/config/use_context_test.go | 0 .../kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/config/view.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/config/view_test.go | 0 {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/cp/BUILD | 0 {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/cp/cp.go | 0 {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/cp/cp_test.go | 0 {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/create/BUILD | 0 .../src/k8s.io/kubectl/pkg}/cmd/create/create.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/create/create_clusterrole.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/create/create_clusterrole_test.go | 0 .../k8s.io/kubectl/pkg}/cmd/create/create_clusterrolebinding.go | 0 .../kubectl/pkg}/cmd/create/create_clusterrolebinding_test.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/create/create_configmap.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/create/create_configmap_test.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/create/create_cronjob.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/create/create_cronjob_test.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/create/create_deployment.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/create/create_deployment_test.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/create/create_job.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/create/create_job_test.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/create/create_namespace.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/create/create_namespace_test.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/create/create_pdb.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/create/create_pdb_test.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/create/create_priorityclass.go | 0 .../k8s.io/kubectl/pkg}/cmd/create/create_priorityclass_test.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/create/create_quota.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/create/create_quota_test.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/create/create_role.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/create/create_role_test.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/create/create_rolebinding.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/create/create_rolebinding_test.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/create/create_secret.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/create/create_secret_test.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/create/create_service.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/create/create_service_test.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/create/create_serviceaccount.go | 0 .../k8s.io/kubectl/pkg}/cmd/create/create_serviceaccount_test.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/create/create_test.go | 0 {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/delete/BUILD | 0 .../src/k8s.io/kubectl/pkg}/cmd/delete/delete.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/delete/delete_flags.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/delete/delete_test.go | 0 .../kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/describe/BUILD | 0 .../src/k8s.io/kubectl/pkg}/cmd/describe/describe.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/describe/describe_test.go | 0 {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/diff/BUILD | 0 {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/diff/diff.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/diff/diff_test.go | 0 {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/drain/BUILD | 0 .../kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/drain/drain.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/drain/drain_test.go | 0 {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/BUILD | 0 {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/edit.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/edit/edit_test.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/edit/testdata/BUILD | 0 .../src/k8s.io/kubectl/pkg}/cmd/edit/testdata/README | 0 .../src/k8s.io/kubectl/pkg}/cmd/edit/testdata/record.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/edit/testdata/record_editor.sh | 0 .../src/k8s.io/kubectl/pkg}/cmd/edit/testdata/record_testcase.sh | 0 .../src/k8s.io/kubectl/pkg}/cmd/edit/testdata/test_editor.sh | 0 .../testdata/testcase-apply-edit-last-applied-list-fail/0.request | 0 .../testcase-apply-edit-last-applied-list-fail/0.response | 0 .../testdata/testcase-apply-edit-last-applied-list-fail/1.request | 0 .../testcase-apply-edit-last-applied-list-fail/1.response | 0 .../testdata/testcase-apply-edit-last-applied-list-fail/2.edited | 0 .../testcase-apply-edit-last-applied-list-fail/2.original | 0 .../testdata/testcase-apply-edit-last-applied-list-fail/3.edited | 0 .../testcase-apply-edit-last-applied-list-fail/3.original | 0 .../testdata/testcase-apply-edit-last-applied-list-fail/4.request | 0 .../testcase-apply-edit-last-applied-list-fail/4.response | 0 .../testdata/testcase-apply-edit-last-applied-list-fail/5.request | 0 .../testcase-apply-edit-last-applied-list-fail/5.response | 0 .../testdata/testcase-apply-edit-last-applied-list-fail/test.yaml | 0 .../edit/testdata/testcase-apply-edit-last-applied-list/0.request | 0 .../testdata/testcase-apply-edit-last-applied-list/0.response | 0 .../edit/testdata/testcase-apply-edit-last-applied-list/1.request | 0 .../testdata/testcase-apply-edit-last-applied-list/1.response | 0 .../edit/testdata/testcase-apply-edit-last-applied-list/2.edited | 0 .../testdata/testcase-apply-edit-last-applied-list/2.original | 0 .../edit/testdata/testcase-apply-edit-last-applied-list/3.request | 0 .../testdata/testcase-apply-edit-last-applied-list/3.response | 0 .../edit/testdata/testcase-apply-edit-last-applied-list/4.request | 0 .../testdata/testcase-apply-edit-last-applied-list/4.response | 0 .../edit/testdata/testcase-apply-edit-last-applied-list/test.yaml | 0 .../testcase-apply-edit-last-applied-syntax-error/0.request | 0 .../testcase-apply-edit-last-applied-syntax-error/0.response | 0 .../testcase-apply-edit-last-applied-syntax-error/1.edited | 0 .../testcase-apply-edit-last-applied-syntax-error/1.original | 0 .../testcase-apply-edit-last-applied-syntax-error/2.edited | 0 .../testcase-apply-edit-last-applied-syntax-error/2.original | 0 .../testcase-apply-edit-last-applied-syntax-error/3.request | 0 .../testcase-apply-edit-last-applied-syntax-error/3.response | 0 .../testcase-apply-edit-last-applied-syntax-error/test.yaml | 0 .../cmd/edit/testdata/testcase-apply-edit-last-applied/0.request | 0 .../cmd/edit/testdata/testcase-apply-edit-last-applied/0.response | 0 .../cmd/edit/testdata/testcase-apply-edit-last-applied/1.edited | 0 .../cmd/edit/testdata/testcase-apply-edit-last-applied/1.original | 0 .../cmd/edit/testdata/testcase-apply-edit-last-applied/2.request | 0 .../cmd/edit/testdata/testcase-apply-edit-last-applied/2.response | 0 .../cmd/edit/testdata/testcase-apply-edit-last-applied/test.yaml | 0 .../pkg}/cmd/edit/testdata/testcase-create-list-error/0.edited | 0 .../pkg}/cmd/edit/testdata/testcase-create-list-error/0.original | 0 .../pkg}/cmd/edit/testdata/testcase-create-list-error/1.request | 0 .../pkg}/cmd/edit/testdata/testcase-create-list-error/1.response | 0 .../pkg}/cmd/edit/testdata/testcase-create-list-error/2.edited | 0 .../pkg}/cmd/edit/testdata/testcase-create-list-error/2.original | 0 .../pkg}/cmd/edit/testdata/testcase-create-list-error/3.request | 0 .../pkg}/cmd/edit/testdata/testcase-create-list-error/3.response | 0 .../pkg}/cmd/edit/testdata/testcase-create-list-error/svc.yaml | 0 .../pkg}/cmd/edit/testdata/testcase-create-list-error/test.yaml | 0 .../kubectl/pkg}/cmd/edit/testdata/testcase-create-list/0.edited | 0 .../pkg}/cmd/edit/testdata/testcase-create-list/0.original | 0 .../kubectl/pkg}/cmd/edit/testdata/testcase-create-list/1.request | 0 .../pkg}/cmd/edit/testdata/testcase-create-list/1.response | 0 .../kubectl/pkg}/cmd/edit/testdata/testcase-create-list/2.edited | 0 .../pkg}/cmd/edit/testdata/testcase-create-list/2.original | 0 .../kubectl/pkg}/cmd/edit/testdata/testcase-create-list/3.request | 0 .../pkg}/cmd/edit/testdata/testcase-create-list/3.response | 0 .../kubectl/pkg}/cmd/edit/testdata/testcase-create-list/svc.yaml | 0 .../kubectl/pkg}/cmd/edit/testdata/testcase-create-list/test.yaml | 0 .../pkg}/cmd/edit/testdata/testcase-edit-error-reedit/0.request | 0 .../pkg}/cmd/edit/testdata/testcase-edit-error-reedit/0.response | 0 .../pkg}/cmd/edit/testdata/testcase-edit-error-reedit/1.edited | 0 .../pkg}/cmd/edit/testdata/testcase-edit-error-reedit/1.original | 0 .../pkg}/cmd/edit/testdata/testcase-edit-error-reedit/2.request | 0 .../pkg}/cmd/edit/testdata/testcase-edit-error-reedit/2.response | 0 .../pkg}/cmd/edit/testdata/testcase-edit-error-reedit/3.edited | 0 .../pkg}/cmd/edit/testdata/testcase-edit-error-reedit/3.original | 0 .../pkg}/cmd/edit/testdata/testcase-edit-error-reedit/4.request | 0 .../pkg}/cmd/edit/testdata/testcase-edit-error-reedit/4.response | 0 .../pkg}/cmd/edit/testdata/testcase-edit-error-reedit/test.yaml | 0 .../pkg}/cmd/edit/testdata/testcase-edit-from-empty/0.request | 0 .../pkg}/cmd/edit/testdata/testcase-edit-from-empty/0.response | 0 .../pkg}/cmd/edit/testdata/testcase-edit-from-empty/test.yaml | 0 .../pkg}/cmd/edit/testdata/testcase-edit-output-patch/0.request | 0 .../pkg}/cmd/edit/testdata/testcase-edit-output-patch/0.response | 0 .../pkg}/cmd/edit/testdata/testcase-edit-output-patch/1.edited | 0 .../pkg}/cmd/edit/testdata/testcase-edit-output-patch/1.original | 0 .../pkg}/cmd/edit/testdata/testcase-edit-output-patch/2.request | 0 .../pkg}/cmd/edit/testdata/testcase-edit-output-patch/2.response | 0 .../pkg}/cmd/edit/testdata/testcase-edit-output-patch/test.yaml | 0 .../pkg}/cmd/edit/testdata/testcase-immutable-name/0.request | 0 .../pkg}/cmd/edit/testdata/testcase-immutable-name/0.response | 0 .../pkg}/cmd/edit/testdata/testcase-immutable-name/1.edited | 0 .../pkg}/cmd/edit/testdata/testcase-immutable-name/1.original | 0 .../pkg}/cmd/edit/testdata/testcase-immutable-name/test.yaml | 0 .../kubectl/pkg}/cmd/edit/testdata/testcase-list-errors/0.request | 0 .../pkg}/cmd/edit/testdata/testcase-list-errors/0.response | 0 .../kubectl/pkg}/cmd/edit/testdata/testcase-list-errors/1.request | 0 .../pkg}/cmd/edit/testdata/testcase-list-errors/1.response | 0 .../pkg}/cmd/edit/testdata/testcase-list-errors/10.request | 0 .../pkg}/cmd/edit/testdata/testcase-list-errors/10.response | 0 .../kubectl/pkg}/cmd/edit/testdata/testcase-list-errors/2.edited | 0 .../pkg}/cmd/edit/testdata/testcase-list-errors/2.original | 0 .../kubectl/pkg}/cmd/edit/testdata/testcase-list-errors/3.request | 0 .../pkg}/cmd/edit/testdata/testcase-list-errors/3.response | 0 .../kubectl/pkg}/cmd/edit/testdata/testcase-list-errors/4.request | 0 .../pkg}/cmd/edit/testdata/testcase-list-errors/4.response | 0 .../kubectl/pkg}/cmd/edit/testdata/testcase-list-errors/5.edited | 0 .../pkg}/cmd/edit/testdata/testcase-list-errors/5.original | 0 .../kubectl/pkg}/cmd/edit/testdata/testcase-list-errors/6.request | 0 .../pkg}/cmd/edit/testdata/testcase-list-errors/6.response | 0 .../kubectl/pkg}/cmd/edit/testdata/testcase-list-errors/7.request | 0 .../pkg}/cmd/edit/testdata/testcase-list-errors/7.response | 0 .../kubectl/pkg}/cmd/edit/testdata/testcase-list-errors/8.edited | 0 .../pkg}/cmd/edit/testdata/testcase-list-errors/8.original | 0 .../kubectl/pkg}/cmd/edit/testdata/testcase-list-errors/9.request | 0 .../pkg}/cmd/edit/testdata/testcase-list-errors/9.response | 0 .../kubectl/pkg}/cmd/edit/testdata/testcase-list-errors/test.yaml | 0 .../kubectl/pkg}/cmd/edit/testdata/testcase-list-record/0.request | 0 .../pkg}/cmd/edit/testdata/testcase-list-record/0.response | 0 .../kubectl/pkg}/cmd/edit/testdata/testcase-list-record/1.request | 0 .../pkg}/cmd/edit/testdata/testcase-list-record/1.response | 0 .../kubectl/pkg}/cmd/edit/testdata/testcase-list-record/2.edited | 0 .../pkg}/cmd/edit/testdata/testcase-list-record/2.original | 0 .../kubectl/pkg}/cmd/edit/testdata/testcase-list-record/3.request | 0 .../pkg}/cmd/edit/testdata/testcase-list-record/3.response | 0 .../kubectl/pkg}/cmd/edit/testdata/testcase-list-record/4.request | 0 .../pkg}/cmd/edit/testdata/testcase-list-record/4.response | 0 .../kubectl/pkg}/cmd/edit/testdata/testcase-list-record/test.yaml | 0 .../k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-list/0.request | 0 .../kubectl/pkg}/cmd/edit/testdata/testcase-list/0.response | 0 .../k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-list/1.request | 0 .../kubectl/pkg}/cmd/edit/testdata/testcase-list/1.response | 0 .../k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-list/2.edited | 0 .../kubectl/pkg}/cmd/edit/testdata/testcase-list/2.original | 0 .../k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-list/3.request | 0 .../kubectl/pkg}/cmd/edit/testdata/testcase-list/3.response | 0 .../k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-list/4.request | 0 .../kubectl/pkg}/cmd/edit/testdata/testcase-list/4.response | 0 .../k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-list/test.yaml | 0 .../pkg}/cmd/edit/testdata/testcase-missing-service/0.request | 0 .../pkg}/cmd/edit/testdata/testcase-missing-service/0.response | 0 .../pkg}/cmd/edit/testdata/testcase-missing-service/test.yaml | 0 .../kubectl/pkg}/cmd/edit/testdata/testcase-no-op/0.request | 0 .../kubectl/pkg}/cmd/edit/testdata/testcase-no-op/0.response | 0 .../k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-no-op/1.edited | 0 .../kubectl/pkg}/cmd/edit/testdata/testcase-no-op/1.original | 0 .../kubectl/pkg}/cmd/edit/testdata/testcase-no-op/test.yaml | 0 .../cmd/edit/testdata/testcase-not-update-annotation/0.request | 0 .../cmd/edit/testdata/testcase-not-update-annotation/0.response | 0 .../cmd/edit/testdata/testcase-not-update-annotation/1.edited | 0 .../cmd/edit/testdata/testcase-not-update-annotation/1.original | 0 .../cmd/edit/testdata/testcase-not-update-annotation/2.request | 0 .../cmd/edit/testdata/testcase-not-update-annotation/2.response | 0 .../cmd/edit/testdata/testcase-not-update-annotation/test.yaml | 0 .../pkg}/cmd/edit/testdata/testcase-repeat-error/0.request | 0 .../pkg}/cmd/edit/testdata/testcase-repeat-error/0.response | 0 .../kubectl/pkg}/cmd/edit/testdata/testcase-repeat-error/1.edited | 0 .../pkg}/cmd/edit/testdata/testcase-repeat-error/1.original | 0 .../pkg}/cmd/edit/testdata/testcase-repeat-error/2.request | 0 .../pkg}/cmd/edit/testdata/testcase-repeat-error/2.response | 0 .../kubectl/pkg}/cmd/edit/testdata/testcase-repeat-error/3.edited | 0 .../pkg}/cmd/edit/testdata/testcase-repeat-error/3.original | 0 .../pkg}/cmd/edit/testdata/testcase-repeat-error/test.yaml | 0 .../pkg}/cmd/edit/testdata/testcase-schemaless-list/0.request | 0 .../pkg}/cmd/edit/testdata/testcase-schemaless-list/0.response | 0 .../pkg}/cmd/edit/testdata/testcase-schemaless-list/1.request | 0 .../pkg}/cmd/edit/testdata/testcase-schemaless-list/1.response | 0 .../pkg}/cmd/edit/testdata/testcase-schemaless-list/2.request | 0 .../pkg}/cmd/edit/testdata/testcase-schemaless-list/2.response | 0 .../pkg}/cmd/edit/testdata/testcase-schemaless-list/3.edited | 0 .../pkg}/cmd/edit/testdata/testcase-schemaless-list/3.original | 0 .../pkg}/cmd/edit/testdata/testcase-schemaless-list/4.request | 0 .../pkg}/cmd/edit/testdata/testcase-schemaless-list/4.response | 0 .../pkg}/cmd/edit/testdata/testcase-schemaless-list/5.request | 0 .../pkg}/cmd/edit/testdata/testcase-schemaless-list/5.response | 0 .../pkg}/cmd/edit/testdata/testcase-schemaless-list/6.request | 0 .../pkg}/cmd/edit/testdata/testcase-schemaless-list/6.response | 0 .../pkg}/cmd/edit/testdata/testcase-schemaless-list/test.yaml | 0 .../pkg}/cmd/edit/testdata/testcase-single-service/0.request | 0 .../pkg}/cmd/edit/testdata/testcase-single-service/0.response | 0 .../pkg}/cmd/edit/testdata/testcase-single-service/1.edited | 0 .../pkg}/cmd/edit/testdata/testcase-single-service/1.original | 0 .../pkg}/cmd/edit/testdata/testcase-single-service/2.request | 0 .../pkg}/cmd/edit/testdata/testcase-single-service/2.response | 0 .../pkg}/cmd/edit/testdata/testcase-single-service/test.yaml | 0 .../pkg}/cmd/edit/testdata/testcase-syntax-error/0.request | 0 .../pkg}/cmd/edit/testdata/testcase-syntax-error/0.response | 0 .../kubectl/pkg}/cmd/edit/testdata/testcase-syntax-error/1.edited | 0 .../pkg}/cmd/edit/testdata/testcase-syntax-error/1.original | 0 .../kubectl/pkg}/cmd/edit/testdata/testcase-syntax-error/2.edited | 0 .../pkg}/cmd/edit/testdata/testcase-syntax-error/2.original | 0 .../pkg}/cmd/edit/testdata/testcase-syntax-error/3.request | 0 .../pkg}/cmd/edit/testdata/testcase-syntax-error/3.response | 0 .../pkg}/cmd/edit/testdata/testcase-syntax-error/test.yaml | 0 .../testdata/testcase-unknown-field-known-group-kind/0.request | 0 .../testdata/testcase-unknown-field-known-group-kind/0.response | 0 .../testdata/testcase-unknown-field-known-group-kind/1.edited | 0 .../testdata/testcase-unknown-field-known-group-kind/1.original | 0 .../testdata/testcase-unknown-field-known-group-kind/2.request | 0 .../testdata/testcase-unknown-field-known-group-kind/2.response | 0 .../testdata/testcase-unknown-field-known-group-kind/test.yaml | 0 .../testdata/testcase-unknown-version-known-group-kind/0.request | 0 .../testdata/testcase-unknown-version-known-group-kind/0.response | 0 .../testdata/testcase-unknown-version-known-group-kind/1.edited | 0 .../testdata/testcase-unknown-version-known-group-kind/1.original | 0 .../testdata/testcase-unknown-version-known-group-kind/2.request | 0 .../testdata/testcase-unknown-version-known-group-kind/2.response | 0 .../testdata/testcase-unknown-version-known-group-kind/test.yaml | 0 .../pkg}/cmd/edit/testdata/testcase-update-annotation/0.request | 0 .../pkg}/cmd/edit/testdata/testcase-update-annotation/0.response | 0 .../pkg}/cmd/edit/testdata/testcase-update-annotation/1.edited | 0 .../pkg}/cmd/edit/testdata/testcase-update-annotation/1.original | 0 .../pkg}/cmd/edit/testdata/testcase-update-annotation/2.request | 0 .../pkg}/cmd/edit/testdata/testcase-update-annotation/2.response | 0 .../pkg}/cmd/edit/testdata/testcase-update-annotation/test.yaml | 0 {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/exec/BUILD | 0 {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/exec/exec.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/exec/exec_test.go | 0 {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/explain/BUILD | 0 .../src/k8s.io/kubectl/pkg}/cmd/explain/explain.go | 0 {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/expose/BUILD | 0 .../src/k8s.io/kubectl/pkg}/cmd/expose/expose.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/expose/expose_test.go | 0 {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/help/BUILD | 0 {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/help/help.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/kustomize/BUILD | 0 .../src/k8s.io/kubectl/pkg}/cmd/kustomize/kustomize.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/kustomize/kustomize_test.go | 0 {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/label/BUILD | 0 .../kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/label/label.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/label/label_test.go | 0 {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/logs/BUILD | 0 {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/logs/logs.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/logs/logs_test.go | 0 {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/options/BUILD | 0 .../src/k8s.io/kubectl/pkg}/cmd/options/options.go | 0 {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/patch/BUILD | 0 .../kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/patch/patch.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/patch/patch_test.go | 0 {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/plugin/BUILD | 0 .../src/k8s.io/kubectl/pkg}/cmd/plugin/plugin.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/plugin/plugin_test.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/plugin/testdata/kubectl-foo | 0 .../src/k8s.io/kubectl/pkg}/cmd/plugin/testdata/kubectl-version | 0 .../src/k8s.io/kubectl/pkg}/cmd/portforward/BUILD | 0 .../src/k8s.io/kubectl/pkg}/cmd/portforward/portforward.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/portforward/portforward_test.go | 0 {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/profiling.go | 0 {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/proxy/BUILD | 0 .../kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/proxy/proxy.go | 0 {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/replace/BUILD | 0 .../src/k8s.io/kubectl/pkg}/cmd/replace/replace.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/replace/replace_test.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/rollingupdate/BUILD | 0 .../src/k8s.io/kubectl/pkg}/cmd/rollingupdate/rolling_updater.go | 0 .../k8s.io/kubectl/pkg}/cmd/rollingupdate/rolling_updater_test.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/rollingupdate/rollingupdate.go | 0 .../k8s.io/kubectl/pkg}/cmd/rollingupdate/rollingupdate_test.go | 0 {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/rollout/BUILD | 0 .../src/k8s.io/kubectl/pkg}/cmd/rollout/rollout.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/rollout/rollout_history.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/rollout/rollout_pause.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/rollout/rollout_pause_test.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/rollout/rollout_restart.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/rollout/rollout_resume.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/rollout/rollout_status.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/rollout/rollout_undo.go | 0 {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/run/BUILD | 0 {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/run/run.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/run/run_test.go | 0 {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/scale/BUILD | 0 .../kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/scale/scale.go | 0 {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/set/BUILD | 0 {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/set/env/BUILD | 0 .../kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/set/env/doc.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/set/env/env_parse.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/set/env/env_parse_test.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/set/env/env_resolve.go | 0 {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/set/helper.go | 0 {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/set/set.go | 0 .../kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/set/set_env.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/set/set_env_test.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/set/set_image.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/set/set_image_test.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/set/set_resources.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/set/set_resources_test.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/set/set_selector.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/set/set_selector_test.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/set/set_serviceaccount.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/set/set_serviceaccount_test.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/set/set_subject.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/set/set_subject_test.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/set/set_test.go | 0 {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/taint/BUILD | 0 .../kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/taint/taint.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/taint/taint_test.go | 0 .../kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/taint/utils.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/taint/utils_test.go | 0 {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/testing/BUILD | 0 .../src/k8s.io/kubectl/pkg}/cmd/testing/fake.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/testing/interfaces.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/testing/util.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/testing/zz_generated.deepcopy.go | 0 {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/top/BUILD | 0 {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/top/top.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/top/top_node.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/top/top_node_test.go | 0 .../kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/top/top_pod.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/top/top_pod_test.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/top/top_test.go | 0 {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/version/BUILD | 0 .../src/k8s.io/kubectl/pkg}/cmd/version/version.go | 0 {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/wait/BUILD | 0 {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/wait/wait.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/wait/wait_test.go | 0 423 files changed, 0 insertions(+), 0 deletions(-) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/BUILD (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/alpha.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/annotate/BUILD (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/annotate/annotate.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/annotate/annotate_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/apiresources/BUILD (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/apiresources/apiresources.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/apiresources/apiversions.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/apply/BUILD (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/apply/apply.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/apply/apply_edit_last_applied.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/apply/apply_set_last_applied.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/apply/apply_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/apply/apply_view_last_applied.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/attach/BUILD (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/attach/attach.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/attach/attach_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/autoscale/BUILD (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/autoscale/autoscale.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/certificates/BUILD (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/certificates/certificates.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/clusterinfo/BUILD (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/clusterinfo/clusterinfo.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/clusterinfo/clusterinfo_dump.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/clusterinfo/clusterinfo_dump_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/completion/BUILD (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/completion/completion.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/config/BUILD (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/config/config.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/config/config_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/config/create_authinfo.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/config/create_authinfo_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/config/create_cluster.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/config/create_cluster_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/config/create_context.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/config/create_context_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/config/current_context.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/config/current_context_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/config/delete_cluster.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/config/delete_cluster_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/config/delete_context.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/config/delete_context_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/config/get_clusters.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/config/get_clusters_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/config/get_contexts.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/config/get_contexts_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/config/navigation_step_parser.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/config/navigation_step_parser_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/config/rename_context.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/config/rename_context_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/config/set.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/config/set_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/config/unset.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/config/unset_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/config/use_context.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/config/use_context_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/config/view.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/config/view_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/cp/BUILD (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/cp/cp.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/cp/cp_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/create/BUILD (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/create/create.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/create/create_clusterrole.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/create/create_clusterrole_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/create/create_clusterrolebinding.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/create/create_clusterrolebinding_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/create/create_configmap.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/create/create_configmap_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/create/create_cronjob.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/create/create_cronjob_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/create/create_deployment.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/create/create_deployment_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/create/create_job.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/create/create_job_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/create/create_namespace.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/create/create_namespace_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/create/create_pdb.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/create/create_pdb_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/create/create_priorityclass.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/create/create_priorityclass_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/create/create_quota.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/create/create_quota_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/create/create_role.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/create/create_role_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/create/create_rolebinding.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/create/create_rolebinding_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/create/create_secret.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/create/create_secret_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/create/create_service.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/create/create_service_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/create/create_serviceaccount.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/create/create_serviceaccount_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/create/create_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/delete/BUILD (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/delete/delete.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/delete/delete_flags.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/delete/delete_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/describe/BUILD (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/describe/describe.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/describe/describe_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/diff/BUILD (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/diff/diff.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/diff/diff_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/drain/BUILD (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/drain/drain.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/drain/drain_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/BUILD (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/edit.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/edit_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/BUILD (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/README (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/record.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/record_editor.sh (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/record_testcase.sh (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/test_editor.sh (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/0.request (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/0.response (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/1.request (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/1.response (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/2.edited (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/2.original (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/3.edited (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/3.original (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/4.request (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/4.response (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/5.request (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/5.response (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/test.yaml (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-apply-edit-last-applied-list/0.request (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-apply-edit-last-applied-list/0.response (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-apply-edit-last-applied-list/1.request (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-apply-edit-last-applied-list/1.response (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-apply-edit-last-applied-list/2.edited (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-apply-edit-last-applied-list/2.original (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-apply-edit-last-applied-list/3.request (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-apply-edit-last-applied-list/3.response (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-apply-edit-last-applied-list/4.request (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-apply-edit-last-applied-list/4.response (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-apply-edit-last-applied-list/test.yaml (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-apply-edit-last-applied-syntax-error/0.request (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-apply-edit-last-applied-syntax-error/0.response (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-apply-edit-last-applied-syntax-error/1.edited (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-apply-edit-last-applied-syntax-error/1.original (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-apply-edit-last-applied-syntax-error/2.edited (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-apply-edit-last-applied-syntax-error/2.original (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-apply-edit-last-applied-syntax-error/3.request (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-apply-edit-last-applied-syntax-error/3.response (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-apply-edit-last-applied-syntax-error/test.yaml (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-apply-edit-last-applied/0.request (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-apply-edit-last-applied/0.response (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-apply-edit-last-applied/1.edited (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-apply-edit-last-applied/1.original (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-apply-edit-last-applied/2.request (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-apply-edit-last-applied/2.response (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-apply-edit-last-applied/test.yaml (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-create-list-error/0.edited (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-create-list-error/0.original (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-create-list-error/1.request (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-create-list-error/1.response (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-create-list-error/2.edited (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-create-list-error/2.original (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-create-list-error/3.request (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-create-list-error/3.response (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-create-list-error/svc.yaml (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-create-list-error/test.yaml (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-create-list/0.edited (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-create-list/0.original (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-create-list/1.request (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-create-list/1.response (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-create-list/2.edited (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-create-list/2.original (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-create-list/3.request (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-create-list/3.response (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-create-list/svc.yaml (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-create-list/test.yaml (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-edit-error-reedit/0.request (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-edit-error-reedit/0.response (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-edit-error-reedit/1.edited (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-edit-error-reedit/1.original (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-edit-error-reedit/2.request (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-edit-error-reedit/2.response (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-edit-error-reedit/3.edited (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-edit-error-reedit/3.original (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-edit-error-reedit/4.request (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-edit-error-reedit/4.response (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-edit-error-reedit/test.yaml (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-edit-from-empty/0.request (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-edit-from-empty/0.response (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-edit-from-empty/test.yaml (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-edit-output-patch/0.request (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-edit-output-patch/0.response (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-edit-output-patch/1.edited (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-edit-output-patch/1.original (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-edit-output-patch/2.request (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-edit-output-patch/2.response (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-edit-output-patch/test.yaml (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-immutable-name/0.request (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-immutable-name/0.response (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-immutable-name/1.edited (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-immutable-name/1.original (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-immutable-name/test.yaml (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-list-errors/0.request (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-list-errors/0.response (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-list-errors/1.request (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-list-errors/1.response (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-list-errors/10.request (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-list-errors/10.response (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-list-errors/2.edited (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-list-errors/2.original (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-list-errors/3.request (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-list-errors/3.response (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-list-errors/4.request (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-list-errors/4.response (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-list-errors/5.edited (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-list-errors/5.original (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-list-errors/6.request (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-list-errors/6.response (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-list-errors/7.request (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-list-errors/7.response (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-list-errors/8.edited (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-list-errors/8.original (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-list-errors/9.request (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-list-errors/9.response (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-list-errors/test.yaml (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-list-record/0.request (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-list-record/0.response (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-list-record/1.request (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-list-record/1.response (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-list-record/2.edited (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-list-record/2.original (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-list-record/3.request (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-list-record/3.response (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-list-record/4.request (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-list-record/4.response (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-list-record/test.yaml (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-list/0.request (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-list/0.response (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-list/1.request (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-list/1.response (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-list/2.edited (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-list/2.original (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-list/3.request (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-list/3.response (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-list/4.request (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-list/4.response (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-list/test.yaml (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-missing-service/0.request (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-missing-service/0.response (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-missing-service/test.yaml (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-no-op/0.request (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-no-op/0.response (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-no-op/1.edited (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-no-op/1.original (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-no-op/test.yaml (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-not-update-annotation/0.request (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-not-update-annotation/0.response (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-not-update-annotation/1.edited (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-not-update-annotation/1.original (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-not-update-annotation/2.request (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-not-update-annotation/2.response (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-not-update-annotation/test.yaml (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-repeat-error/0.request (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-repeat-error/0.response (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-repeat-error/1.edited (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-repeat-error/1.original (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-repeat-error/2.request (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-repeat-error/2.response (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-repeat-error/3.edited (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-repeat-error/3.original (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-repeat-error/test.yaml (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-schemaless-list/0.request (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-schemaless-list/0.response (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-schemaless-list/1.request (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-schemaless-list/1.response (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-schemaless-list/2.request (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-schemaless-list/2.response (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-schemaless-list/3.edited (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-schemaless-list/3.original (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-schemaless-list/4.request (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-schemaless-list/4.response (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-schemaless-list/5.request (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-schemaless-list/5.response (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-schemaless-list/6.request (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-schemaless-list/6.response (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-schemaless-list/test.yaml (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-single-service/0.request (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-single-service/0.response (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-single-service/1.edited (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-single-service/1.original (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-single-service/2.request (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-single-service/2.response (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-single-service/test.yaml (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-syntax-error/0.request (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-syntax-error/0.response (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-syntax-error/1.edited (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-syntax-error/1.original (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-syntax-error/2.edited (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-syntax-error/2.original (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-syntax-error/3.request (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-syntax-error/3.response (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-syntax-error/test.yaml (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-unknown-field-known-group-kind/0.request (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-unknown-field-known-group-kind/0.response (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-unknown-field-known-group-kind/1.edited (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-unknown-field-known-group-kind/1.original (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-unknown-field-known-group-kind/2.request (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-unknown-field-known-group-kind/2.response (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-unknown-field-known-group-kind/test.yaml (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-unknown-version-known-group-kind/0.request (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-unknown-version-known-group-kind/0.response (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-unknown-version-known-group-kind/1.edited (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-unknown-version-known-group-kind/1.original (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-unknown-version-known-group-kind/2.request (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-unknown-version-known-group-kind/2.response (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-unknown-version-known-group-kind/test.yaml (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-update-annotation/0.request (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-update-annotation/0.response (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-update-annotation/1.edited (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-update-annotation/1.original (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-update-annotation/2.request (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-update-annotation/2.response (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/edit/testdata/testcase-update-annotation/test.yaml (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/exec/BUILD (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/exec/exec.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/exec/exec_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/explain/BUILD (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/explain/explain.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/expose/BUILD (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/expose/expose.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/expose/expose_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/help/BUILD (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/help/help.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/kustomize/BUILD (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/kustomize/kustomize.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/kustomize/kustomize_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/label/BUILD (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/label/label.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/label/label_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/logs/BUILD (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/logs/logs.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/logs/logs_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/options/BUILD (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/options/options.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/patch/BUILD (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/patch/patch.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/patch/patch_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/plugin/BUILD (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/plugin/plugin.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/plugin/plugin_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/plugin/testdata/kubectl-foo (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/plugin/testdata/kubectl-version (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/portforward/BUILD (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/portforward/portforward.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/portforward/portforward_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/profiling.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/proxy/BUILD (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/proxy/proxy.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/replace/BUILD (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/replace/replace.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/replace/replace_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/rollingupdate/BUILD (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/rollingupdate/rolling_updater.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/rollingupdate/rolling_updater_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/rollingupdate/rollingupdate.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/rollingupdate/rollingupdate_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/rollout/BUILD (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/rollout/rollout.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/rollout/rollout_history.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/rollout/rollout_pause.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/rollout/rollout_pause_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/rollout/rollout_restart.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/rollout/rollout_resume.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/rollout/rollout_status.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/rollout/rollout_undo.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/run/BUILD (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/run/run.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/run/run_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/scale/BUILD (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/scale/scale.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/set/BUILD (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/set/env/BUILD (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/set/env/doc.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/set/env/env_parse.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/set/env/env_parse_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/set/env/env_resolve.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/set/helper.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/set/set.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/set/set_env.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/set/set_env_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/set/set_image.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/set/set_image_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/set/set_resources.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/set/set_resources_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/set/set_selector.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/set/set_selector_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/set/set_serviceaccount.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/set/set_serviceaccount_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/set/set_subject.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/set/set_subject_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/set/set_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/taint/BUILD (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/taint/taint.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/taint/taint_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/taint/utils.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/taint/utils_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/testing/BUILD (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/testing/fake.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/testing/interfaces.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/testing/util.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/testing/zz_generated.deepcopy.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/top/BUILD (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/top/top.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/top/top_node.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/top/top_node_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/top/top_pod.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/top/top_pod_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/top/top_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/version/BUILD (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/version/version.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/wait/BUILD (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/wait/wait.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/wait/wait_test.go (100%) diff --git a/pkg/kubectl/cmd/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/BUILD similarity index 100% rename from pkg/kubectl/cmd/BUILD rename to staging/src/k8s.io/kubectl/pkg/cmd/BUILD diff --git a/pkg/kubectl/cmd/alpha.go b/staging/src/k8s.io/kubectl/pkg/cmd/alpha.go similarity index 100% rename from pkg/kubectl/cmd/alpha.go rename to staging/src/k8s.io/kubectl/pkg/cmd/alpha.go diff --git a/pkg/kubectl/cmd/annotate/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/annotate/BUILD similarity index 100% rename from pkg/kubectl/cmd/annotate/BUILD rename to staging/src/k8s.io/kubectl/pkg/cmd/annotate/BUILD diff --git a/pkg/kubectl/cmd/annotate/annotate.go b/staging/src/k8s.io/kubectl/pkg/cmd/annotate/annotate.go similarity index 100% rename from pkg/kubectl/cmd/annotate/annotate.go rename to staging/src/k8s.io/kubectl/pkg/cmd/annotate/annotate.go diff --git a/pkg/kubectl/cmd/annotate/annotate_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/annotate/annotate_test.go similarity index 100% rename from pkg/kubectl/cmd/annotate/annotate_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/annotate/annotate_test.go diff --git a/pkg/kubectl/cmd/apiresources/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/apiresources/BUILD similarity index 100% rename from pkg/kubectl/cmd/apiresources/BUILD rename to staging/src/k8s.io/kubectl/pkg/cmd/apiresources/BUILD diff --git a/pkg/kubectl/cmd/apiresources/apiresources.go b/staging/src/k8s.io/kubectl/pkg/cmd/apiresources/apiresources.go similarity index 100% rename from pkg/kubectl/cmd/apiresources/apiresources.go rename to staging/src/k8s.io/kubectl/pkg/cmd/apiresources/apiresources.go diff --git a/pkg/kubectl/cmd/apiresources/apiversions.go b/staging/src/k8s.io/kubectl/pkg/cmd/apiresources/apiversions.go similarity index 100% rename from pkg/kubectl/cmd/apiresources/apiversions.go rename to staging/src/k8s.io/kubectl/pkg/cmd/apiresources/apiversions.go diff --git a/pkg/kubectl/cmd/apply/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/apply/BUILD similarity index 100% rename from pkg/kubectl/cmd/apply/BUILD rename to staging/src/k8s.io/kubectl/pkg/cmd/apply/BUILD diff --git a/pkg/kubectl/cmd/apply/apply.go b/staging/src/k8s.io/kubectl/pkg/cmd/apply/apply.go similarity index 100% rename from pkg/kubectl/cmd/apply/apply.go rename to staging/src/k8s.io/kubectl/pkg/cmd/apply/apply.go diff --git a/pkg/kubectl/cmd/apply/apply_edit_last_applied.go b/staging/src/k8s.io/kubectl/pkg/cmd/apply/apply_edit_last_applied.go similarity index 100% rename from pkg/kubectl/cmd/apply/apply_edit_last_applied.go rename to staging/src/k8s.io/kubectl/pkg/cmd/apply/apply_edit_last_applied.go diff --git a/pkg/kubectl/cmd/apply/apply_set_last_applied.go b/staging/src/k8s.io/kubectl/pkg/cmd/apply/apply_set_last_applied.go similarity index 100% rename from pkg/kubectl/cmd/apply/apply_set_last_applied.go rename to staging/src/k8s.io/kubectl/pkg/cmd/apply/apply_set_last_applied.go diff --git a/pkg/kubectl/cmd/apply/apply_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/apply/apply_test.go similarity index 100% rename from pkg/kubectl/cmd/apply/apply_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/apply/apply_test.go diff --git a/pkg/kubectl/cmd/apply/apply_view_last_applied.go b/staging/src/k8s.io/kubectl/pkg/cmd/apply/apply_view_last_applied.go similarity index 100% rename from pkg/kubectl/cmd/apply/apply_view_last_applied.go rename to staging/src/k8s.io/kubectl/pkg/cmd/apply/apply_view_last_applied.go diff --git a/pkg/kubectl/cmd/attach/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/attach/BUILD similarity index 100% rename from pkg/kubectl/cmd/attach/BUILD rename to staging/src/k8s.io/kubectl/pkg/cmd/attach/BUILD diff --git a/pkg/kubectl/cmd/attach/attach.go b/staging/src/k8s.io/kubectl/pkg/cmd/attach/attach.go similarity index 100% rename from pkg/kubectl/cmd/attach/attach.go rename to staging/src/k8s.io/kubectl/pkg/cmd/attach/attach.go diff --git a/pkg/kubectl/cmd/attach/attach_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/attach/attach_test.go similarity index 100% rename from pkg/kubectl/cmd/attach/attach_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/attach/attach_test.go diff --git a/pkg/kubectl/cmd/autoscale/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/autoscale/BUILD similarity index 100% rename from pkg/kubectl/cmd/autoscale/BUILD rename to staging/src/k8s.io/kubectl/pkg/cmd/autoscale/BUILD diff --git a/pkg/kubectl/cmd/autoscale/autoscale.go b/staging/src/k8s.io/kubectl/pkg/cmd/autoscale/autoscale.go similarity index 100% rename from pkg/kubectl/cmd/autoscale/autoscale.go rename to staging/src/k8s.io/kubectl/pkg/cmd/autoscale/autoscale.go diff --git a/pkg/kubectl/cmd/certificates/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/certificates/BUILD similarity index 100% rename from pkg/kubectl/cmd/certificates/BUILD rename to staging/src/k8s.io/kubectl/pkg/cmd/certificates/BUILD diff --git a/pkg/kubectl/cmd/certificates/certificates.go b/staging/src/k8s.io/kubectl/pkg/cmd/certificates/certificates.go similarity index 100% rename from pkg/kubectl/cmd/certificates/certificates.go rename to staging/src/k8s.io/kubectl/pkg/cmd/certificates/certificates.go diff --git a/pkg/kubectl/cmd/clusterinfo/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/clusterinfo/BUILD similarity index 100% rename from pkg/kubectl/cmd/clusterinfo/BUILD rename to staging/src/k8s.io/kubectl/pkg/cmd/clusterinfo/BUILD diff --git a/pkg/kubectl/cmd/clusterinfo/clusterinfo.go b/staging/src/k8s.io/kubectl/pkg/cmd/clusterinfo/clusterinfo.go similarity index 100% rename from pkg/kubectl/cmd/clusterinfo/clusterinfo.go rename to staging/src/k8s.io/kubectl/pkg/cmd/clusterinfo/clusterinfo.go diff --git a/pkg/kubectl/cmd/clusterinfo/clusterinfo_dump.go b/staging/src/k8s.io/kubectl/pkg/cmd/clusterinfo/clusterinfo_dump.go similarity index 100% rename from pkg/kubectl/cmd/clusterinfo/clusterinfo_dump.go rename to staging/src/k8s.io/kubectl/pkg/cmd/clusterinfo/clusterinfo_dump.go diff --git a/pkg/kubectl/cmd/clusterinfo/clusterinfo_dump_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/clusterinfo/clusterinfo_dump_test.go similarity index 100% rename from pkg/kubectl/cmd/clusterinfo/clusterinfo_dump_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/clusterinfo/clusterinfo_dump_test.go diff --git a/pkg/kubectl/cmd/completion/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/completion/BUILD similarity index 100% rename from pkg/kubectl/cmd/completion/BUILD rename to staging/src/k8s.io/kubectl/pkg/cmd/completion/BUILD diff --git a/pkg/kubectl/cmd/completion/completion.go b/staging/src/k8s.io/kubectl/pkg/cmd/completion/completion.go similarity index 100% rename from pkg/kubectl/cmd/completion/completion.go rename to staging/src/k8s.io/kubectl/pkg/cmd/completion/completion.go diff --git a/pkg/kubectl/cmd/config/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/config/BUILD similarity index 100% rename from pkg/kubectl/cmd/config/BUILD rename to staging/src/k8s.io/kubectl/pkg/cmd/config/BUILD diff --git a/pkg/kubectl/cmd/config/config.go b/staging/src/k8s.io/kubectl/pkg/cmd/config/config.go similarity index 100% rename from pkg/kubectl/cmd/config/config.go rename to staging/src/k8s.io/kubectl/pkg/cmd/config/config.go diff --git a/pkg/kubectl/cmd/config/config_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/config/config_test.go similarity index 100% rename from pkg/kubectl/cmd/config/config_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/config/config_test.go diff --git a/pkg/kubectl/cmd/config/create_authinfo.go b/staging/src/k8s.io/kubectl/pkg/cmd/config/create_authinfo.go similarity index 100% rename from pkg/kubectl/cmd/config/create_authinfo.go rename to staging/src/k8s.io/kubectl/pkg/cmd/config/create_authinfo.go diff --git a/pkg/kubectl/cmd/config/create_authinfo_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/config/create_authinfo_test.go similarity index 100% rename from pkg/kubectl/cmd/config/create_authinfo_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/config/create_authinfo_test.go diff --git a/pkg/kubectl/cmd/config/create_cluster.go b/staging/src/k8s.io/kubectl/pkg/cmd/config/create_cluster.go similarity index 100% rename from pkg/kubectl/cmd/config/create_cluster.go rename to staging/src/k8s.io/kubectl/pkg/cmd/config/create_cluster.go diff --git a/pkg/kubectl/cmd/config/create_cluster_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/config/create_cluster_test.go similarity index 100% rename from pkg/kubectl/cmd/config/create_cluster_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/config/create_cluster_test.go diff --git a/pkg/kubectl/cmd/config/create_context.go b/staging/src/k8s.io/kubectl/pkg/cmd/config/create_context.go similarity index 100% rename from pkg/kubectl/cmd/config/create_context.go rename to staging/src/k8s.io/kubectl/pkg/cmd/config/create_context.go diff --git a/pkg/kubectl/cmd/config/create_context_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/config/create_context_test.go similarity index 100% rename from pkg/kubectl/cmd/config/create_context_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/config/create_context_test.go diff --git a/pkg/kubectl/cmd/config/current_context.go b/staging/src/k8s.io/kubectl/pkg/cmd/config/current_context.go similarity index 100% rename from pkg/kubectl/cmd/config/current_context.go rename to staging/src/k8s.io/kubectl/pkg/cmd/config/current_context.go diff --git a/pkg/kubectl/cmd/config/current_context_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/config/current_context_test.go similarity index 100% rename from pkg/kubectl/cmd/config/current_context_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/config/current_context_test.go diff --git a/pkg/kubectl/cmd/config/delete_cluster.go b/staging/src/k8s.io/kubectl/pkg/cmd/config/delete_cluster.go similarity index 100% rename from pkg/kubectl/cmd/config/delete_cluster.go rename to staging/src/k8s.io/kubectl/pkg/cmd/config/delete_cluster.go diff --git a/pkg/kubectl/cmd/config/delete_cluster_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/config/delete_cluster_test.go similarity index 100% rename from pkg/kubectl/cmd/config/delete_cluster_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/config/delete_cluster_test.go diff --git a/pkg/kubectl/cmd/config/delete_context.go b/staging/src/k8s.io/kubectl/pkg/cmd/config/delete_context.go similarity index 100% rename from pkg/kubectl/cmd/config/delete_context.go rename to staging/src/k8s.io/kubectl/pkg/cmd/config/delete_context.go diff --git a/pkg/kubectl/cmd/config/delete_context_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/config/delete_context_test.go similarity index 100% rename from pkg/kubectl/cmd/config/delete_context_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/config/delete_context_test.go diff --git a/pkg/kubectl/cmd/config/get_clusters.go b/staging/src/k8s.io/kubectl/pkg/cmd/config/get_clusters.go similarity index 100% rename from pkg/kubectl/cmd/config/get_clusters.go rename to staging/src/k8s.io/kubectl/pkg/cmd/config/get_clusters.go diff --git a/pkg/kubectl/cmd/config/get_clusters_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/config/get_clusters_test.go similarity index 100% rename from pkg/kubectl/cmd/config/get_clusters_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/config/get_clusters_test.go diff --git a/pkg/kubectl/cmd/config/get_contexts.go b/staging/src/k8s.io/kubectl/pkg/cmd/config/get_contexts.go similarity index 100% rename from pkg/kubectl/cmd/config/get_contexts.go rename to staging/src/k8s.io/kubectl/pkg/cmd/config/get_contexts.go diff --git a/pkg/kubectl/cmd/config/get_contexts_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/config/get_contexts_test.go similarity index 100% rename from pkg/kubectl/cmd/config/get_contexts_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/config/get_contexts_test.go diff --git a/pkg/kubectl/cmd/config/navigation_step_parser.go b/staging/src/k8s.io/kubectl/pkg/cmd/config/navigation_step_parser.go similarity index 100% rename from pkg/kubectl/cmd/config/navigation_step_parser.go rename to staging/src/k8s.io/kubectl/pkg/cmd/config/navigation_step_parser.go diff --git a/pkg/kubectl/cmd/config/navigation_step_parser_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/config/navigation_step_parser_test.go similarity index 100% rename from pkg/kubectl/cmd/config/navigation_step_parser_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/config/navigation_step_parser_test.go diff --git a/pkg/kubectl/cmd/config/rename_context.go b/staging/src/k8s.io/kubectl/pkg/cmd/config/rename_context.go similarity index 100% rename from pkg/kubectl/cmd/config/rename_context.go rename to staging/src/k8s.io/kubectl/pkg/cmd/config/rename_context.go diff --git a/pkg/kubectl/cmd/config/rename_context_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/config/rename_context_test.go similarity index 100% rename from pkg/kubectl/cmd/config/rename_context_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/config/rename_context_test.go diff --git a/pkg/kubectl/cmd/config/set.go b/staging/src/k8s.io/kubectl/pkg/cmd/config/set.go similarity index 100% rename from pkg/kubectl/cmd/config/set.go rename to staging/src/k8s.io/kubectl/pkg/cmd/config/set.go diff --git a/pkg/kubectl/cmd/config/set_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/config/set_test.go similarity index 100% rename from pkg/kubectl/cmd/config/set_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/config/set_test.go diff --git a/pkg/kubectl/cmd/config/unset.go b/staging/src/k8s.io/kubectl/pkg/cmd/config/unset.go similarity index 100% rename from pkg/kubectl/cmd/config/unset.go rename to staging/src/k8s.io/kubectl/pkg/cmd/config/unset.go diff --git a/pkg/kubectl/cmd/config/unset_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/config/unset_test.go similarity index 100% rename from pkg/kubectl/cmd/config/unset_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/config/unset_test.go diff --git a/pkg/kubectl/cmd/config/use_context.go b/staging/src/k8s.io/kubectl/pkg/cmd/config/use_context.go similarity index 100% rename from pkg/kubectl/cmd/config/use_context.go rename to staging/src/k8s.io/kubectl/pkg/cmd/config/use_context.go diff --git a/pkg/kubectl/cmd/config/use_context_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/config/use_context_test.go similarity index 100% rename from pkg/kubectl/cmd/config/use_context_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/config/use_context_test.go diff --git a/pkg/kubectl/cmd/config/view.go b/staging/src/k8s.io/kubectl/pkg/cmd/config/view.go similarity index 100% rename from pkg/kubectl/cmd/config/view.go rename to staging/src/k8s.io/kubectl/pkg/cmd/config/view.go diff --git a/pkg/kubectl/cmd/config/view_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/config/view_test.go similarity index 100% rename from pkg/kubectl/cmd/config/view_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/config/view_test.go diff --git a/pkg/kubectl/cmd/cp/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/cp/BUILD similarity index 100% rename from pkg/kubectl/cmd/cp/BUILD rename to staging/src/k8s.io/kubectl/pkg/cmd/cp/BUILD diff --git a/pkg/kubectl/cmd/cp/cp.go b/staging/src/k8s.io/kubectl/pkg/cmd/cp/cp.go similarity index 100% rename from pkg/kubectl/cmd/cp/cp.go rename to staging/src/k8s.io/kubectl/pkg/cmd/cp/cp.go diff --git a/pkg/kubectl/cmd/cp/cp_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/cp/cp_test.go similarity index 100% rename from pkg/kubectl/cmd/cp/cp_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/cp/cp_test.go diff --git a/pkg/kubectl/cmd/create/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/create/BUILD similarity index 100% rename from pkg/kubectl/cmd/create/BUILD rename to staging/src/k8s.io/kubectl/pkg/cmd/create/BUILD diff --git a/pkg/kubectl/cmd/create/create.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create.go similarity index 100% rename from pkg/kubectl/cmd/create/create.go rename to staging/src/k8s.io/kubectl/pkg/cmd/create/create.go diff --git a/pkg/kubectl/cmd/create/create_clusterrole.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_clusterrole.go similarity index 100% rename from pkg/kubectl/cmd/create/create_clusterrole.go rename to staging/src/k8s.io/kubectl/pkg/cmd/create/create_clusterrole.go diff --git a/pkg/kubectl/cmd/create/create_clusterrole_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_clusterrole_test.go similarity index 100% rename from pkg/kubectl/cmd/create/create_clusterrole_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/create/create_clusterrole_test.go diff --git a/pkg/kubectl/cmd/create/create_clusterrolebinding.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_clusterrolebinding.go similarity index 100% rename from pkg/kubectl/cmd/create/create_clusterrolebinding.go rename to staging/src/k8s.io/kubectl/pkg/cmd/create/create_clusterrolebinding.go diff --git a/pkg/kubectl/cmd/create/create_clusterrolebinding_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_clusterrolebinding_test.go similarity index 100% rename from pkg/kubectl/cmd/create/create_clusterrolebinding_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/create/create_clusterrolebinding_test.go diff --git a/pkg/kubectl/cmd/create/create_configmap.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_configmap.go similarity index 100% rename from pkg/kubectl/cmd/create/create_configmap.go rename to staging/src/k8s.io/kubectl/pkg/cmd/create/create_configmap.go diff --git a/pkg/kubectl/cmd/create/create_configmap_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_configmap_test.go similarity index 100% rename from pkg/kubectl/cmd/create/create_configmap_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/create/create_configmap_test.go diff --git a/pkg/kubectl/cmd/create/create_cronjob.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_cronjob.go similarity index 100% rename from pkg/kubectl/cmd/create/create_cronjob.go rename to staging/src/k8s.io/kubectl/pkg/cmd/create/create_cronjob.go diff --git a/pkg/kubectl/cmd/create/create_cronjob_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_cronjob_test.go similarity index 100% rename from pkg/kubectl/cmd/create/create_cronjob_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/create/create_cronjob_test.go diff --git a/pkg/kubectl/cmd/create/create_deployment.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_deployment.go similarity index 100% rename from pkg/kubectl/cmd/create/create_deployment.go rename to staging/src/k8s.io/kubectl/pkg/cmd/create/create_deployment.go diff --git a/pkg/kubectl/cmd/create/create_deployment_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_deployment_test.go similarity index 100% rename from pkg/kubectl/cmd/create/create_deployment_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/create/create_deployment_test.go diff --git a/pkg/kubectl/cmd/create/create_job.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_job.go similarity index 100% rename from pkg/kubectl/cmd/create/create_job.go rename to staging/src/k8s.io/kubectl/pkg/cmd/create/create_job.go diff --git a/pkg/kubectl/cmd/create/create_job_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_job_test.go similarity index 100% rename from pkg/kubectl/cmd/create/create_job_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/create/create_job_test.go diff --git a/pkg/kubectl/cmd/create/create_namespace.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_namespace.go similarity index 100% rename from pkg/kubectl/cmd/create/create_namespace.go rename to staging/src/k8s.io/kubectl/pkg/cmd/create/create_namespace.go diff --git a/pkg/kubectl/cmd/create/create_namespace_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_namespace_test.go similarity index 100% rename from pkg/kubectl/cmd/create/create_namespace_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/create/create_namespace_test.go diff --git a/pkg/kubectl/cmd/create/create_pdb.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_pdb.go similarity index 100% rename from pkg/kubectl/cmd/create/create_pdb.go rename to staging/src/k8s.io/kubectl/pkg/cmd/create/create_pdb.go diff --git a/pkg/kubectl/cmd/create/create_pdb_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_pdb_test.go similarity index 100% rename from pkg/kubectl/cmd/create/create_pdb_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/create/create_pdb_test.go diff --git a/pkg/kubectl/cmd/create/create_priorityclass.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_priorityclass.go similarity index 100% rename from pkg/kubectl/cmd/create/create_priorityclass.go rename to staging/src/k8s.io/kubectl/pkg/cmd/create/create_priorityclass.go diff --git a/pkg/kubectl/cmd/create/create_priorityclass_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_priorityclass_test.go similarity index 100% rename from pkg/kubectl/cmd/create/create_priorityclass_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/create/create_priorityclass_test.go diff --git a/pkg/kubectl/cmd/create/create_quota.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_quota.go similarity index 100% rename from pkg/kubectl/cmd/create/create_quota.go rename to staging/src/k8s.io/kubectl/pkg/cmd/create/create_quota.go diff --git a/pkg/kubectl/cmd/create/create_quota_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_quota_test.go similarity index 100% rename from pkg/kubectl/cmd/create/create_quota_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/create/create_quota_test.go diff --git a/pkg/kubectl/cmd/create/create_role.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_role.go similarity index 100% rename from pkg/kubectl/cmd/create/create_role.go rename to staging/src/k8s.io/kubectl/pkg/cmd/create/create_role.go diff --git a/pkg/kubectl/cmd/create/create_role_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_role_test.go similarity index 100% rename from pkg/kubectl/cmd/create/create_role_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/create/create_role_test.go diff --git a/pkg/kubectl/cmd/create/create_rolebinding.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_rolebinding.go similarity index 100% rename from pkg/kubectl/cmd/create/create_rolebinding.go rename to staging/src/k8s.io/kubectl/pkg/cmd/create/create_rolebinding.go diff --git a/pkg/kubectl/cmd/create/create_rolebinding_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_rolebinding_test.go similarity index 100% rename from pkg/kubectl/cmd/create/create_rolebinding_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/create/create_rolebinding_test.go diff --git a/pkg/kubectl/cmd/create/create_secret.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_secret.go similarity index 100% rename from pkg/kubectl/cmd/create/create_secret.go rename to staging/src/k8s.io/kubectl/pkg/cmd/create/create_secret.go diff --git a/pkg/kubectl/cmd/create/create_secret_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_secret_test.go similarity index 100% rename from pkg/kubectl/cmd/create/create_secret_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/create/create_secret_test.go diff --git a/pkg/kubectl/cmd/create/create_service.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_service.go similarity index 100% rename from pkg/kubectl/cmd/create/create_service.go rename to staging/src/k8s.io/kubectl/pkg/cmd/create/create_service.go diff --git a/pkg/kubectl/cmd/create/create_service_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_service_test.go similarity index 100% rename from pkg/kubectl/cmd/create/create_service_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/create/create_service_test.go diff --git a/pkg/kubectl/cmd/create/create_serviceaccount.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_serviceaccount.go similarity index 100% rename from pkg/kubectl/cmd/create/create_serviceaccount.go rename to staging/src/k8s.io/kubectl/pkg/cmd/create/create_serviceaccount.go diff --git a/pkg/kubectl/cmd/create/create_serviceaccount_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_serviceaccount_test.go similarity index 100% rename from pkg/kubectl/cmd/create/create_serviceaccount_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/create/create_serviceaccount_test.go diff --git a/pkg/kubectl/cmd/create/create_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_test.go similarity index 100% rename from pkg/kubectl/cmd/create/create_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/create/create_test.go diff --git a/pkg/kubectl/cmd/delete/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/delete/BUILD similarity index 100% rename from pkg/kubectl/cmd/delete/BUILD rename to staging/src/k8s.io/kubectl/pkg/cmd/delete/BUILD diff --git a/pkg/kubectl/cmd/delete/delete.go b/staging/src/k8s.io/kubectl/pkg/cmd/delete/delete.go similarity index 100% rename from pkg/kubectl/cmd/delete/delete.go rename to staging/src/k8s.io/kubectl/pkg/cmd/delete/delete.go diff --git a/pkg/kubectl/cmd/delete/delete_flags.go b/staging/src/k8s.io/kubectl/pkg/cmd/delete/delete_flags.go similarity index 100% rename from pkg/kubectl/cmd/delete/delete_flags.go rename to staging/src/k8s.io/kubectl/pkg/cmd/delete/delete_flags.go diff --git a/pkg/kubectl/cmd/delete/delete_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/delete/delete_test.go similarity index 100% rename from pkg/kubectl/cmd/delete/delete_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/delete/delete_test.go diff --git a/pkg/kubectl/cmd/describe/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/describe/BUILD similarity index 100% rename from pkg/kubectl/cmd/describe/BUILD rename to staging/src/k8s.io/kubectl/pkg/cmd/describe/BUILD diff --git a/pkg/kubectl/cmd/describe/describe.go b/staging/src/k8s.io/kubectl/pkg/cmd/describe/describe.go similarity index 100% rename from pkg/kubectl/cmd/describe/describe.go rename to staging/src/k8s.io/kubectl/pkg/cmd/describe/describe.go diff --git a/pkg/kubectl/cmd/describe/describe_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/describe/describe_test.go similarity index 100% rename from pkg/kubectl/cmd/describe/describe_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/describe/describe_test.go diff --git a/pkg/kubectl/cmd/diff/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/diff/BUILD similarity index 100% rename from pkg/kubectl/cmd/diff/BUILD rename to staging/src/k8s.io/kubectl/pkg/cmd/diff/BUILD diff --git a/pkg/kubectl/cmd/diff/diff.go b/staging/src/k8s.io/kubectl/pkg/cmd/diff/diff.go similarity index 100% rename from pkg/kubectl/cmd/diff/diff.go rename to staging/src/k8s.io/kubectl/pkg/cmd/diff/diff.go diff --git a/pkg/kubectl/cmd/diff/diff_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/diff/diff_test.go similarity index 100% rename from pkg/kubectl/cmd/diff/diff_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/diff/diff_test.go diff --git a/pkg/kubectl/cmd/drain/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/drain/BUILD similarity index 100% rename from pkg/kubectl/cmd/drain/BUILD rename to staging/src/k8s.io/kubectl/pkg/cmd/drain/BUILD diff --git a/pkg/kubectl/cmd/drain/drain.go b/staging/src/k8s.io/kubectl/pkg/cmd/drain/drain.go similarity index 100% rename from pkg/kubectl/cmd/drain/drain.go rename to staging/src/k8s.io/kubectl/pkg/cmd/drain/drain.go diff --git a/pkg/kubectl/cmd/drain/drain_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/drain/drain_test.go similarity index 100% rename from pkg/kubectl/cmd/drain/drain_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/drain/drain_test.go diff --git a/pkg/kubectl/cmd/edit/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/edit/BUILD similarity index 100% rename from pkg/kubectl/cmd/edit/BUILD rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/BUILD diff --git a/pkg/kubectl/cmd/edit/edit.go b/staging/src/k8s.io/kubectl/pkg/cmd/edit/edit.go similarity index 100% rename from pkg/kubectl/cmd/edit/edit.go rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/edit.go diff --git a/pkg/kubectl/cmd/edit/edit_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/edit/edit_test.go similarity index 100% rename from pkg/kubectl/cmd/edit/edit_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/edit_test.go diff --git a/pkg/kubectl/cmd/edit/testdata/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/BUILD similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/BUILD rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/BUILD diff --git a/pkg/kubectl/cmd/edit/testdata/README b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/README similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/README rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/README diff --git a/pkg/kubectl/cmd/edit/testdata/record.go b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/record.go similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/record.go rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/record.go diff --git a/pkg/kubectl/cmd/edit/testdata/record_editor.sh b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/record_editor.sh similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/record_editor.sh rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/record_editor.sh diff --git a/pkg/kubectl/cmd/edit/testdata/record_testcase.sh b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/record_testcase.sh similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/record_testcase.sh rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/record_testcase.sh diff --git a/pkg/kubectl/cmd/edit/testdata/test_editor.sh b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/test_editor.sh similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/test_editor.sh rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/test_editor.sh diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/0.request b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/0.request similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/0.request rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/0.request diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/0.response b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/0.response similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/0.response rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/0.response diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/1.request b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/1.request similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/1.request rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/1.request diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/1.response b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/1.response similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/1.response rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/1.response diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/2.edited b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/2.edited similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/2.edited rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/2.edited diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/2.original b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/2.original similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/2.original rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/2.original diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/3.edited b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/3.edited similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/3.edited rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/3.edited diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/3.original b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/3.original similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/3.original rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/3.original diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/4.request b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/4.request similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/4.request rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/4.request diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/4.response b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/4.response similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/4.response rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/4.response diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/5.request b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/5.request similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/5.request rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/5.request diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/5.response b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/5.response similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/5.response rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/5.response diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/test.yaml b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/test.yaml similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/test.yaml rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied-list-fail/test.yaml diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list/0.request b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied-list/0.request similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list/0.request rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied-list/0.request diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list/0.response b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied-list/0.response similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list/0.response rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied-list/0.response diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list/1.request b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied-list/1.request similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list/1.request rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied-list/1.request diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list/1.response b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied-list/1.response similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list/1.response rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied-list/1.response diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list/2.edited b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied-list/2.edited similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list/2.edited rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied-list/2.edited diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list/2.original b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied-list/2.original similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list/2.original rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied-list/2.original diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list/3.request b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied-list/3.request similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list/3.request rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied-list/3.request diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list/3.response b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied-list/3.response similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list/3.response rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied-list/3.response diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list/4.request b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied-list/4.request similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list/4.request rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied-list/4.request diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list/4.response b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied-list/4.response similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list/4.response rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied-list/4.response diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list/test.yaml b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied-list/test.yaml similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-list/test.yaml rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied-list/test.yaml diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-syntax-error/0.request b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied-syntax-error/0.request similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-syntax-error/0.request rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied-syntax-error/0.request diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-syntax-error/0.response b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied-syntax-error/0.response similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-syntax-error/0.response rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied-syntax-error/0.response diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-syntax-error/1.edited b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied-syntax-error/1.edited similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-syntax-error/1.edited rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied-syntax-error/1.edited diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-syntax-error/1.original b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied-syntax-error/1.original similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-syntax-error/1.original rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied-syntax-error/1.original diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-syntax-error/2.edited b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied-syntax-error/2.edited similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-syntax-error/2.edited rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied-syntax-error/2.edited diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-syntax-error/2.original b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied-syntax-error/2.original similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-syntax-error/2.original rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied-syntax-error/2.original diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-syntax-error/3.request b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied-syntax-error/3.request similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-syntax-error/3.request rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied-syntax-error/3.request diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-syntax-error/3.response b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied-syntax-error/3.response similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-syntax-error/3.response rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied-syntax-error/3.response diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-syntax-error/test.yaml b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied-syntax-error/test.yaml similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-syntax-error/test.yaml rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied-syntax-error/test.yaml diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied/0.request b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied/0.request similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied/0.request rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied/0.request diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied/0.response b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied/0.response similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied/0.response rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied/0.response diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied/1.edited b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied/1.edited similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied/1.edited rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied/1.edited diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied/1.original b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied/1.original similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied/1.original rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied/1.original diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied/2.request b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied/2.request similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied/2.request rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied/2.request diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied/2.response b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied/2.response similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied/2.response rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied/2.response diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied/test.yaml b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied/test.yaml similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied/test.yaml rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-apply-edit-last-applied/test.yaml diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-create-list-error/0.edited b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-create-list-error/0.edited similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-create-list-error/0.edited rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-create-list-error/0.edited diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-create-list-error/0.original b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-create-list-error/0.original similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-create-list-error/0.original rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-create-list-error/0.original diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-create-list-error/1.request b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-create-list-error/1.request similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-create-list-error/1.request rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-create-list-error/1.request diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-create-list-error/1.response b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-create-list-error/1.response similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-create-list-error/1.response rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-create-list-error/1.response diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-create-list-error/2.edited b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-create-list-error/2.edited similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-create-list-error/2.edited rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-create-list-error/2.edited diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-create-list-error/2.original b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-create-list-error/2.original similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-create-list-error/2.original rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-create-list-error/2.original diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-create-list-error/3.request b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-create-list-error/3.request similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-create-list-error/3.request rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-create-list-error/3.request diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-create-list-error/3.response b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-create-list-error/3.response similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-create-list-error/3.response rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-create-list-error/3.response diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-create-list-error/svc.yaml b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-create-list-error/svc.yaml similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-create-list-error/svc.yaml rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-create-list-error/svc.yaml diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-create-list-error/test.yaml b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-create-list-error/test.yaml similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-create-list-error/test.yaml rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-create-list-error/test.yaml diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-create-list/0.edited b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-create-list/0.edited similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-create-list/0.edited rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-create-list/0.edited diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-create-list/0.original b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-create-list/0.original similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-create-list/0.original rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-create-list/0.original diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-create-list/1.request b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-create-list/1.request similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-create-list/1.request rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-create-list/1.request diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-create-list/1.response b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-create-list/1.response similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-create-list/1.response rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-create-list/1.response diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-create-list/2.edited b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-create-list/2.edited similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-create-list/2.edited rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-create-list/2.edited diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-create-list/2.original b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-create-list/2.original similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-create-list/2.original rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-create-list/2.original diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-create-list/3.request b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-create-list/3.request similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-create-list/3.request rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-create-list/3.request diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-create-list/3.response b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-create-list/3.response similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-create-list/3.response rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-create-list/3.response diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-create-list/svc.yaml b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-create-list/svc.yaml similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-create-list/svc.yaml rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-create-list/svc.yaml diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-create-list/test.yaml b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-create-list/test.yaml similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-create-list/test.yaml rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-create-list/test.yaml diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-edit-error-reedit/0.request b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-edit-error-reedit/0.request similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-edit-error-reedit/0.request rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-edit-error-reedit/0.request diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-edit-error-reedit/0.response b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-edit-error-reedit/0.response similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-edit-error-reedit/0.response rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-edit-error-reedit/0.response diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-edit-error-reedit/1.edited b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-edit-error-reedit/1.edited similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-edit-error-reedit/1.edited rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-edit-error-reedit/1.edited diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-edit-error-reedit/1.original b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-edit-error-reedit/1.original similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-edit-error-reedit/1.original rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-edit-error-reedit/1.original diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-edit-error-reedit/2.request b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-edit-error-reedit/2.request similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-edit-error-reedit/2.request rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-edit-error-reedit/2.request diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-edit-error-reedit/2.response b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-edit-error-reedit/2.response similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-edit-error-reedit/2.response rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-edit-error-reedit/2.response diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-edit-error-reedit/3.edited b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-edit-error-reedit/3.edited similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-edit-error-reedit/3.edited rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-edit-error-reedit/3.edited diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-edit-error-reedit/3.original b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-edit-error-reedit/3.original similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-edit-error-reedit/3.original rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-edit-error-reedit/3.original diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-edit-error-reedit/4.request b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-edit-error-reedit/4.request similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-edit-error-reedit/4.request rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-edit-error-reedit/4.request diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-edit-error-reedit/4.response b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-edit-error-reedit/4.response similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-edit-error-reedit/4.response rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-edit-error-reedit/4.response diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-edit-error-reedit/test.yaml b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-edit-error-reedit/test.yaml similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-edit-error-reedit/test.yaml rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-edit-error-reedit/test.yaml diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-edit-from-empty/0.request b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-edit-from-empty/0.request similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-edit-from-empty/0.request rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-edit-from-empty/0.request diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-edit-from-empty/0.response b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-edit-from-empty/0.response similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-edit-from-empty/0.response rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-edit-from-empty/0.response diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-edit-from-empty/test.yaml b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-edit-from-empty/test.yaml similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-edit-from-empty/test.yaml rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-edit-from-empty/test.yaml diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-edit-output-patch/0.request b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-edit-output-patch/0.request similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-edit-output-patch/0.request rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-edit-output-patch/0.request diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-edit-output-patch/0.response b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-edit-output-patch/0.response similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-edit-output-patch/0.response rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-edit-output-patch/0.response diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-edit-output-patch/1.edited b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-edit-output-patch/1.edited similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-edit-output-patch/1.edited rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-edit-output-patch/1.edited diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-edit-output-patch/1.original b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-edit-output-patch/1.original similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-edit-output-patch/1.original rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-edit-output-patch/1.original diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-edit-output-patch/2.request b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-edit-output-patch/2.request similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-edit-output-patch/2.request rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-edit-output-patch/2.request diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-edit-output-patch/2.response b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-edit-output-patch/2.response similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-edit-output-patch/2.response rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-edit-output-patch/2.response diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-edit-output-patch/test.yaml b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-edit-output-patch/test.yaml similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-edit-output-patch/test.yaml rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-edit-output-patch/test.yaml diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-immutable-name/0.request b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-immutable-name/0.request similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-immutable-name/0.request rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-immutable-name/0.request diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-immutable-name/0.response b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-immutable-name/0.response similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-immutable-name/0.response rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-immutable-name/0.response diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-immutable-name/1.edited b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-immutable-name/1.edited similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-immutable-name/1.edited rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-immutable-name/1.edited diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-immutable-name/1.original b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-immutable-name/1.original similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-immutable-name/1.original rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-immutable-name/1.original diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-immutable-name/test.yaml b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-immutable-name/test.yaml similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-immutable-name/test.yaml rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-immutable-name/test.yaml diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-list-errors/0.request b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list-errors/0.request similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-list-errors/0.request rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list-errors/0.request diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-list-errors/0.response b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list-errors/0.response similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-list-errors/0.response rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list-errors/0.response diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-list-errors/1.request b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list-errors/1.request similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-list-errors/1.request rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list-errors/1.request diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-list-errors/1.response b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list-errors/1.response similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-list-errors/1.response rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list-errors/1.response diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-list-errors/10.request b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list-errors/10.request similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-list-errors/10.request rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list-errors/10.request diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-list-errors/10.response b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list-errors/10.response similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-list-errors/10.response rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list-errors/10.response diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-list-errors/2.edited b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list-errors/2.edited similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-list-errors/2.edited rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list-errors/2.edited diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-list-errors/2.original b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list-errors/2.original similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-list-errors/2.original rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list-errors/2.original diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-list-errors/3.request b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list-errors/3.request similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-list-errors/3.request rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list-errors/3.request diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-list-errors/3.response b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list-errors/3.response similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-list-errors/3.response rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list-errors/3.response diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-list-errors/4.request b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list-errors/4.request similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-list-errors/4.request rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list-errors/4.request diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-list-errors/4.response b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list-errors/4.response similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-list-errors/4.response rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list-errors/4.response diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-list-errors/5.edited b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list-errors/5.edited similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-list-errors/5.edited rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list-errors/5.edited diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-list-errors/5.original b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list-errors/5.original similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-list-errors/5.original rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list-errors/5.original diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-list-errors/6.request b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list-errors/6.request similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-list-errors/6.request rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list-errors/6.request diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-list-errors/6.response b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list-errors/6.response similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-list-errors/6.response rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list-errors/6.response diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-list-errors/7.request b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list-errors/7.request similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-list-errors/7.request rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list-errors/7.request diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-list-errors/7.response b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list-errors/7.response similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-list-errors/7.response rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list-errors/7.response diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-list-errors/8.edited b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list-errors/8.edited similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-list-errors/8.edited rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list-errors/8.edited diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-list-errors/8.original b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list-errors/8.original similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-list-errors/8.original rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list-errors/8.original diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-list-errors/9.request b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list-errors/9.request similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-list-errors/9.request rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list-errors/9.request diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-list-errors/9.response b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list-errors/9.response similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-list-errors/9.response rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list-errors/9.response diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-list-errors/test.yaml b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list-errors/test.yaml similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-list-errors/test.yaml rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list-errors/test.yaml diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-list-record/0.request b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list-record/0.request similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-list-record/0.request rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list-record/0.request diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-list-record/0.response b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list-record/0.response similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-list-record/0.response rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list-record/0.response diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-list-record/1.request b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list-record/1.request similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-list-record/1.request rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list-record/1.request diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-list-record/1.response b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list-record/1.response similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-list-record/1.response rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list-record/1.response diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-list-record/2.edited b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list-record/2.edited similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-list-record/2.edited rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list-record/2.edited diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-list-record/2.original b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list-record/2.original similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-list-record/2.original rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list-record/2.original diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-list-record/3.request b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list-record/3.request similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-list-record/3.request rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list-record/3.request diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-list-record/3.response b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list-record/3.response similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-list-record/3.response rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list-record/3.response diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-list-record/4.request b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list-record/4.request similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-list-record/4.request rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list-record/4.request diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-list-record/4.response b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list-record/4.response similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-list-record/4.response rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list-record/4.response diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-list-record/test.yaml b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list-record/test.yaml similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-list-record/test.yaml rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list-record/test.yaml diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-list/0.request b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list/0.request similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-list/0.request rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list/0.request diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-list/0.response b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list/0.response similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-list/0.response rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list/0.response diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-list/1.request b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list/1.request similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-list/1.request rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list/1.request diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-list/1.response b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list/1.response similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-list/1.response rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list/1.response diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-list/2.edited b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list/2.edited similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-list/2.edited rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list/2.edited diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-list/2.original b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list/2.original similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-list/2.original rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list/2.original diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-list/3.request b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list/3.request similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-list/3.request rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list/3.request diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-list/3.response b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list/3.response similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-list/3.response rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list/3.response diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-list/4.request b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list/4.request similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-list/4.request rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list/4.request diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-list/4.response b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list/4.response similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-list/4.response rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list/4.response diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-list/test.yaml b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list/test.yaml similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-list/test.yaml rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-list/test.yaml diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-missing-service/0.request b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-missing-service/0.request similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-missing-service/0.request rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-missing-service/0.request diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-missing-service/0.response b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-missing-service/0.response similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-missing-service/0.response rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-missing-service/0.response diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-missing-service/test.yaml b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-missing-service/test.yaml similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-missing-service/test.yaml rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-missing-service/test.yaml diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-no-op/0.request b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-no-op/0.request similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-no-op/0.request rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-no-op/0.request diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-no-op/0.response b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-no-op/0.response similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-no-op/0.response rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-no-op/0.response diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-no-op/1.edited b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-no-op/1.edited similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-no-op/1.edited rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-no-op/1.edited diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-no-op/1.original b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-no-op/1.original similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-no-op/1.original rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-no-op/1.original diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-no-op/test.yaml b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-no-op/test.yaml similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-no-op/test.yaml rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-no-op/test.yaml diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-not-update-annotation/0.request b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-not-update-annotation/0.request similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-not-update-annotation/0.request rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-not-update-annotation/0.request diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-not-update-annotation/0.response b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-not-update-annotation/0.response similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-not-update-annotation/0.response rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-not-update-annotation/0.response diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-not-update-annotation/1.edited b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-not-update-annotation/1.edited similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-not-update-annotation/1.edited rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-not-update-annotation/1.edited diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-not-update-annotation/1.original b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-not-update-annotation/1.original similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-not-update-annotation/1.original rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-not-update-annotation/1.original diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-not-update-annotation/2.request b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-not-update-annotation/2.request similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-not-update-annotation/2.request rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-not-update-annotation/2.request diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-not-update-annotation/2.response b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-not-update-annotation/2.response similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-not-update-annotation/2.response rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-not-update-annotation/2.response diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-not-update-annotation/test.yaml b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-not-update-annotation/test.yaml similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-not-update-annotation/test.yaml rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-not-update-annotation/test.yaml diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-repeat-error/0.request b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-repeat-error/0.request similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-repeat-error/0.request rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-repeat-error/0.request diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-repeat-error/0.response b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-repeat-error/0.response similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-repeat-error/0.response rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-repeat-error/0.response diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-repeat-error/1.edited b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-repeat-error/1.edited similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-repeat-error/1.edited rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-repeat-error/1.edited diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-repeat-error/1.original b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-repeat-error/1.original similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-repeat-error/1.original rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-repeat-error/1.original diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-repeat-error/2.request b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-repeat-error/2.request similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-repeat-error/2.request rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-repeat-error/2.request diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-repeat-error/2.response b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-repeat-error/2.response similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-repeat-error/2.response rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-repeat-error/2.response diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-repeat-error/3.edited b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-repeat-error/3.edited similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-repeat-error/3.edited rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-repeat-error/3.edited diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-repeat-error/3.original b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-repeat-error/3.original similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-repeat-error/3.original rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-repeat-error/3.original diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-repeat-error/test.yaml b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-repeat-error/test.yaml similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-repeat-error/test.yaml rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-repeat-error/test.yaml diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-schemaless-list/0.request b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-schemaless-list/0.request similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-schemaless-list/0.request rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-schemaless-list/0.request diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-schemaless-list/0.response b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-schemaless-list/0.response similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-schemaless-list/0.response rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-schemaless-list/0.response diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-schemaless-list/1.request b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-schemaless-list/1.request similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-schemaless-list/1.request rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-schemaless-list/1.request diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-schemaless-list/1.response b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-schemaless-list/1.response similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-schemaless-list/1.response rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-schemaless-list/1.response diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-schemaless-list/2.request b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-schemaless-list/2.request similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-schemaless-list/2.request rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-schemaless-list/2.request diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-schemaless-list/2.response b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-schemaless-list/2.response similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-schemaless-list/2.response rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-schemaless-list/2.response diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-schemaless-list/3.edited b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-schemaless-list/3.edited similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-schemaless-list/3.edited rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-schemaless-list/3.edited diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-schemaless-list/3.original b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-schemaless-list/3.original similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-schemaless-list/3.original rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-schemaless-list/3.original diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-schemaless-list/4.request b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-schemaless-list/4.request similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-schemaless-list/4.request rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-schemaless-list/4.request diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-schemaless-list/4.response b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-schemaless-list/4.response similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-schemaless-list/4.response rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-schemaless-list/4.response diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-schemaless-list/5.request b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-schemaless-list/5.request similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-schemaless-list/5.request rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-schemaless-list/5.request diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-schemaless-list/5.response b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-schemaless-list/5.response similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-schemaless-list/5.response rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-schemaless-list/5.response diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-schemaless-list/6.request b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-schemaless-list/6.request similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-schemaless-list/6.request rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-schemaless-list/6.request diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-schemaless-list/6.response b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-schemaless-list/6.response similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-schemaless-list/6.response rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-schemaless-list/6.response diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-schemaless-list/test.yaml b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-schemaless-list/test.yaml similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-schemaless-list/test.yaml rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-schemaless-list/test.yaml diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-single-service/0.request b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-single-service/0.request similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-single-service/0.request rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-single-service/0.request diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-single-service/0.response b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-single-service/0.response similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-single-service/0.response rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-single-service/0.response diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-single-service/1.edited b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-single-service/1.edited similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-single-service/1.edited rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-single-service/1.edited diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-single-service/1.original b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-single-service/1.original similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-single-service/1.original rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-single-service/1.original diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-single-service/2.request b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-single-service/2.request similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-single-service/2.request rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-single-service/2.request diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-single-service/2.response b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-single-service/2.response similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-single-service/2.response rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-single-service/2.response diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-single-service/test.yaml b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-single-service/test.yaml similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-single-service/test.yaml rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-single-service/test.yaml diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-syntax-error/0.request b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-syntax-error/0.request similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-syntax-error/0.request rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-syntax-error/0.request diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-syntax-error/0.response b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-syntax-error/0.response similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-syntax-error/0.response rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-syntax-error/0.response diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-syntax-error/1.edited b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-syntax-error/1.edited similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-syntax-error/1.edited rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-syntax-error/1.edited diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-syntax-error/1.original b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-syntax-error/1.original similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-syntax-error/1.original rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-syntax-error/1.original diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-syntax-error/2.edited b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-syntax-error/2.edited similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-syntax-error/2.edited rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-syntax-error/2.edited diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-syntax-error/2.original b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-syntax-error/2.original similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-syntax-error/2.original rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-syntax-error/2.original diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-syntax-error/3.request b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-syntax-error/3.request similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-syntax-error/3.request rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-syntax-error/3.request diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-syntax-error/3.response b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-syntax-error/3.response similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-syntax-error/3.response rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-syntax-error/3.response diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-syntax-error/test.yaml b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-syntax-error/test.yaml similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-syntax-error/test.yaml rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-syntax-error/test.yaml diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-unknown-field-known-group-kind/0.request b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-unknown-field-known-group-kind/0.request similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-unknown-field-known-group-kind/0.request rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-unknown-field-known-group-kind/0.request diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-unknown-field-known-group-kind/0.response b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-unknown-field-known-group-kind/0.response similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-unknown-field-known-group-kind/0.response rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-unknown-field-known-group-kind/0.response diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-unknown-field-known-group-kind/1.edited b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-unknown-field-known-group-kind/1.edited similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-unknown-field-known-group-kind/1.edited rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-unknown-field-known-group-kind/1.edited diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-unknown-field-known-group-kind/1.original b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-unknown-field-known-group-kind/1.original similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-unknown-field-known-group-kind/1.original rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-unknown-field-known-group-kind/1.original diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-unknown-field-known-group-kind/2.request b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-unknown-field-known-group-kind/2.request similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-unknown-field-known-group-kind/2.request rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-unknown-field-known-group-kind/2.request diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-unknown-field-known-group-kind/2.response b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-unknown-field-known-group-kind/2.response similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-unknown-field-known-group-kind/2.response rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-unknown-field-known-group-kind/2.response diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-unknown-field-known-group-kind/test.yaml b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-unknown-field-known-group-kind/test.yaml similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-unknown-field-known-group-kind/test.yaml rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-unknown-field-known-group-kind/test.yaml diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-unknown-version-known-group-kind/0.request b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-unknown-version-known-group-kind/0.request similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-unknown-version-known-group-kind/0.request rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-unknown-version-known-group-kind/0.request diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-unknown-version-known-group-kind/0.response b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-unknown-version-known-group-kind/0.response similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-unknown-version-known-group-kind/0.response rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-unknown-version-known-group-kind/0.response diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-unknown-version-known-group-kind/1.edited b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-unknown-version-known-group-kind/1.edited similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-unknown-version-known-group-kind/1.edited rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-unknown-version-known-group-kind/1.edited diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-unknown-version-known-group-kind/1.original b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-unknown-version-known-group-kind/1.original similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-unknown-version-known-group-kind/1.original rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-unknown-version-known-group-kind/1.original diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-unknown-version-known-group-kind/2.request b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-unknown-version-known-group-kind/2.request similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-unknown-version-known-group-kind/2.request rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-unknown-version-known-group-kind/2.request diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-unknown-version-known-group-kind/2.response b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-unknown-version-known-group-kind/2.response similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-unknown-version-known-group-kind/2.response rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-unknown-version-known-group-kind/2.response diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-unknown-version-known-group-kind/test.yaml b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-unknown-version-known-group-kind/test.yaml similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-unknown-version-known-group-kind/test.yaml rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-unknown-version-known-group-kind/test.yaml diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-update-annotation/0.request b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-update-annotation/0.request similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-update-annotation/0.request rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-update-annotation/0.request diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-update-annotation/0.response b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-update-annotation/0.response similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-update-annotation/0.response rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-update-annotation/0.response diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-update-annotation/1.edited b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-update-annotation/1.edited similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-update-annotation/1.edited rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-update-annotation/1.edited diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-update-annotation/1.original b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-update-annotation/1.original similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-update-annotation/1.original rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-update-annotation/1.original diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-update-annotation/2.request b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-update-annotation/2.request similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-update-annotation/2.request rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-update-annotation/2.request diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-update-annotation/2.response b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-update-annotation/2.response similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-update-annotation/2.response rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-update-annotation/2.response diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-update-annotation/test.yaml b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-update-annotation/test.yaml similarity index 100% rename from pkg/kubectl/cmd/edit/testdata/testcase-update-annotation/test.yaml rename to staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-update-annotation/test.yaml diff --git a/pkg/kubectl/cmd/exec/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/exec/BUILD similarity index 100% rename from pkg/kubectl/cmd/exec/BUILD rename to staging/src/k8s.io/kubectl/pkg/cmd/exec/BUILD diff --git a/pkg/kubectl/cmd/exec/exec.go b/staging/src/k8s.io/kubectl/pkg/cmd/exec/exec.go similarity index 100% rename from pkg/kubectl/cmd/exec/exec.go rename to staging/src/k8s.io/kubectl/pkg/cmd/exec/exec.go diff --git a/pkg/kubectl/cmd/exec/exec_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/exec/exec_test.go similarity index 100% rename from pkg/kubectl/cmd/exec/exec_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/exec/exec_test.go diff --git a/pkg/kubectl/cmd/explain/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/explain/BUILD similarity index 100% rename from pkg/kubectl/cmd/explain/BUILD rename to staging/src/k8s.io/kubectl/pkg/cmd/explain/BUILD diff --git a/pkg/kubectl/cmd/explain/explain.go b/staging/src/k8s.io/kubectl/pkg/cmd/explain/explain.go similarity index 100% rename from pkg/kubectl/cmd/explain/explain.go rename to staging/src/k8s.io/kubectl/pkg/cmd/explain/explain.go diff --git a/pkg/kubectl/cmd/expose/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/expose/BUILD similarity index 100% rename from pkg/kubectl/cmd/expose/BUILD rename to staging/src/k8s.io/kubectl/pkg/cmd/expose/BUILD diff --git a/pkg/kubectl/cmd/expose/expose.go b/staging/src/k8s.io/kubectl/pkg/cmd/expose/expose.go similarity index 100% rename from pkg/kubectl/cmd/expose/expose.go rename to staging/src/k8s.io/kubectl/pkg/cmd/expose/expose.go diff --git a/pkg/kubectl/cmd/expose/expose_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/expose/expose_test.go similarity index 100% rename from pkg/kubectl/cmd/expose/expose_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/expose/expose_test.go diff --git a/pkg/kubectl/cmd/help/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/help/BUILD similarity index 100% rename from pkg/kubectl/cmd/help/BUILD rename to staging/src/k8s.io/kubectl/pkg/cmd/help/BUILD diff --git a/pkg/kubectl/cmd/help/help.go b/staging/src/k8s.io/kubectl/pkg/cmd/help/help.go similarity index 100% rename from pkg/kubectl/cmd/help/help.go rename to staging/src/k8s.io/kubectl/pkg/cmd/help/help.go diff --git a/pkg/kubectl/cmd/kustomize/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/kustomize/BUILD similarity index 100% rename from pkg/kubectl/cmd/kustomize/BUILD rename to staging/src/k8s.io/kubectl/pkg/cmd/kustomize/BUILD diff --git a/pkg/kubectl/cmd/kustomize/kustomize.go b/staging/src/k8s.io/kubectl/pkg/cmd/kustomize/kustomize.go similarity index 100% rename from pkg/kubectl/cmd/kustomize/kustomize.go rename to staging/src/k8s.io/kubectl/pkg/cmd/kustomize/kustomize.go diff --git a/pkg/kubectl/cmd/kustomize/kustomize_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/kustomize/kustomize_test.go similarity index 100% rename from pkg/kubectl/cmd/kustomize/kustomize_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/kustomize/kustomize_test.go diff --git a/pkg/kubectl/cmd/label/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/label/BUILD similarity index 100% rename from pkg/kubectl/cmd/label/BUILD rename to staging/src/k8s.io/kubectl/pkg/cmd/label/BUILD diff --git a/pkg/kubectl/cmd/label/label.go b/staging/src/k8s.io/kubectl/pkg/cmd/label/label.go similarity index 100% rename from pkg/kubectl/cmd/label/label.go rename to staging/src/k8s.io/kubectl/pkg/cmd/label/label.go diff --git a/pkg/kubectl/cmd/label/label_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/label/label_test.go similarity index 100% rename from pkg/kubectl/cmd/label/label_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/label/label_test.go diff --git a/pkg/kubectl/cmd/logs/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/logs/BUILD similarity index 100% rename from pkg/kubectl/cmd/logs/BUILD rename to staging/src/k8s.io/kubectl/pkg/cmd/logs/BUILD diff --git a/pkg/kubectl/cmd/logs/logs.go b/staging/src/k8s.io/kubectl/pkg/cmd/logs/logs.go similarity index 100% rename from pkg/kubectl/cmd/logs/logs.go rename to staging/src/k8s.io/kubectl/pkg/cmd/logs/logs.go diff --git a/pkg/kubectl/cmd/logs/logs_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/logs/logs_test.go similarity index 100% rename from pkg/kubectl/cmd/logs/logs_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/logs/logs_test.go diff --git a/pkg/kubectl/cmd/options/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/options/BUILD similarity index 100% rename from pkg/kubectl/cmd/options/BUILD rename to staging/src/k8s.io/kubectl/pkg/cmd/options/BUILD diff --git a/pkg/kubectl/cmd/options/options.go b/staging/src/k8s.io/kubectl/pkg/cmd/options/options.go similarity index 100% rename from pkg/kubectl/cmd/options/options.go rename to staging/src/k8s.io/kubectl/pkg/cmd/options/options.go diff --git a/pkg/kubectl/cmd/patch/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/patch/BUILD similarity index 100% rename from pkg/kubectl/cmd/patch/BUILD rename to staging/src/k8s.io/kubectl/pkg/cmd/patch/BUILD diff --git a/pkg/kubectl/cmd/patch/patch.go b/staging/src/k8s.io/kubectl/pkg/cmd/patch/patch.go similarity index 100% rename from pkg/kubectl/cmd/patch/patch.go rename to staging/src/k8s.io/kubectl/pkg/cmd/patch/patch.go diff --git a/pkg/kubectl/cmd/patch/patch_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/patch/patch_test.go similarity index 100% rename from pkg/kubectl/cmd/patch/patch_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/patch/patch_test.go diff --git a/pkg/kubectl/cmd/plugin/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/plugin/BUILD similarity index 100% rename from pkg/kubectl/cmd/plugin/BUILD rename to staging/src/k8s.io/kubectl/pkg/cmd/plugin/BUILD diff --git a/pkg/kubectl/cmd/plugin/plugin.go b/staging/src/k8s.io/kubectl/pkg/cmd/plugin/plugin.go similarity index 100% rename from pkg/kubectl/cmd/plugin/plugin.go rename to staging/src/k8s.io/kubectl/pkg/cmd/plugin/plugin.go diff --git a/pkg/kubectl/cmd/plugin/plugin_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/plugin/plugin_test.go similarity index 100% rename from pkg/kubectl/cmd/plugin/plugin_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/plugin/plugin_test.go diff --git a/pkg/kubectl/cmd/plugin/testdata/kubectl-foo b/staging/src/k8s.io/kubectl/pkg/cmd/plugin/testdata/kubectl-foo similarity index 100% rename from pkg/kubectl/cmd/plugin/testdata/kubectl-foo rename to staging/src/k8s.io/kubectl/pkg/cmd/plugin/testdata/kubectl-foo diff --git a/pkg/kubectl/cmd/plugin/testdata/kubectl-version b/staging/src/k8s.io/kubectl/pkg/cmd/plugin/testdata/kubectl-version similarity index 100% rename from pkg/kubectl/cmd/plugin/testdata/kubectl-version rename to staging/src/k8s.io/kubectl/pkg/cmd/plugin/testdata/kubectl-version diff --git a/pkg/kubectl/cmd/portforward/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/portforward/BUILD similarity index 100% rename from pkg/kubectl/cmd/portforward/BUILD rename to staging/src/k8s.io/kubectl/pkg/cmd/portforward/BUILD diff --git a/pkg/kubectl/cmd/portforward/portforward.go b/staging/src/k8s.io/kubectl/pkg/cmd/portforward/portforward.go similarity index 100% rename from pkg/kubectl/cmd/portforward/portforward.go rename to staging/src/k8s.io/kubectl/pkg/cmd/portforward/portforward.go diff --git a/pkg/kubectl/cmd/portforward/portforward_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/portforward/portforward_test.go similarity index 100% rename from pkg/kubectl/cmd/portforward/portforward_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/portforward/portforward_test.go diff --git a/pkg/kubectl/cmd/profiling.go b/staging/src/k8s.io/kubectl/pkg/cmd/profiling.go similarity index 100% rename from pkg/kubectl/cmd/profiling.go rename to staging/src/k8s.io/kubectl/pkg/cmd/profiling.go diff --git a/pkg/kubectl/cmd/proxy/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/proxy/BUILD similarity index 100% rename from pkg/kubectl/cmd/proxy/BUILD rename to staging/src/k8s.io/kubectl/pkg/cmd/proxy/BUILD diff --git a/pkg/kubectl/cmd/proxy/proxy.go b/staging/src/k8s.io/kubectl/pkg/cmd/proxy/proxy.go similarity index 100% rename from pkg/kubectl/cmd/proxy/proxy.go rename to staging/src/k8s.io/kubectl/pkg/cmd/proxy/proxy.go diff --git a/pkg/kubectl/cmd/replace/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/replace/BUILD similarity index 100% rename from pkg/kubectl/cmd/replace/BUILD rename to staging/src/k8s.io/kubectl/pkg/cmd/replace/BUILD diff --git a/pkg/kubectl/cmd/replace/replace.go b/staging/src/k8s.io/kubectl/pkg/cmd/replace/replace.go similarity index 100% rename from pkg/kubectl/cmd/replace/replace.go rename to staging/src/k8s.io/kubectl/pkg/cmd/replace/replace.go diff --git a/pkg/kubectl/cmd/replace/replace_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/replace/replace_test.go similarity index 100% rename from pkg/kubectl/cmd/replace/replace_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/replace/replace_test.go diff --git a/pkg/kubectl/cmd/rollingupdate/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/rollingupdate/BUILD similarity index 100% rename from pkg/kubectl/cmd/rollingupdate/BUILD rename to staging/src/k8s.io/kubectl/pkg/cmd/rollingupdate/BUILD diff --git a/pkg/kubectl/cmd/rollingupdate/rolling_updater.go b/staging/src/k8s.io/kubectl/pkg/cmd/rollingupdate/rolling_updater.go similarity index 100% rename from pkg/kubectl/cmd/rollingupdate/rolling_updater.go rename to staging/src/k8s.io/kubectl/pkg/cmd/rollingupdate/rolling_updater.go diff --git a/pkg/kubectl/cmd/rollingupdate/rolling_updater_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/rollingupdate/rolling_updater_test.go similarity index 100% rename from pkg/kubectl/cmd/rollingupdate/rolling_updater_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/rollingupdate/rolling_updater_test.go diff --git a/pkg/kubectl/cmd/rollingupdate/rollingupdate.go b/staging/src/k8s.io/kubectl/pkg/cmd/rollingupdate/rollingupdate.go similarity index 100% rename from pkg/kubectl/cmd/rollingupdate/rollingupdate.go rename to staging/src/k8s.io/kubectl/pkg/cmd/rollingupdate/rollingupdate.go diff --git a/pkg/kubectl/cmd/rollingupdate/rollingupdate_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/rollingupdate/rollingupdate_test.go similarity index 100% rename from pkg/kubectl/cmd/rollingupdate/rollingupdate_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/rollingupdate/rollingupdate_test.go diff --git a/pkg/kubectl/cmd/rollout/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/rollout/BUILD similarity index 100% rename from pkg/kubectl/cmd/rollout/BUILD rename to staging/src/k8s.io/kubectl/pkg/cmd/rollout/BUILD diff --git a/pkg/kubectl/cmd/rollout/rollout.go b/staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout.go similarity index 100% rename from pkg/kubectl/cmd/rollout/rollout.go rename to staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout.go diff --git a/pkg/kubectl/cmd/rollout/rollout_history.go b/staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout_history.go similarity index 100% rename from pkg/kubectl/cmd/rollout/rollout_history.go rename to staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout_history.go diff --git a/pkg/kubectl/cmd/rollout/rollout_pause.go b/staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout_pause.go similarity index 100% rename from pkg/kubectl/cmd/rollout/rollout_pause.go rename to staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout_pause.go diff --git a/pkg/kubectl/cmd/rollout/rollout_pause_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout_pause_test.go similarity index 100% rename from pkg/kubectl/cmd/rollout/rollout_pause_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout_pause_test.go diff --git a/pkg/kubectl/cmd/rollout/rollout_restart.go b/staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout_restart.go similarity index 100% rename from pkg/kubectl/cmd/rollout/rollout_restart.go rename to staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout_restart.go diff --git a/pkg/kubectl/cmd/rollout/rollout_resume.go b/staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout_resume.go similarity index 100% rename from pkg/kubectl/cmd/rollout/rollout_resume.go rename to staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout_resume.go diff --git a/pkg/kubectl/cmd/rollout/rollout_status.go b/staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout_status.go similarity index 100% rename from pkg/kubectl/cmd/rollout/rollout_status.go rename to staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout_status.go diff --git a/pkg/kubectl/cmd/rollout/rollout_undo.go b/staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout_undo.go similarity index 100% rename from pkg/kubectl/cmd/rollout/rollout_undo.go rename to staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout_undo.go diff --git a/pkg/kubectl/cmd/run/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/run/BUILD similarity index 100% rename from pkg/kubectl/cmd/run/BUILD rename to staging/src/k8s.io/kubectl/pkg/cmd/run/BUILD diff --git a/pkg/kubectl/cmd/run/run.go b/staging/src/k8s.io/kubectl/pkg/cmd/run/run.go similarity index 100% rename from pkg/kubectl/cmd/run/run.go rename to staging/src/k8s.io/kubectl/pkg/cmd/run/run.go diff --git a/pkg/kubectl/cmd/run/run_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/run/run_test.go similarity index 100% rename from pkg/kubectl/cmd/run/run_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/run/run_test.go diff --git a/pkg/kubectl/cmd/scale/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/scale/BUILD similarity index 100% rename from pkg/kubectl/cmd/scale/BUILD rename to staging/src/k8s.io/kubectl/pkg/cmd/scale/BUILD diff --git a/pkg/kubectl/cmd/scale/scale.go b/staging/src/k8s.io/kubectl/pkg/cmd/scale/scale.go similarity index 100% rename from pkg/kubectl/cmd/scale/scale.go rename to staging/src/k8s.io/kubectl/pkg/cmd/scale/scale.go diff --git a/pkg/kubectl/cmd/set/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/set/BUILD similarity index 100% rename from pkg/kubectl/cmd/set/BUILD rename to staging/src/k8s.io/kubectl/pkg/cmd/set/BUILD diff --git a/pkg/kubectl/cmd/set/env/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/set/env/BUILD similarity index 100% rename from pkg/kubectl/cmd/set/env/BUILD rename to staging/src/k8s.io/kubectl/pkg/cmd/set/env/BUILD diff --git a/pkg/kubectl/cmd/set/env/doc.go b/staging/src/k8s.io/kubectl/pkg/cmd/set/env/doc.go similarity index 100% rename from pkg/kubectl/cmd/set/env/doc.go rename to staging/src/k8s.io/kubectl/pkg/cmd/set/env/doc.go diff --git a/pkg/kubectl/cmd/set/env/env_parse.go b/staging/src/k8s.io/kubectl/pkg/cmd/set/env/env_parse.go similarity index 100% rename from pkg/kubectl/cmd/set/env/env_parse.go rename to staging/src/k8s.io/kubectl/pkg/cmd/set/env/env_parse.go diff --git a/pkg/kubectl/cmd/set/env/env_parse_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/set/env/env_parse_test.go similarity index 100% rename from pkg/kubectl/cmd/set/env/env_parse_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/set/env/env_parse_test.go diff --git a/pkg/kubectl/cmd/set/env/env_resolve.go b/staging/src/k8s.io/kubectl/pkg/cmd/set/env/env_resolve.go similarity index 100% rename from pkg/kubectl/cmd/set/env/env_resolve.go rename to staging/src/k8s.io/kubectl/pkg/cmd/set/env/env_resolve.go diff --git a/pkg/kubectl/cmd/set/helper.go b/staging/src/k8s.io/kubectl/pkg/cmd/set/helper.go similarity index 100% rename from pkg/kubectl/cmd/set/helper.go rename to staging/src/k8s.io/kubectl/pkg/cmd/set/helper.go diff --git a/pkg/kubectl/cmd/set/set.go b/staging/src/k8s.io/kubectl/pkg/cmd/set/set.go similarity index 100% rename from pkg/kubectl/cmd/set/set.go rename to staging/src/k8s.io/kubectl/pkg/cmd/set/set.go diff --git a/pkg/kubectl/cmd/set/set_env.go b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_env.go similarity index 100% rename from pkg/kubectl/cmd/set/set_env.go rename to staging/src/k8s.io/kubectl/pkg/cmd/set/set_env.go diff --git a/pkg/kubectl/cmd/set/set_env_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_env_test.go similarity index 100% rename from pkg/kubectl/cmd/set/set_env_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/set/set_env_test.go diff --git a/pkg/kubectl/cmd/set/set_image.go b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_image.go similarity index 100% rename from pkg/kubectl/cmd/set/set_image.go rename to staging/src/k8s.io/kubectl/pkg/cmd/set/set_image.go diff --git a/pkg/kubectl/cmd/set/set_image_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_image_test.go similarity index 100% rename from pkg/kubectl/cmd/set/set_image_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/set/set_image_test.go diff --git a/pkg/kubectl/cmd/set/set_resources.go b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_resources.go similarity index 100% rename from pkg/kubectl/cmd/set/set_resources.go rename to staging/src/k8s.io/kubectl/pkg/cmd/set/set_resources.go diff --git a/pkg/kubectl/cmd/set/set_resources_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_resources_test.go similarity index 100% rename from pkg/kubectl/cmd/set/set_resources_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/set/set_resources_test.go diff --git a/pkg/kubectl/cmd/set/set_selector.go b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_selector.go similarity index 100% rename from pkg/kubectl/cmd/set/set_selector.go rename to staging/src/k8s.io/kubectl/pkg/cmd/set/set_selector.go diff --git a/pkg/kubectl/cmd/set/set_selector_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_selector_test.go similarity index 100% rename from pkg/kubectl/cmd/set/set_selector_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/set/set_selector_test.go diff --git a/pkg/kubectl/cmd/set/set_serviceaccount.go b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_serviceaccount.go similarity index 100% rename from pkg/kubectl/cmd/set/set_serviceaccount.go rename to staging/src/k8s.io/kubectl/pkg/cmd/set/set_serviceaccount.go diff --git a/pkg/kubectl/cmd/set/set_serviceaccount_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_serviceaccount_test.go similarity index 100% rename from pkg/kubectl/cmd/set/set_serviceaccount_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/set/set_serviceaccount_test.go diff --git a/pkg/kubectl/cmd/set/set_subject.go b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_subject.go similarity index 100% rename from pkg/kubectl/cmd/set/set_subject.go rename to staging/src/k8s.io/kubectl/pkg/cmd/set/set_subject.go diff --git a/pkg/kubectl/cmd/set/set_subject_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_subject_test.go similarity index 100% rename from pkg/kubectl/cmd/set/set_subject_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/set/set_subject_test.go diff --git a/pkg/kubectl/cmd/set/set_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_test.go similarity index 100% rename from pkg/kubectl/cmd/set/set_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/set/set_test.go diff --git a/pkg/kubectl/cmd/taint/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/taint/BUILD similarity index 100% rename from pkg/kubectl/cmd/taint/BUILD rename to staging/src/k8s.io/kubectl/pkg/cmd/taint/BUILD diff --git a/pkg/kubectl/cmd/taint/taint.go b/staging/src/k8s.io/kubectl/pkg/cmd/taint/taint.go similarity index 100% rename from pkg/kubectl/cmd/taint/taint.go rename to staging/src/k8s.io/kubectl/pkg/cmd/taint/taint.go diff --git a/pkg/kubectl/cmd/taint/taint_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/taint/taint_test.go similarity index 100% rename from pkg/kubectl/cmd/taint/taint_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/taint/taint_test.go diff --git a/pkg/kubectl/cmd/taint/utils.go b/staging/src/k8s.io/kubectl/pkg/cmd/taint/utils.go similarity index 100% rename from pkg/kubectl/cmd/taint/utils.go rename to staging/src/k8s.io/kubectl/pkg/cmd/taint/utils.go diff --git a/pkg/kubectl/cmd/taint/utils_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/taint/utils_test.go similarity index 100% rename from pkg/kubectl/cmd/taint/utils_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/taint/utils_test.go diff --git a/pkg/kubectl/cmd/testing/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/testing/BUILD similarity index 100% rename from pkg/kubectl/cmd/testing/BUILD rename to staging/src/k8s.io/kubectl/pkg/cmd/testing/BUILD diff --git a/pkg/kubectl/cmd/testing/fake.go b/staging/src/k8s.io/kubectl/pkg/cmd/testing/fake.go similarity index 100% rename from pkg/kubectl/cmd/testing/fake.go rename to staging/src/k8s.io/kubectl/pkg/cmd/testing/fake.go diff --git a/pkg/kubectl/cmd/testing/interfaces.go b/staging/src/k8s.io/kubectl/pkg/cmd/testing/interfaces.go similarity index 100% rename from pkg/kubectl/cmd/testing/interfaces.go rename to staging/src/k8s.io/kubectl/pkg/cmd/testing/interfaces.go diff --git a/pkg/kubectl/cmd/testing/util.go b/staging/src/k8s.io/kubectl/pkg/cmd/testing/util.go similarity index 100% rename from pkg/kubectl/cmd/testing/util.go rename to staging/src/k8s.io/kubectl/pkg/cmd/testing/util.go diff --git a/pkg/kubectl/cmd/testing/zz_generated.deepcopy.go b/staging/src/k8s.io/kubectl/pkg/cmd/testing/zz_generated.deepcopy.go similarity index 100% rename from pkg/kubectl/cmd/testing/zz_generated.deepcopy.go rename to staging/src/k8s.io/kubectl/pkg/cmd/testing/zz_generated.deepcopy.go diff --git a/pkg/kubectl/cmd/top/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/top/BUILD similarity index 100% rename from pkg/kubectl/cmd/top/BUILD rename to staging/src/k8s.io/kubectl/pkg/cmd/top/BUILD diff --git a/pkg/kubectl/cmd/top/top.go b/staging/src/k8s.io/kubectl/pkg/cmd/top/top.go similarity index 100% rename from pkg/kubectl/cmd/top/top.go rename to staging/src/k8s.io/kubectl/pkg/cmd/top/top.go diff --git a/pkg/kubectl/cmd/top/top_node.go b/staging/src/k8s.io/kubectl/pkg/cmd/top/top_node.go similarity index 100% rename from pkg/kubectl/cmd/top/top_node.go rename to staging/src/k8s.io/kubectl/pkg/cmd/top/top_node.go diff --git a/pkg/kubectl/cmd/top/top_node_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/top/top_node_test.go similarity index 100% rename from pkg/kubectl/cmd/top/top_node_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/top/top_node_test.go diff --git a/pkg/kubectl/cmd/top/top_pod.go b/staging/src/k8s.io/kubectl/pkg/cmd/top/top_pod.go similarity index 100% rename from pkg/kubectl/cmd/top/top_pod.go rename to staging/src/k8s.io/kubectl/pkg/cmd/top/top_pod.go diff --git a/pkg/kubectl/cmd/top/top_pod_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/top/top_pod_test.go similarity index 100% rename from pkg/kubectl/cmd/top/top_pod_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/top/top_pod_test.go diff --git a/pkg/kubectl/cmd/top/top_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/top/top_test.go similarity index 100% rename from pkg/kubectl/cmd/top/top_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/top/top_test.go diff --git a/pkg/kubectl/cmd/version/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/version/BUILD similarity index 100% rename from pkg/kubectl/cmd/version/BUILD rename to staging/src/k8s.io/kubectl/pkg/cmd/version/BUILD diff --git a/pkg/kubectl/cmd/version/version.go b/staging/src/k8s.io/kubectl/pkg/cmd/version/version.go similarity index 100% rename from pkg/kubectl/cmd/version/version.go rename to staging/src/k8s.io/kubectl/pkg/cmd/version/version.go diff --git a/pkg/kubectl/cmd/wait/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/wait/BUILD similarity index 100% rename from pkg/kubectl/cmd/wait/BUILD rename to staging/src/k8s.io/kubectl/pkg/cmd/wait/BUILD diff --git a/pkg/kubectl/cmd/wait/wait.go b/staging/src/k8s.io/kubectl/pkg/cmd/wait/wait.go similarity index 100% rename from pkg/kubectl/cmd/wait/wait.go rename to staging/src/k8s.io/kubectl/pkg/cmd/wait/wait.go diff --git a/pkg/kubectl/cmd/wait/wait_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/wait/wait_test.go similarity index 100% rename from pkg/kubectl/cmd/wait/wait_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/wait/wait_test.go From acece3c2964115a4f29a43e368ad5de59dbbc258 Mon Sep 17 00:00:00 2001 From: Sean Sullivan Date: Thu, 1 Aug 2019 11:10:05 -0700 Subject: [PATCH 2/7] Update import statements to reflect code move --- pkg/kubectl/cmd/auth/cani_test.go | 2 +- pkg/kubectl/cmd/cmd.go | 74 +++++++++---------- pkg/kubectl/cmd/convert/convert_test.go | 2 +- pkg/kubectl/cmd/get/get_test.go | 2 +- .../kubectl/pkg/cmd/annotate/annotate_test.go | 2 +- .../src/k8s.io/kubectl/pkg/cmd/apply/apply.go | 2 +- .../kubectl/pkg/cmd/apply/apply_test.go | 2 +- .../k8s.io/kubectl/pkg/cmd/attach/attach.go | 2 +- .../kubectl/pkg/cmd/attach/attach_test.go | 4 +- .../cmd/clusterinfo/clusterinfo_dump_test.go | 2 +- staging/src/k8s.io/kubectl/pkg/cmd/cp/cp.go | 2 +- .../src/k8s.io/kubectl/pkg/cmd/cp/cp_test.go | 4 +- .../pkg/cmd/create/create_clusterrole_test.go | 2 +- .../create/create_clusterrolebinding_test.go | 2 +- .../pkg/cmd/create/create_configmap_test.go | 2 +- .../pkg/cmd/create/create_deployment_test.go | 2 +- .../pkg/cmd/create/create_namespace_test.go | 2 +- .../kubectl/pkg/cmd/create/create_pdb_test.go | 2 +- .../cmd/create/create_priorityclass_test.go | 2 +- .../pkg/cmd/create/create_quota_test.go | 2 +- .../pkg/cmd/create/create_role_test.go | 2 +- .../pkg/cmd/create/create_rolebinding_test.go | 2 +- .../pkg/cmd/create/create_secret_test.go | 2 +- .../pkg/cmd/create/create_service_test.go | 2 +- .../cmd/create/create_serviceaccount_test.go | 2 +- .../kubectl/pkg/cmd/create/create_test.go | 2 +- .../k8s.io/kubectl/pkg/cmd/delete/delete.go | 2 +- .../kubectl/pkg/cmd/delete/delete_test.go | 2 +- .../kubectl/pkg/cmd/describe/describe_test.go | 2 +- .../src/k8s.io/kubectl/pkg/cmd/diff/diff.go | 2 +- .../kubectl/pkg/cmd/drain/drain_test.go | 2 +- .../k8s.io/kubectl/pkg/cmd/edit/edit_test.go | 6 +- .../k8s.io/kubectl/pkg/cmd/exec/exec_test.go | 2 +- .../kubectl/pkg/cmd/expose/expose_test.go | 2 +- .../kubectl/pkg/cmd/label/label_test.go | 2 +- .../k8s.io/kubectl/pkg/cmd/logs/logs_test.go | 2 +- .../kubectl/pkg/cmd/patch/patch_test.go | 2 +- .../pkg/cmd/portforward/portforward_test.go | 2 +- .../k8s.io/kubectl/pkg/cmd/replace/replace.go | 2 +- .../kubectl/pkg/cmd/replace/replace_test.go | 2 +- .../cmd/rollingupdate/rollingupdate_test.go | 2 +- .../kubectl/pkg/cmd/rollout/rollout_pause.go | 2 +- .../pkg/cmd/rollout/rollout_pause_test.go | 2 +- .../pkg/cmd/rollout/rollout_restart.go | 2 +- .../kubectl/pkg/cmd/rollout/rollout_resume.go | 2 +- staging/src/k8s.io/kubectl/pkg/cmd/run/run.go | 8 +- .../k8s.io/kubectl/pkg/cmd/run/run_test.go | 4 +- .../src/k8s.io/kubectl/pkg/cmd/set/set_env.go | 2 +- .../kubectl/pkg/cmd/set/set_env_test.go | 2 +- .../kubectl/pkg/cmd/set/set_image_test.go | 2 +- .../kubectl/pkg/cmd/set/set_resources_test.go | 2 +- .../pkg/cmd/set/set_serviceaccount_test.go | 2 +- .../kubectl/pkg/cmd/set/set_subject_test.go | 2 +- .../kubectl/pkg/cmd/taint/taint_test.go | 2 +- .../kubectl/pkg/cmd/top/top_node_test.go | 2 +- .../kubectl/pkg/cmd/top/top_pod_test.go | 2 +- .../k8s.io/kubectl/pkg/cmd/top/top_test.go | 2 +- 57 files changed, 101 insertions(+), 101 deletions(-) diff --git a/pkg/kubectl/cmd/auth/cani_test.go b/pkg/kubectl/cmd/auth/cani_test.go index 161356428b0..c788afbfd6f 100644 --- a/pkg/kubectl/cmd/auth/cani_test.go +++ b/pkg/kubectl/cmd/auth/cani_test.go @@ -31,7 +31,7 @@ import ( restclient "k8s.io/client-go/rest" "k8s.io/client-go/rest/fake" "k8s.io/kubectl/pkg/scheme" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) func TestRunAccessCheck(t *testing.T) { diff --git a/pkg/kubectl/cmd/cmd.go b/pkg/kubectl/cmd/cmd.go index 067599ef38c..234522e873e 100644 --- a/pkg/kubectl/cmd/cmd.go +++ b/pkg/kubectl/cmd/cmd.go @@ -30,51 +30,51 @@ import ( "k8s.io/client-go/tools/clientcmd" cliflag "k8s.io/component-base/cli/flag" + "k8s.io/kubectl/pkg/cmd/annotate" + "k8s.io/kubectl/pkg/cmd/apiresources" + "k8s.io/kubectl/pkg/cmd/apply" + "k8s.io/kubectl/pkg/cmd/attach" + "k8s.io/kubectl/pkg/cmd/autoscale" + "k8s.io/kubectl/pkg/cmd/certificates" + "k8s.io/kubectl/pkg/cmd/clusterinfo" + "k8s.io/kubectl/pkg/cmd/completion" + cmdconfig "k8s.io/kubectl/pkg/cmd/config" + "k8s.io/kubectl/pkg/cmd/cp" + "k8s.io/kubectl/pkg/cmd/create" + "k8s.io/kubectl/pkg/cmd/delete" + "k8s.io/kubectl/pkg/cmd/describe" + "k8s.io/kubectl/pkg/cmd/diff" + "k8s.io/kubectl/pkg/cmd/drain" + "k8s.io/kubectl/pkg/cmd/edit" + cmdexec "k8s.io/kubectl/pkg/cmd/exec" + "k8s.io/kubectl/pkg/cmd/explain" + "k8s.io/kubectl/pkg/cmd/expose" + "k8s.io/kubectl/pkg/cmd/label" + "k8s.io/kubectl/pkg/cmd/logs" + "k8s.io/kubectl/pkg/cmd/options" + "k8s.io/kubectl/pkg/cmd/patch" + "k8s.io/kubectl/pkg/cmd/plugin" + "k8s.io/kubectl/pkg/cmd/portforward" + "k8s.io/kubectl/pkg/cmd/proxy" + "k8s.io/kubectl/pkg/cmd/replace" + "k8s.io/kubectl/pkg/cmd/rollingupdate" + "k8s.io/kubectl/pkg/cmd/rollout" + "k8s.io/kubectl/pkg/cmd/run" + "k8s.io/kubectl/pkg/cmd/scale" + "k8s.io/kubectl/pkg/cmd/set" + "k8s.io/kubectl/pkg/cmd/taint" + "k8s.io/kubectl/pkg/cmd/top" cmdutil "k8s.io/kubectl/pkg/cmd/util" + "k8s.io/kubectl/pkg/cmd/version" + "k8s.io/kubectl/pkg/cmd/wait" "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" - "k8s.io/kubernetes/pkg/kubectl/cmd/annotate" - "k8s.io/kubernetes/pkg/kubectl/cmd/apiresources" - "k8s.io/kubernetes/pkg/kubectl/cmd/apply" - "k8s.io/kubernetes/pkg/kubectl/cmd/attach" "k8s.io/kubernetes/pkg/kubectl/cmd/auth" - "k8s.io/kubernetes/pkg/kubectl/cmd/autoscale" - "k8s.io/kubernetes/pkg/kubectl/cmd/certificates" - "k8s.io/kubernetes/pkg/kubectl/cmd/clusterinfo" - "k8s.io/kubernetes/pkg/kubectl/cmd/completion" - cmdconfig "k8s.io/kubernetes/pkg/kubectl/cmd/config" "k8s.io/kubernetes/pkg/kubectl/cmd/convert" - "k8s.io/kubernetes/pkg/kubectl/cmd/cp" - "k8s.io/kubernetes/pkg/kubectl/cmd/create" - "k8s.io/kubernetes/pkg/kubectl/cmd/delete" - "k8s.io/kubernetes/pkg/kubectl/cmd/describe" - "k8s.io/kubernetes/pkg/kubectl/cmd/diff" - "k8s.io/kubernetes/pkg/kubectl/cmd/drain" - "k8s.io/kubernetes/pkg/kubectl/cmd/edit" - cmdexec "k8s.io/kubernetes/pkg/kubectl/cmd/exec" - "k8s.io/kubernetes/pkg/kubectl/cmd/explain" - "k8s.io/kubernetes/pkg/kubectl/cmd/expose" "k8s.io/kubernetes/pkg/kubectl/cmd/get" - "k8s.io/kubernetes/pkg/kubectl/cmd/label" - "k8s.io/kubernetes/pkg/kubectl/cmd/logs" - "k8s.io/kubernetes/pkg/kubectl/cmd/options" - "k8s.io/kubernetes/pkg/kubectl/cmd/patch" - "k8s.io/kubernetes/pkg/kubectl/cmd/plugin" - "k8s.io/kubernetes/pkg/kubectl/cmd/portforward" - "k8s.io/kubernetes/pkg/kubectl/cmd/proxy" - "k8s.io/kubernetes/pkg/kubectl/cmd/replace" - "k8s.io/kubernetes/pkg/kubectl/cmd/rollingupdate" - "k8s.io/kubernetes/pkg/kubectl/cmd/rollout" - "k8s.io/kubernetes/pkg/kubectl/cmd/run" - "k8s.io/kubernetes/pkg/kubectl/cmd/scale" - "k8s.io/kubernetes/pkg/kubectl/cmd/set" - "k8s.io/kubernetes/pkg/kubectl/cmd/taint" - "k8s.io/kubernetes/pkg/kubectl/cmd/top" - "k8s.io/kubernetes/pkg/kubectl/cmd/version" - "k8s.io/kubernetes/pkg/kubectl/cmd/wait" "k8s.io/cli-runtime/pkg/genericclioptions" - "k8s.io/kubernetes/pkg/kubectl/cmd/kustomize" + "k8s.io/kubectl/pkg/cmd/kustomize" ) const ( diff --git a/pkg/kubectl/cmd/convert/convert_test.go b/pkg/kubectl/cmd/convert/convert_test.go index 18ae86cf77b..abe594ee7cd 100644 --- a/pkg/kubectl/cmd/convert/convert_test.go +++ b/pkg/kubectl/cmd/convert/convert_test.go @@ -25,7 +25,7 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/rest/fake" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) type testcase struct { diff --git a/pkg/kubectl/cmd/get/get_test.go b/pkg/kubectl/cmd/get/get_test.go index 30903eede19..e7610a9b213 100644 --- a/pkg/kubectl/cmd/get/get_test.go +++ b/pkg/kubectl/cmd/get/get_test.go @@ -50,7 +50,7 @@ import ( "k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/util/openapi" openapitesting "k8s.io/kubectl/pkg/util/openapi/testing" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) var ( diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/annotate/annotate_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/annotate/annotate_test.go index 92c0e417924..46a136e247f 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/annotate/annotate_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/annotate/annotate_test.go @@ -30,7 +30,7 @@ import ( "k8s.io/cli-runtime/pkg/resource" "k8s.io/client-go/rest/fake" "k8s.io/kubectl/pkg/scheme" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) func TestValidateAnnotationOverwrites(t *testing.T) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/apply/apply.go b/staging/src/k8s.io/kubectl/pkg/cmd/apply/apply.go index 1eed94a05fb..b6de182f792 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/apply/apply.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/apply/apply.go @@ -53,7 +53,7 @@ import ( "k8s.io/kubectl/pkg/util/openapi" "k8s.io/kubectl/pkg/util/templates" "k8s.io/kubectl/pkg/validation" - "k8s.io/kubernetes/pkg/kubectl/cmd/delete" + "k8s.io/kubectl/pkg/cmd/delete" ) // ApplyOptions defines flags and other configuration parameters for the `apply` command diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/apply/apply_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/apply/apply_test.go index 2c04db4460e..8e2c8c4892d 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/apply/apply_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/apply/apply_test.go @@ -49,7 +49,7 @@ import ( cmdutil "k8s.io/kubectl/pkg/cmd/util" "k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/util/openapi" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" utilpointer "k8s.io/utils/pointer" ) diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/attach/attach.go b/staging/src/k8s.io/kubectl/pkg/cmd/attach/attach.go index 0b79170dd85..4a5b368ceb1 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/attach/attach.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/attach/attach.go @@ -36,7 +36,7 @@ import ( "k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" - "k8s.io/kubernetes/pkg/kubectl/cmd/exec" + "k8s.io/kubectl/pkg/cmd/exec" ) var ( diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/attach/attach_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/attach/attach_test.go index 1c28a540c62..ab5fcc69ead 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/attach/attach_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/attach/attach_test.go @@ -35,8 +35,8 @@ import ( "k8s.io/client-go/tools/remotecommand" "k8s.io/kubectl/pkg/polymorphichelpers" "k8s.io/kubectl/pkg/scheme" - "k8s.io/kubernetes/pkg/kubectl/cmd/exec" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + "k8s.io/kubectl/pkg/cmd/exec" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) type fakeRemoteAttach struct { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/clusterinfo/clusterinfo_dump_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/clusterinfo/clusterinfo_dump_test.go index bbe62f0be6d..95babc8a6ec 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/clusterinfo/clusterinfo_dump_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/clusterinfo/clusterinfo_dump_test.go @@ -23,7 +23,7 @@ import ( "testing" "k8s.io/cli-runtime/pkg/genericclioptions" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) func TestSetupOutputWriterNoOp(t *testing.T) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/cp/cp.go b/staging/src/k8s.io/kubectl/pkg/cmd/cp/cp.go index 8f315fbfb5b..4cea2de42d2 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/cp/cp.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/cp/cp.go @@ -33,7 +33,7 @@ import ( cmdutil "k8s.io/kubectl/pkg/cmd/util" "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" - "k8s.io/kubernetes/pkg/kubectl/cmd/exec" + "k8s.io/kubectl/pkg/cmd/exec" "bytes" diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/cp/cp_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/cp/cp_test.go index fdd86165d7d..c281f6c152b 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/cp/cp_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/cp/cp_test.go @@ -40,8 +40,8 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/rest/fake" "k8s.io/kubectl/pkg/scheme" - kexec "k8s.io/kubernetes/pkg/kubectl/cmd/exec" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + kexec "k8s.io/kubectl/pkg/cmd/exec" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) type FileType int diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_clusterrole_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_clusterrole_test.go index 6c5eef0fe65..541e8a8ec6e 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_clusterrole_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_clusterrole_test.go @@ -26,7 +26,7 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/rest/fake" "k8s.io/kubectl/pkg/scheme" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) func TestCreateClusterRole(t *testing.T) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_clusterrolebinding_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_clusterrolebinding_test.go index facea12a5e7..1df8acc7691 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_clusterrolebinding_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_clusterrolebinding_test.go @@ -32,7 +32,7 @@ import ( restclient "k8s.io/client-go/rest" "k8s.io/client-go/rest/fake" "k8s.io/kubectl/pkg/scheme" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) func TestCreateClusterRoleBinding(t *testing.T) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_configmap_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_configmap_test.go index e9114a17c90..23a872842ca 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_configmap_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_configmap_test.go @@ -25,7 +25,7 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/rest/fake" "k8s.io/kubectl/pkg/scheme" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) func TestCreateConfigMap(t *testing.T) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_deployment_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_deployment_test.go index 7f70184ebb7..e89565d4fdd 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_deployment_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_deployment_test.go @@ -29,7 +29,7 @@ import ( "k8s.io/client-go/rest/fake" generateversioned "k8s.io/kubectl/pkg/generate/versioned" "k8s.io/kubectl/pkg/scheme" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) func Test_generatorFromName(t *testing.T) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_namespace_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_namespace_test.go index 23ed2492911..6ad727f9755 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_namespace_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_namespace_test.go @@ -25,7 +25,7 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/rest/fake" "k8s.io/kubectl/pkg/scheme" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) func TestCreateNamespace(t *testing.T) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_pdb_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_pdb_test.go index 8da5917a503..19e20a9ef9e 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_pdb_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_pdb_test.go @@ -27,7 +27,7 @@ import ( restclient "k8s.io/client-go/rest" "k8s.io/client-go/rest/fake" "k8s.io/kubectl/pkg/scheme" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) func TestCreatePdb(t *testing.T) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_priorityclass_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_priorityclass_test.go index 26464ec69db..de511885998 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_priorityclass_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_priorityclass_test.go @@ -27,7 +27,7 @@ import ( restclient "k8s.io/client-go/rest" "k8s.io/client-go/rest/fake" "k8s.io/kubectl/pkg/scheme" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) func TestCreatePriorityClass(t *testing.T) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_quota_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_quota_test.go index 2f48fd75541..430e387976b 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_quota_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_quota_test.go @@ -21,7 +21,7 @@ import ( "k8s.io/api/core/v1" "k8s.io/cli-runtime/pkg/genericclioptions" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) func TestCreateQuota(t *testing.T) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_role_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_role_test.go index 2ba453a7ef2..ad25e11b575 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_role_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_role_test.go @@ -28,7 +28,7 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/rest/fake" "k8s.io/kubectl/pkg/scheme" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) func TestCreateRole(t *testing.T) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_rolebinding_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_rolebinding_test.go index 620cc6d3e12..ba814065635 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_rolebinding_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_rolebinding_test.go @@ -32,7 +32,7 @@ import ( restclient "k8s.io/client-go/rest" "k8s.io/client-go/rest/fake" "k8s.io/kubectl/pkg/scheme" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) var groupVersion = schema.GroupVersion{Group: "rbac.authorization.k8s.io", Version: "v1"} diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_secret_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_secret_test.go index 7ed86bc852f..ac5505196ef 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_secret_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_secret_test.go @@ -25,7 +25,7 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/rest/fake" "k8s.io/kubectl/pkg/scheme" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) func TestCreateSecretGeneric(t *testing.T) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_service_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_service_test.go index 5a3943f8773..b9af93b0dcc 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_service_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_service_test.go @@ -25,7 +25,7 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/rest/fake" "k8s.io/kubectl/pkg/scheme" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) func TestCreateService(t *testing.T) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_serviceaccount_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_serviceaccount_test.go index e9e549aad08..293fc2ccad0 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_serviceaccount_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_serviceaccount_test.go @@ -25,7 +25,7 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/rest/fake" "k8s.io/kubectl/pkg/scheme" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) func TestCreateServiceAccount(t *testing.T) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_test.go index 669ac10024d..c80ef26b236 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_test.go @@ -25,7 +25,7 @@ import ( "k8s.io/cli-runtime/pkg/resource" "k8s.io/client-go/rest/fake" "k8s.io/kubectl/pkg/scheme" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) func TestExtraArgsFail(t *testing.T) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/delete/delete.go b/staging/src/k8s.io/kubectl/pkg/cmd/delete/delete.go index a21fbbf7d78..e0c8b6a7875 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/delete/delete.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/delete/delete.go @@ -37,7 +37,7 @@ import ( "k8s.io/kubectl/pkg/rawhttp" "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" - cmdwait "k8s.io/kubernetes/pkg/kubectl/cmd/wait" + cmdwait "k8s.io/kubectl/pkg/cmd/wait" ) var ( diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/delete/delete_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/delete/delete_test.go index 7daf8294638..da8a733482c 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/delete/delete_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/delete/delete_test.go @@ -33,7 +33,7 @@ import ( "k8s.io/cli-runtime/pkg/resource" "k8s.io/client-go/rest/fake" "k8s.io/kubectl/pkg/scheme" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) func fakecmd() *cobra.Command { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/describe/describe_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/describe/describe_test.go index 294c3115055..e3aec934130 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/describe/describe_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/describe/describe_test.go @@ -29,7 +29,7 @@ import ( "k8s.io/kubectl/pkg/describe" versioneddescribe "k8s.io/kubectl/pkg/describe/versioned" "k8s.io/kubectl/pkg/scheme" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) // Verifies that schemas that are not in the master tree of Kubernetes can be retrieved via Get. diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/diff/diff.go b/staging/src/k8s.io/kubectl/pkg/cmd/diff/diff.go index faaa735f3e4..8d49b3839b3 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/diff/diff.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/diff/diff.go @@ -42,7 +42,7 @@ import ( "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/openapi" "k8s.io/kubectl/pkg/util/templates" - "k8s.io/kubernetes/pkg/kubectl/cmd/apply" + "k8s.io/kubectl/pkg/cmd/apply" "k8s.io/utils/exec" "sigs.k8s.io/yaml" ) diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/drain/drain_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/drain/drain_test.go index a910aaba57a..5c4dd68343d 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/drain/drain_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/drain/drain_test.go @@ -50,7 +50,7 @@ import ( cmdutil "k8s.io/kubectl/pkg/cmd/util" "k8s.io/kubectl/pkg/drain" "k8s.io/kubectl/pkg/scheme" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" utilpointer "k8s.io/utils/pointer" ) diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/edit/edit_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/edit/edit_test.go index 611175009d7..5a4392ea518 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/edit/edit_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/edit/edit_test.go @@ -39,9 +39,9 @@ import ( "k8s.io/cli-runtime/pkg/resource" "k8s.io/client-go/rest/fake" cmdutil "k8s.io/kubectl/pkg/cmd/util" - "k8s.io/kubernetes/pkg/kubectl/cmd/apply" - "k8s.io/kubernetes/pkg/kubectl/cmd/create" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + "k8s.io/kubectl/pkg/cmd/apply" + "k8s.io/kubectl/pkg/cmd/create" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) type EditTestCase struct { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/exec/exec_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/exec/exec_test.go index 9f894c565c5..b132d44ed60 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/exec/exec_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/exec/exec_test.go @@ -37,7 +37,7 @@ import ( "k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/util/term" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) type fakeRemoteExecutor struct { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/expose/expose_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/expose/expose_test.go index a0ea1a2bf40..cfe504b07e5 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/expose/expose_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/expose/expose_test.go @@ -30,7 +30,7 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/rest/fake" "k8s.io/kubectl/pkg/scheme" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) func TestRunExposeService(t *testing.T) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/label/label_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/label/label_test.go index 93d5c448f29..e46232d4b75 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/label/label_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/label/label_test.go @@ -30,7 +30,7 @@ import ( "k8s.io/cli-runtime/pkg/resource" "k8s.io/client-go/rest/fake" "k8s.io/kubectl/pkg/scheme" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) func TestValidateLabels(t *testing.T) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/logs/logs_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/logs/logs_test.go index 2fd150bbcb4..c783a06cb2d 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/logs/logs_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/logs/logs_test.go @@ -33,7 +33,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/cli-runtime/pkg/genericclioptions" restclient "k8s.io/client-go/rest" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) func TestLog(t *testing.T) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/patch/patch_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/patch/patch_test.go index 33ba14649bc..ad8b2afe382 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/patch/patch_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/patch/patch_test.go @@ -25,7 +25,7 @@ import ( "k8s.io/cli-runtime/pkg/resource" "k8s.io/client-go/rest/fake" "k8s.io/kubectl/pkg/scheme" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) func TestPatchObject(t *testing.T) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/portforward/portforward_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/portforward/portforward_test.go index a491d47aac6..bdd67d39468 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/portforward/portforward_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/portforward/portforward_test.go @@ -32,7 +32,7 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/rest/fake" "k8s.io/kubectl/pkg/scheme" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) type fakePortForwarder struct { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/replace/replace.go b/staging/src/k8s.io/kubectl/pkg/cmd/replace/replace.go index 0c01824f86c..911497e0089 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/replace/replace.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/replace/replace.go @@ -41,7 +41,7 @@ import ( "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" "k8s.io/kubectl/pkg/validation" - "k8s.io/kubernetes/pkg/kubectl/cmd/delete" + "k8s.io/kubectl/pkg/cmd/delete" ) var ( diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/replace/replace_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/replace/replace_test.go index 342fcd18a89..48b310b63c4 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/replace/replace_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/replace/replace_test.go @@ -26,7 +26,7 @@ import ( "k8s.io/cli-runtime/pkg/resource" "k8s.io/client-go/rest/fake" "k8s.io/kubectl/pkg/scheme" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) func TestReplaceObject(t *testing.T) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/rollingupdate/rollingupdate_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/rollingupdate/rollingupdate_test.go index d063c6cbdd2..a3aa07ee1fb 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/rollingupdate/rollingupdate_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/rollingupdate/rollingupdate_test.go @@ -20,7 +20,7 @@ import ( "testing" "k8s.io/cli-runtime/pkg/genericclioptions" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) func TestValidateArgs(t *testing.T) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout_pause.go b/staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout_pause.go index 61ba901cc14..8c62d20cbc3 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout_pause.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout_pause.go @@ -31,7 +31,7 @@ import ( "k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" - "k8s.io/kubernetes/pkg/kubectl/cmd/set" + "k8s.io/kubectl/pkg/cmd/set" ) // PauseOptions is the start of the data required to perform the operation. As new fields are added, add them here instead of diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout_pause_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout_pause_test.go index 0c0c4dda09f..e7566b00a3b 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout_pause_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout_pause_test.go @@ -31,7 +31,7 @@ import ( restclient "k8s.io/client-go/rest" "k8s.io/client-go/rest/fake" "k8s.io/kubectl/pkg/scheme" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) var rolloutPauseGroupVersionEncoder = schema.GroupVersion{Group: "extensions", Version: "v1beta1"} diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout_restart.go b/staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout_restart.go index 7d60f2165c6..ebc49b25cd8 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout_restart.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout_restart.go @@ -30,7 +30,7 @@ import ( "k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" - "k8s.io/kubernetes/pkg/kubectl/cmd/set" + "k8s.io/kubectl/pkg/cmd/set" ) // RestartOptions is the start of the data required to perform the operation. As new fields are added, add them here instead of diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout_resume.go b/staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout_resume.go index eb96500d54f..63a5a8d975b 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout_resume.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout_resume.go @@ -31,7 +31,7 @@ import ( "k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" - "k8s.io/kubernetes/pkg/kubectl/cmd/set" + "k8s.io/kubectl/pkg/cmd/set" ) // ResumeOptions is the start of the data required to perform the operation. As new fields are added, add them here instead of diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/run/run.go b/staging/src/k8s.io/kubectl/pkg/cmd/run/run.go index ace13a74384..06d2efe92bd 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/run/run.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/run/run.go @@ -50,10 +50,10 @@ import ( "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/interrupt" "k8s.io/kubectl/pkg/util/templates" - "k8s.io/kubernetes/pkg/kubectl/cmd/attach" - "k8s.io/kubernetes/pkg/kubectl/cmd/delete" - "k8s.io/kubernetes/pkg/kubectl/cmd/exec" - "k8s.io/kubernetes/pkg/kubectl/cmd/logs" + "k8s.io/kubectl/pkg/cmd/attach" + "k8s.io/kubectl/pkg/cmd/delete" + "k8s.io/kubectl/pkg/cmd/exec" + "k8s.io/kubectl/pkg/cmd/logs" uexec "k8s.io/utils/exec" ) diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/run/run_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/run/run_test.go index ff18cb91858..aa7d16db49d 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/run/run_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/run/run_test.go @@ -39,8 +39,8 @@ import ( cmdutil "k8s.io/kubectl/pkg/cmd/util" "k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/util/i18n" - "k8s.io/kubernetes/pkg/kubectl/cmd/delete" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + "k8s.io/kubectl/pkg/cmd/delete" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) func TestGetRestartPolicy(t *testing.T) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/set/set_env.go b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_env.go index ad18f20afc7..263604e4765 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/set/set_env.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_env.go @@ -38,7 +38,7 @@ import ( "k8s.io/kubectl/pkg/polymorphichelpers" "k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/util/templates" - envutil "k8s.io/kubernetes/pkg/kubectl/cmd/set/env" + envutil "k8s.io/kubectl/pkg/cmd/set/env" ) var ( diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/set/set_env_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_env_test.go index 2881245a49e..027d931a8f0 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/set/set_env_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_env_test.go @@ -38,7 +38,7 @@ import ( restclient "k8s.io/client-go/rest" "k8s.io/client-go/rest/fake" "k8s.io/kubectl/pkg/scheme" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) func TestSetEnvLocal(t *testing.T) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/set/set_image_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_image_test.go index 486f206138f..cb8f2d80eac 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/set/set_image_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_image_test.go @@ -39,7 +39,7 @@ import ( restclient "k8s.io/client-go/rest" "k8s.io/client-go/rest/fake" "k8s.io/kubectl/pkg/scheme" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) func TestImageLocal(t *testing.T) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/set/set_resources_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_resources_test.go index 1302a0a6d1c..9d7f72fc609 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/set/set_resources_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_resources_test.go @@ -38,7 +38,7 @@ import ( restclient "k8s.io/client-go/rest" "k8s.io/client-go/rest/fake" "k8s.io/kubectl/pkg/scheme" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) func TestResourcesLocal(t *testing.T) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/set/set_serviceaccount_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_serviceaccount_test.go index 1043999a887..3ec73cd9399 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/set/set_serviceaccount_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_serviceaccount_test.go @@ -38,7 +38,7 @@ import ( restclient "k8s.io/client-go/rest" "k8s.io/client-go/rest/fake" "k8s.io/kubectl/pkg/scheme" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) const ( diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/set/set_subject_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_subject_test.go index 00ea2b0ab03..91cb6e6cc42 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/set/set_subject_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_subject_test.go @@ -24,7 +24,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/cli-runtime/pkg/resource" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) func TestValidate(t *testing.T) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/taint/taint_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/taint/taint_test.go index bf42d587c4c..54d85f86d06 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/taint/taint_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/taint/taint_test.go @@ -32,7 +32,7 @@ import ( "k8s.io/client-go/rest/fake" cmdutil "k8s.io/kubectl/pkg/cmd/util" "k8s.io/kubectl/pkg/scheme" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) func generateNodeAndTaintedNode(oldTaints []corev1.Taint, newTaints []corev1.Taint) (*corev1.Node, *corev1.Node) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/top/top_node_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/top/top_node_test.go index 83ac08e6aa9..31fbed974bf 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/top/top_node_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/top/top_node_test.go @@ -32,7 +32,7 @@ import ( "k8s.io/client-go/rest/fake" core "k8s.io/client-go/testing" "k8s.io/kubectl/pkg/scheme" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" metricsv1alpha1api "k8s.io/metrics/pkg/apis/metrics/v1alpha1" metricsv1beta1api "k8s.io/metrics/pkg/apis/metrics/v1beta1" metricsfake "k8s.io/metrics/pkg/client/clientset/versioned/fake" diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/top/top_pod_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/top/top_pod_test.go index e654d955657..abea6a19af6 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/top/top_pod_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/top/top_pod_test.go @@ -38,7 +38,7 @@ import ( core "k8s.io/client-go/testing" cmdutil "k8s.io/kubectl/pkg/cmd/util" "k8s.io/kubectl/pkg/scheme" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" metricsv1alpha1api "k8s.io/metrics/pkg/apis/metrics/v1alpha1" metricsv1beta1api "k8s.io/metrics/pkg/apis/metrics/v1beta1" metricsfake "k8s.io/metrics/pkg/client/clientset/versioned/fake" diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/top/top_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/top/top_test.go index eaa6856444c..09121a61eca 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/top/top_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/top/top_test.go @@ -29,7 +29,7 @@ import ( "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/cli-runtime/pkg/genericclioptions" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" metricsv1alpha1api "k8s.io/metrics/pkg/apis/metrics/v1alpha1" metricsv1beta1api "k8s.io/metrics/pkg/apis/metrics/v1beta1" ) From dc743f7edd1b0104f09ef7dcc1e31c712f850843 Mon Sep 17 00:00:00 2001 From: Sean Sullivan Date: Thu, 1 Aug 2019 13:12:31 -0700 Subject: [PATCH 3/7] Update BUILD files reflecting code move to staging --- build/visible_to/BUILD | 283 ++++++++++-------- pkg/kubectl/cmd/BUILD | 87 ++++++ pkg/kubectl/cmd/auth/BUILD | 2 +- pkg/kubectl/cmd/cmd.go | 9 +- pkg/kubectl/cmd/convert/BUILD | 2 +- pkg/kubectl/cmd/get/BUILD | 2 +- staging/src/k8s.io/kubectl/BUILD | 2 +- staging/src/k8s.io/kubectl/pkg/cmd/BUILD | 154 +++------- .../src/k8s.io/kubectl/pkg/cmd/annotate/BUILD | 5 +- .../k8s.io/kubectl/pkg/cmd/apiresources/BUILD | 3 +- .../src/k8s.io/kubectl/pkg/cmd/apply/BUILD | 7 +- .../src/k8s.io/kubectl/pkg/cmd/attach/BUILD | 9 +- .../k8s.io/kubectl/pkg/cmd/autoscale/BUILD | 3 +- .../k8s.io/kubectl/pkg/cmd/certificates/BUILD | 3 +- .../k8s.io/kubectl/pkg/cmd/clusterinfo/BUILD | 5 +- .../k8s.io/kubectl/pkg/cmd/completion/BUILD | 3 +- .../src/k8s.io/kubectl/pkg/cmd/config/BUILD | 3 +- staging/src/k8s.io/kubectl/pkg/cmd/cp/BUILD | 9 +- .../src/k8s.io/kubectl/pkg/cmd/create/BUILD | 5 +- .../src/k8s.io/kubectl/pkg/cmd/delete/BUILD | 7 +- .../src/k8s.io/kubectl/pkg/cmd/describe/BUILD | 5 +- staging/src/k8s.io/kubectl/pkg/cmd/diff/BUILD | 5 +- .../src/k8s.io/kubectl/pkg/cmd/drain/BUILD | 5 +- staging/src/k8s.io/kubectl/pkg/cmd/edit/BUILD | 13 +- .../kubectl/pkg/cmd/edit/testdata/BUILD | 3 +- staging/src/k8s.io/kubectl/pkg/cmd/exec/BUILD | 5 +- .../src/k8s.io/kubectl/pkg/cmd/explain/BUILD | 3 +- .../src/k8s.io/kubectl/pkg/cmd/expose/BUILD | 5 +- staging/src/k8s.io/kubectl/pkg/cmd/help/BUILD | 3 +- .../k8s.io/kubectl/pkg/cmd/kustomize/BUILD | 3 +- .../src/k8s.io/kubectl/pkg/cmd/label/BUILD | 5 +- staging/src/k8s.io/kubectl/pkg/cmd/logs/BUILD | 5 +- .../src/k8s.io/kubectl/pkg/cmd/options/BUILD | 3 +- .../src/k8s.io/kubectl/pkg/cmd/patch/BUILD | 5 +- .../src/k8s.io/kubectl/pkg/cmd/plugin/BUILD | 3 +- .../k8s.io/kubectl/pkg/cmd/portforward/BUILD | 5 +- .../src/k8s.io/kubectl/pkg/cmd/profiling.go | 6 +- .../src/k8s.io/kubectl/pkg/cmd/proxy/BUILD | 3 +- .../src/k8s.io/kubectl/pkg/cmd/replace/BUILD | 7 +- .../kubectl/pkg/cmd/rollingupdate/BUILD | 5 +- .../src/k8s.io/kubectl/pkg/cmd/rollout/BUILD | 7 +- staging/src/k8s.io/kubectl/pkg/cmd/run/BUILD | 15 +- .../src/k8s.io/kubectl/pkg/cmd/scale/BUILD | 3 +- staging/src/k8s.io/kubectl/pkg/cmd/set/BUILD | 9 +- .../src/k8s.io/kubectl/pkg/cmd/set/env/BUILD | 3 +- .../src/k8s.io/kubectl/pkg/cmd/taint/BUILD | 5 +- .../src/k8s.io/kubectl/pkg/cmd/testing/BUILD | 3 +- staging/src/k8s.io/kubectl/pkg/cmd/top/BUILD | 5 +- .../src/k8s.io/kubectl/pkg/cmd/version/BUILD | 3 +- staging/src/k8s.io/kubectl/pkg/cmd/wait/BUILD | 3 +- 50 files changed, 418 insertions(+), 338 deletions(-) create mode 100644 pkg/kubectl/cmd/BUILD diff --git a/build/visible_to/BUILD b/build/visible_to/BUILD index c446cc37915..2f71fa1cabf 100644 --- a/build/visible_to/BUILD +++ b/build/visible_to/BUILD @@ -84,12 +84,13 @@ package_group( "//cmd/kubectl/app", "//pkg/kubectl/cmd", "//pkg/kubectl/cmd/auth", - "//pkg/kubectl/cmd/config", - "//pkg/kubectl/cmd/rollout", - "//pkg/kubectl/cmd/set", - "//pkg/kubectl/cmd/testing", - "//pkg/kubectl/cmd/util", - "//pkg/kubectl/cmd/util/editor", + "//staging/src/k8s.io/kubectl/pkg/cmd", + "//staging/src/k8s.io/kubectl/pkg/cmd/config", + "//staging/src/k8s.io/kubectl/pkg/cmd/rollout", + "//staging/src/k8s.io/kubectl/pkg/cmd/set", + "//staging/src/k8s.io/kubectl/pkg/cmd/testing", + "//staging/src/k8s.io/kubectl/pkg/cmd/util", + "//staging/src/k8s.io/kubectl/pkg/cmd/util/editor", ], ) @@ -112,6 +113,8 @@ package_group( "//cmd/kubectl/app", "//pkg/kubectl", "//pkg/kubectl/cmd", + "//staging/src/k8s.io/kubectl/pkg", + "//staging/src/k8s.io/kubectl/pkg/cmd", ], ) @@ -119,7 +122,8 @@ package_group( name = "pkg_kubectl_cmd_auth_CONSUMERS", packages = [ "//pkg/kubectl/cmd", - "//pkg/kubectl/cmd/rollout", + "//staging/src/k8s.io/kubectl/pkg/cmd", + "//staging/src/k8s.io/kubectl/pkg/cmd/rollout", ], ) @@ -127,6 +131,7 @@ package_group( name = "pkg_kubectl_cmd_config_CONSUMERS", packages = [ "//pkg/kubectl/cmd", + "//staging/src/k8s.io/kubectl/pkg/cmd", ], ) @@ -134,7 +139,8 @@ package_group( name = "pkg_kubectl_cmd_create_CONSUMERS", packages = [ "//pkg/kubectl/cmd", - "//pkg/kubectl/cmd/edit", + "//staging/src/k8s.io/kubectl/pkg/cmd", + "//staging/src/k8s.io/kubectl/pkg/cmd/edit", ], ) @@ -142,6 +148,7 @@ package_group( name = "pkg_kubectl_cmd_get_CONSUMERS", packages = [ "//pkg/kubectl/cmd", + "//staging/src/k8s.io/kubectl/pkg/cmd", ], ) @@ -149,6 +156,7 @@ package_group( name = "pkg_kubectl_cmd_rollout_CONSUMERS", packages = [ "//pkg/kubectl/cmd", + "//staging/src/k8s.io/kubectl/pkg/cmd", ], ) @@ -156,7 +164,8 @@ package_group( name = "pkg_kubectl_cmd_set_CONSUMERS", packages = [ "//pkg/kubectl/cmd", - "//pkg/kubectl/cmd/rollout", + "//staging/src/k8s.io/kubectl/pkg/cmd", + "//staging/src/k8s.io/kubectl/pkg/cmd/rollout", ], ) @@ -170,57 +179,58 @@ package_group( "//cmd/kubectl", "//cmd/kubectl/app", "//pkg/kubectl/cmd", - "//pkg/kubectl/cmd/annotate", - "//pkg/kubectl/cmd/apiresources", - "//pkg/kubectl/cmd/apply", - "//pkg/kubectl/cmd/attach", "//pkg/kubectl/cmd/auth", - "//pkg/kubectl/cmd/autoscale", - "//pkg/kubectl/cmd/certificates", - "//pkg/kubectl/cmd/clusterinfo", - "//pkg/kubectl/cmd/completion", - "//pkg/kubectl/cmd/config", "//pkg/kubectl/cmd/convert", - "//pkg/kubectl/cmd/cp", - "//pkg/kubectl/cmd/create", - "//pkg/kubectl/cmd/delete", - "//pkg/kubectl/cmd/describe", - "//pkg/kubectl/cmd/diff", - "//pkg/kubectl/cmd/drain", - "//pkg/kubectl/cmd/edit", - "//pkg/kubectl/cmd/exec", - "//pkg/kubectl/cmd/explain", - "//pkg/kubectl/cmd/expose", "//pkg/kubectl/cmd/get", - "//pkg/kubectl/cmd/help", - "//pkg/kubectl/cmd/kustomize", - "//pkg/kubectl/cmd/label", - "//pkg/kubectl/cmd/logs", - "//pkg/kubectl/cmd/options", - "//pkg/kubectl/cmd/patch", - "//pkg/kubectl/cmd/plugin", - "//pkg/kubectl/cmd/portforward", - "//pkg/kubectl/cmd/proxy", - "//pkg/kubectl/cmd/replace", - "//pkg/kubectl/cmd/rollingupdate", - "//pkg/kubectl/cmd/rollout", - "//pkg/kubectl/cmd/run", - "//pkg/kubectl/cmd/scale", - "//pkg/kubectl/cmd/set", - "//pkg/kubectl/cmd/taint", - "//pkg/kubectl/cmd/top", - "//pkg/kubectl/cmd/util", - "//pkg/kubectl/cmd/util/sanity", - "//pkg/kubectl/cmd/version", - "//pkg/kubectl/cmd/wait", "//pkg/kubectl/util", + "//staging/src/k8s.io/kubectl/pkg/cmd", + "//staging/src/k8s.io/kubectl/pkg/cmd/annotate", + "//staging/src/k8s.io/kubectl/pkg/cmd/apiresources", + "//staging/src/k8s.io/kubectl/pkg/cmd/apply", + "//staging/src/k8s.io/kubectl/pkg/cmd/attach", + "//staging/src/k8s.io/kubectl/pkg/cmd/autoscale", + "//staging/src/k8s.io/kubectl/pkg/cmd/certificates", + "//staging/src/k8s.io/kubectl/pkg/cmd/clusterinfo", + "//staging/src/k8s.io/kubectl/pkg/cmd/completion", + "//staging/src/k8s.io/kubectl/pkg/cmd/config", + "//staging/src/k8s.io/kubectl/pkg/cmd/cp", + "//staging/src/k8s.io/kubectl/pkg/cmd/create", + "//staging/src/k8s.io/kubectl/pkg/cmd/delete", + "//staging/src/k8s.io/kubectl/pkg/cmd/describe", + "//staging/src/k8s.io/kubectl/pkg/cmd/diff", + "//staging/src/k8s.io/kubectl/pkg/cmd/drain", + "//staging/src/k8s.io/kubectl/pkg/cmd/edit", + "//staging/src/k8s.io/kubectl/pkg/cmd/exec", + "//staging/src/k8s.io/kubectl/pkg/cmd/explain", + "//staging/src/k8s.io/kubectl/pkg/cmd/expose", + "//staging/src/k8s.io/kubectl/pkg/cmd/help", + "//staging/src/k8s.io/kubectl/pkg/cmd/kustomize", + "//staging/src/k8s.io/kubectl/pkg/cmd/label", + "//staging/src/k8s.io/kubectl/pkg/cmd/logs", + "//staging/src/k8s.io/kubectl/pkg/cmd/options", + "//staging/src/k8s.io/kubectl/pkg/cmd/patch", + "//staging/src/k8s.io/kubectl/pkg/cmd/plugin", + "//staging/src/k8s.io/kubectl/pkg/cmd/portforward", + "//staging/src/k8s.io/kubectl/pkg/cmd/proxy", + "//staging/src/k8s.io/kubectl/pkg/cmd/replace", + "//staging/src/k8s.io/kubectl/pkg/cmd/rollingupdate", + "//staging/src/k8s.io/kubectl/pkg/cmd/rollout", + "//staging/src/k8s.io/kubectl/pkg/cmd/run", + "//staging/src/k8s.io/kubectl/pkg/cmd/scale", + "//staging/src/k8s.io/kubectl/pkg/cmd/set", + "//staging/src/k8s.io/kubectl/pkg/cmd/taint", + "//staging/src/k8s.io/kubectl/pkg/cmd/top", + "//staging/src/k8s.io/kubectl/pkg/cmd/util", + "//staging/src/k8s.io/kubectl/pkg/cmd/util/sanity", + "//staging/src/k8s.io/kubectl/pkg/cmd/version", + "//staging/src/k8s.io/kubectl/pkg/cmd/wait", ], ) package_group( name = "pkg_kubectl_cmd_edit_testdata_CONSUMERS", packages = [ - "//pkg/kubectl/cmd/edit", + "//staging/src/k8s.io/kubectl/pkg/cmd/edit", ], ) @@ -228,34 +238,35 @@ package_group( name = "pkg_kubectl_cmd_testing_CONSUMERS", packages = [ "//pkg/kubectl/cmd", - "//pkg/kubectl/cmd/annotate", - "//pkg/kubectl/cmd/apply", - "//pkg/kubectl/cmd/attach", "//pkg/kubectl/cmd/auth", - "//pkg/kubectl/cmd/clusterinfo", "//pkg/kubectl/cmd/convert", - "//pkg/kubectl/cmd/cp", - "//pkg/kubectl/cmd/create", - "//pkg/kubectl/cmd/delete", - "//pkg/kubectl/cmd/describe", - "//pkg/kubectl/cmd/drain", - "//pkg/kubectl/cmd/edit", - "//pkg/kubectl/cmd/exec", - "//pkg/kubectl/cmd/expose", "//pkg/kubectl/cmd/get", - "//pkg/kubectl/cmd/label", - "//pkg/kubectl/cmd/logs", - "//pkg/kubectl/cmd/patch", - "//pkg/kubectl/cmd/portforward", - "//pkg/kubectl/cmd/replace", - "//pkg/kubectl/cmd/rollingupdate", - "//pkg/kubectl/cmd/rollout", - "//pkg/kubectl/cmd/run", - "//pkg/kubectl/cmd/set", - "//pkg/kubectl/cmd/taint", - "//pkg/kubectl/cmd/testing", - "//pkg/kubectl/cmd/top", "//pkg/kubectl/explain", + "//staging/src/k8s.io/kubectl/pkg/cmd", + "//staging/src/k8s.io/kubectl/pkg/cmd/annotate", + "//staging/src/k8s.io/kubectl/pkg/cmd/apply", + "//staging/src/k8s.io/kubectl/pkg/cmd/attach", + "//staging/src/k8s.io/kubectl/pkg/cmd/clusterinfo", + "//staging/src/k8s.io/kubectl/pkg/cmd/cp", + "//staging/src/k8s.io/kubectl/pkg/cmd/create", + "//staging/src/k8s.io/kubectl/pkg/cmd/delete", + "//staging/src/k8s.io/kubectl/pkg/cmd/describe", + "//staging/src/k8s.io/kubectl/pkg/cmd/drain", + "//staging/src/k8s.io/kubectl/pkg/cmd/edit", + "//staging/src/k8s.io/kubectl/pkg/cmd/exec", + "//staging/src/k8s.io/kubectl/pkg/cmd/expose", + "//staging/src/k8s.io/kubectl/pkg/cmd/label", + "//staging/src/k8s.io/kubectl/pkg/cmd/logs", + "//staging/src/k8s.io/kubectl/pkg/cmd/patch", + "//staging/src/k8s.io/kubectl/pkg/cmd/portforward", + "//staging/src/k8s.io/kubectl/pkg/cmd/replace", + "//staging/src/k8s.io/kubectl/pkg/cmd/rollingupdate", + "//staging/src/k8s.io/kubectl/pkg/cmd/rollout", + "//staging/src/k8s.io/kubectl/pkg/cmd/run", + "//staging/src/k8s.io/kubectl/pkg/cmd/set", + "//staging/src/k8s.io/kubectl/pkg/cmd/taint", + "//staging/src/k8s.io/kubectl/pkg/cmd/testing", + "//staging/src/k8s.io/kubectl/pkg/cmd/top", ], ) @@ -270,49 +281,50 @@ package_group( "//cmd/kubectl", "//cmd/kubectl/app", "//pkg/kubectl/cmd", - "//pkg/kubectl/cmd/annotate", - "//pkg/kubectl/cmd/apiresources", - "//pkg/kubectl/cmd/apply", - "//pkg/kubectl/cmd/attach", "//pkg/kubectl/cmd/auth", - "//pkg/kubectl/cmd/autoscale", - "//pkg/kubectl/cmd/certificates", - "//pkg/kubectl/cmd/clusterinfo", - "//pkg/kubectl/cmd/completion", - "//pkg/kubectl/cmd/config", "//pkg/kubectl/cmd/convert", - "//pkg/kubectl/cmd/cp", - "//pkg/kubectl/cmd/create", - "//pkg/kubectl/cmd/delete", - "//pkg/kubectl/cmd/describe", - "//pkg/kubectl/cmd/diff", - "//pkg/kubectl/cmd/drain", - "//pkg/kubectl/cmd/edit", - "//pkg/kubectl/cmd/exec", - "//pkg/kubectl/cmd/explain", - "//pkg/kubectl/cmd/expose", "//pkg/kubectl/cmd/get", - "//pkg/kubectl/cmd/help", - "//pkg/kubectl/cmd/label", - "//pkg/kubectl/cmd/logs", - "//pkg/kubectl/cmd/patch", - "//pkg/kubectl/cmd/plugin", - "//pkg/kubectl/cmd/portforward", - "//pkg/kubectl/cmd/proxy", - "//pkg/kubectl/cmd/replace", - "//pkg/kubectl/cmd/rollingupdate", - "//pkg/kubectl/cmd/rollout", - "//pkg/kubectl/cmd/run", - "//pkg/kubectl/cmd/scale", - "//pkg/kubectl/cmd/set", - "//pkg/kubectl/cmd/taint", - "//pkg/kubectl/cmd/testing", - "//pkg/kubectl/cmd/top", - "//pkg/kubectl/cmd/util", - "//pkg/kubectl/cmd/util/editor", - "//pkg/kubectl/cmd/util/sanity", - "//pkg/kubectl/cmd/version", - "//pkg/kubectl/cmd/wait", + "//staging/src/k8s.io/kubectl/pkg/cmd", + "//staging/src/k8s.io/kubectl/pkg/cmd/annotate", + "//staging/src/k8s.io/kubectl/pkg/cmd/apiresources", + "//staging/src/k8s.io/kubectl/pkg/cmd/apply", + "//staging/src/k8s.io/kubectl/pkg/cmd/attach", + "//staging/src/k8s.io/kubectl/pkg/cmd/autoscale", + "//staging/src/k8s.io/kubectl/pkg/cmd/certificates", + "//staging/src/k8s.io/kubectl/pkg/cmd/clusterinfo", + "//staging/src/k8s.io/kubectl/pkg/cmd/completion", + "//staging/src/k8s.io/kubectl/pkg/cmd/config", + "//staging/src/k8s.io/kubectl/pkg/cmd/cp", + "//staging/src/k8s.io/kubectl/pkg/cmd/create", + "//staging/src/k8s.io/kubectl/pkg/cmd/delete", + "//staging/src/k8s.io/kubectl/pkg/cmd/describe", + "//staging/src/k8s.io/kubectl/pkg/cmd/diff", + "//staging/src/k8s.io/kubectl/pkg/cmd/drain", + "//staging/src/k8s.io/kubectl/pkg/cmd/edit", + "//staging/src/k8s.io/kubectl/pkg/cmd/exec", + "//staging/src/k8s.io/kubectl/pkg/cmd/explain", + "//staging/src/k8s.io/kubectl/pkg/cmd/expose", + "//staging/src/k8s.io/kubectl/pkg/cmd/help", + "//staging/src/k8s.io/kubectl/pkg/cmd/label", + "//staging/src/k8s.io/kubectl/pkg/cmd/logs", + "//staging/src/k8s.io/kubectl/pkg/cmd/patch", + "//staging/src/k8s.io/kubectl/pkg/cmd/plugin", + "//staging/src/k8s.io/kubectl/pkg/cmd/portforward", + "//staging/src/k8s.io/kubectl/pkg/cmd/proxy", + "//staging/src/k8s.io/kubectl/pkg/cmd/replace", + "//staging/src/k8s.io/kubectl/pkg/cmd/rollingupdate", + "//staging/src/k8s.io/kubectl/pkg/cmd/rollout", + "//staging/src/k8s.io/kubectl/pkg/cmd/run", + "//staging/src/k8s.io/kubectl/pkg/cmd/scale", + "//staging/src/k8s.io/kubectl/pkg/cmd/set", + "//staging/src/k8s.io/kubectl/pkg/cmd/taint", + "//staging/src/k8s.io/kubectl/pkg/cmd/testing", + "//staging/src/k8s.io/kubectl/pkg/cmd/top", + "//staging/src/k8s.io/kubectl/pkg/cmd/util", + "//staging/src/k8s.io/kubectl/pkg/cmd/util/editor", + "//staging/src/k8s.io/kubectl/pkg/cmd/util/sanity", + "//staging/src/k8s.io/kubectl/pkg/cmd/version", + "//staging/src/k8s.io/kubectl/pkg/cmd/wait", ], ) @@ -320,10 +332,11 @@ package_group( name = "pkg_kubectl_cmd_util_editor_CONSUMERS", packages = [ "//pkg/kubectl/cmd", - "//pkg/kubectl/cmd/apply", - "//pkg/kubectl/cmd/create", - "//pkg/kubectl/cmd/edit", - "//pkg/kubectl/cmd/util", + "//staging/src/k8s.io/kubectl/pkg/cmd", + "//staging/src/k8s.io/kubectl/pkg/cmd/apply", + "//staging/src/k8s.io/kubectl/pkg/cmd/create", + "//staging/src/k8s.io/kubectl/pkg/cmd/edit", + "//staging/src/k8s.io/kubectl/pkg/cmd/util", ], ) @@ -331,7 +344,8 @@ package_group( name = "pkg_kubectl_cmd_util_jsonmerge_CONSUMERS", packages = [ "//pkg/kubectl/cmd", - "//pkg/kubectl/cmd/util", + "//staging/src/k8s.io/kubectl/pkg/cmd", + "//staging/src/k8s.io/kubectl/pkg/cmd/util", ], ) @@ -339,7 +353,7 @@ package_group( name = "pkg_kubectl_cmd_util_sanity_CONSUMERS", packages = [ "//cmd/clicheck", - "//pkg/kubectl/cmd/util", + "//staging/src/k8s.io/kubectl/pkg/cmd/util", ], ) @@ -353,7 +367,8 @@ package_group( "//cmd/kubectl/app", "//pkg/kubectl", "//pkg/kubectl/cmd", - "//pkg/kubectl/cmd/top", + "//staging/src/k8s.io/kubectl/pkg/cmd", + "//staging/src/k8s.io/kubectl/pkg/cmd/top", ], ) @@ -369,14 +384,15 @@ package_group( "//pkg/kubectl", "//pkg/kubectl/cmd", "//pkg/kubectl/cmd/auth", - "//pkg/kubectl/cmd/config", - "//pkg/kubectl/cmd/create", "//pkg/kubectl/cmd/get", - "//pkg/kubectl/cmd/rollout", - "//pkg/kubectl/cmd/set", - "//pkg/kubectl/cmd/testing", - "//pkg/kubectl/cmd/util", - "//pkg/kubectl/cmd/util/editor", + "//staging/src/k8s.io/kubectl/pkg/cmd", + "//staging/src/k8s.io/kubectl/pkg/cmd/config", + "//staging/src/k8s.io/kubectl/pkg/cmd/create", + "//staging/src/k8s.io/kubectl/pkg/cmd/rollout", + "//staging/src/k8s.io/kubectl/pkg/cmd/set", + "//staging/src/k8s.io/kubectl/pkg/cmd/testing", + "//staging/src/k8s.io/kubectl/pkg/cmd/util", + "//staging/src/k8s.io/kubectl/pkg/cmd/util/editor", ], ) @@ -403,12 +419,13 @@ package_group( packages = [ "//pkg/kubectl", "//pkg/kubectl/cmd", - "//pkg/kubectl/cmd/apply", "//pkg/kubectl/cmd/convert", - "//pkg/kubectl/cmd/replace", - "//pkg/kubectl/cmd/rollingupdate", - "//pkg/kubectl/cmd/testing", - "//pkg/kubectl/cmd/util", + "//staging/src/k8s.io/kubectl/pkg/cmd", + "//staging/src/k8s.io/kubectl/pkg/cmd/apply", + "//staging/src/k8s.io/kubectl/pkg/cmd/replace", + "//staging/src/k8s.io/kubectl/pkg/cmd/rollingupdate", + "//staging/src/k8s.io/kubectl/pkg/cmd/testing", + "//staging/src/k8s.io/kubectl/pkg/cmd/util", ], ) diff --git a/pkg/kubectl/cmd/BUILD b/pkg/kubectl/cmd/BUILD new file mode 100644 index 00000000000..f92760a7de4 --- /dev/null +++ b/pkg/kubectl/cmd/BUILD @@ -0,0 +1,87 @@ +load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") + +go_library( + name = "go_default_library", + srcs = ["cmd.go"], + importpath = "k8s.io/kubernetes/pkg/kubectl/cmd", + visibility = ["//visibility:public"], + deps = [ + "//pkg/kubectl/cmd/auth:go_default_library", + "//pkg/kubectl/cmd/convert:go_default_library", + "//pkg/kubectl/cmd/get:go_default_library", + "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library", + "//staging/src/k8s.io/client-go/tools/clientcmd:go_default_library", + "//staging/src/k8s.io/component-base/cli/flag:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/annotate:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/apiresources:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/apply:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/attach:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/autoscale:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/certificates:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/clusterinfo:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/completion:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/config:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/cp:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/create:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/delete:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/describe:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/diff:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/drain:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/edit:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/exec:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/explain:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/expose:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/kustomize:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/label:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/logs:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/options:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/patch:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/plugin:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/portforward:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/proxy:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/replace:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/rollingupdate:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/rollout:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/run:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/scale:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/set:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/taint:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/top:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/util:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/version:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/wait:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/util/i18n:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/util/templates:go_default_library", + "//vendor/github.com/spf13/cobra:go_default_library", + ], +) + +go_test( + name = "go_default_test", + srcs = ["cmd_test.go"], + embed = [":go_default_library"], + deps = [ + "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/util:go_default_library", + ], +) + +filegroup( + name = "package-srcs", + srcs = glob(["**"]), + tags = ["automanaged"], + visibility = ["//visibility:private"], +) + +filegroup( + name = "all-srcs", + srcs = [ + ":package-srcs", + "//pkg/kubectl/cmd/auth:all-srcs", + "//pkg/kubectl/cmd/convert:all-srcs", + "//pkg/kubectl/cmd/get:all-srcs", + ], + tags = ["automanaged"], + visibility = ["//visibility:public"], +) diff --git a/pkg/kubectl/cmd/auth/BUILD b/pkg/kubectl/cmd/auth/BUILD index 3027fc855f5..fc2242791b2 100644 --- a/pkg/kubectl/cmd/auth/BUILD +++ b/pkg/kubectl/cmd/auth/BUILD @@ -63,13 +63,13 @@ go_test( srcs = ["cani_test.go"], embed = [":go_default_library"], deps = [ - "//pkg/kubectl/cmd/testing:go_default_library", "//staging/src/k8s.io/api/authorization/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library", "//staging/src/k8s.io/client-go/rest:go_default_library", "//staging/src/k8s.io/client-go/rest/fake:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/testing:go_default_library", "//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library", ], ) diff --git a/pkg/kubectl/cmd/cmd.go b/pkg/kubectl/cmd/cmd.go index 234522e873e..983515088a0 100644 --- a/pkg/kubectl/cmd/cmd.go +++ b/pkg/kubectl/cmd/cmd.go @@ -30,6 +30,7 @@ import ( "k8s.io/client-go/tools/clientcmd" cliflag "k8s.io/component-base/cli/flag" + cmdpkg "k8s.io/kubectl/pkg/cmd" "k8s.io/kubectl/pkg/cmd/annotate" "k8s.io/kubectl/pkg/cmd/apiresources" "k8s.io/kubectl/pkg/cmd/apply" @@ -445,10 +446,10 @@ func NewKubectlCommand(in io.Reader, out, err io.Writer) *cobra.Command { // Hook before and after Run initialize and write profiles to disk, // respectively. PersistentPreRunE: func(*cobra.Command, []string) error { - return initProfiling() + return cmdpkg.InitProfiling() }, PersistentPostRunE: func(*cobra.Command, []string) error { - return flushProfiling() + return cmdpkg.FlushProfiling() }, BashCompletionFunction: bashCompletionFunc, } @@ -460,7 +461,7 @@ func NewKubectlCommand(in io.Reader, out, err io.Writer) *cobra.Command { // a.k.a. change all "_" to "-". e.g. glog package flags.SetNormalizeFunc(cliflag.WordSepNormalizeFunc) - addProfilingFlags(flags) + cmdpkg.AddProfilingFlags(flags) kubeConfigFlags := genericclioptions.NewConfigFlags(true).WithDeprecatedPasswordFlag() kubeConfigFlags.AddFlags(flags) @@ -562,7 +563,7 @@ func NewKubectlCommand(in io.Reader, out, err io.Writer) *cobra.Command { filters := []string{"options"} // Hide the "alpha" subcommand if there are no alpha commands in this build. - alpha := NewCmdAlpha(f, ioStreams) + alpha := cmdpkg.NewCmdAlpha(f, ioStreams) if !alpha.HasSubCommands() { filters = append(filters, alpha.Name()) } diff --git a/pkg/kubectl/cmd/convert/BUILD b/pkg/kubectl/cmd/convert/BUILD index 49be53e9580..a7e95ca51f1 100644 --- a/pkg/kubectl/cmd/convert/BUILD +++ b/pkg/kubectl/cmd/convert/BUILD @@ -49,9 +49,9 @@ go_test( ], embed = [":go_default_library"], deps = [ - "//pkg/kubectl/cmd/testing:go_default_library", "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library", "//staging/src/k8s.io/client-go/rest/fake:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/testing:go_default_library", ], ) diff --git a/pkg/kubectl/cmd/get/BUILD b/pkg/kubectl/cmd/get/BUILD index 813d6793b6c..80f39d71715 100644 --- a/pkg/kubectl/cmd/get/BUILD +++ b/pkg/kubectl/cmd/get/BUILD @@ -81,7 +81,6 @@ go_test( ], embed = [":go_default_library"], deps = [ - "//pkg/kubectl/cmd/testing:go_default_library", "//staging/src/k8s.io/api/apps/v1:go_default_library", "//staging/src/k8s.io/api/autoscaling/v1:go_default_library", "//staging/src/k8s.io/api/batch/v1:go_default_library", @@ -102,6 +101,7 @@ go_test( "//staging/src/k8s.io/client-go/rest:go_default_library", "//staging/src/k8s.io/client-go/rest/fake:go_default_library", "//staging/src/k8s.io/client-go/rest/watch:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/testing:go_default_library", "//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/openapi:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/openapi/testing:go_default_library", diff --git a/staging/src/k8s.io/kubectl/BUILD b/staging/src/k8s.io/kubectl/BUILD index 751294d37ca..a8ffb840cc8 100644 --- a/staging/src/k8s.io/kubectl/BUILD +++ b/staging/src/k8s.io/kubectl/BUILD @@ -11,7 +11,7 @@ filegroup( ":package-srcs", "//staging/src/k8s.io/kubectl/pkg/apply:all-srcs", "//staging/src/k8s.io/kubectl/pkg/apps:all-srcs", - "//staging/src/k8s.io/kubectl/pkg/cmd/util:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/cmd:all-srcs", "//staging/src/k8s.io/kubectl/pkg/describe:all-srcs", "//staging/src/k8s.io/kubectl/pkg/drain:all-srcs", "//staging/src/k8s.io/kubectl/pkg/explain:all-srcs", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/BUILD index a784682e130..90b67c34de0 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/BUILD @@ -1,64 +1,18 @@ -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", - "go_test", -) +load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = [ "alpha.go", - "cmd.go", "profiling.go", ], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd", + importpath = "k8s.io/kubectl/pkg/cmd", visibility = [ "//build/visible_to:pkg_kubectl_cmd_CONSUMERS", ], deps = [ - "//pkg/kubectl/cmd/annotate:go_default_library", - "//pkg/kubectl/cmd/apiresources:go_default_library", - "//pkg/kubectl/cmd/apply:go_default_library", - "//pkg/kubectl/cmd/attach:go_default_library", - "//pkg/kubectl/cmd/auth:go_default_library", - "//pkg/kubectl/cmd/autoscale:go_default_library", - "//pkg/kubectl/cmd/certificates:go_default_library", - "//pkg/kubectl/cmd/clusterinfo:go_default_library", - "//pkg/kubectl/cmd/completion:go_default_library", - "//pkg/kubectl/cmd/config:go_default_library", - "//pkg/kubectl/cmd/convert:go_default_library", - "//pkg/kubectl/cmd/cp:go_default_library", - "//pkg/kubectl/cmd/create:go_default_library", - "//pkg/kubectl/cmd/delete:go_default_library", - "//pkg/kubectl/cmd/describe:go_default_library", - "//pkg/kubectl/cmd/diff:go_default_library", - "//pkg/kubectl/cmd/drain:go_default_library", - "//pkg/kubectl/cmd/edit:go_default_library", - "//pkg/kubectl/cmd/exec:go_default_library", - "//pkg/kubectl/cmd/explain:go_default_library", - "//pkg/kubectl/cmd/expose:go_default_library", - "//pkg/kubectl/cmd/get:go_default_library", - "//pkg/kubectl/cmd/kustomize:go_default_library", - "//pkg/kubectl/cmd/label:go_default_library", - "//pkg/kubectl/cmd/logs:go_default_library", - "//pkg/kubectl/cmd/options:go_default_library", - "//pkg/kubectl/cmd/patch:go_default_library", - "//pkg/kubectl/cmd/plugin:go_default_library", - "//pkg/kubectl/cmd/portforward:go_default_library", - "//pkg/kubectl/cmd/proxy:go_default_library", - "//pkg/kubectl/cmd/replace:go_default_library", - "//pkg/kubectl/cmd/rollingupdate:go_default_library", - "//pkg/kubectl/cmd/rollout:go_default_library", - "//pkg/kubectl/cmd/run:go_default_library", - "//pkg/kubectl/cmd/scale:go_default_library", - "//pkg/kubectl/cmd/set:go_default_library", - "//pkg/kubectl/cmd/taint:go_default_library", - "//pkg/kubectl/cmd/top:go_default_library", - "//pkg/kubectl/cmd/version:go_default_library", - "//pkg/kubectl/cmd/wait:go_default_library", "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library", - "//staging/src/k8s.io/client-go/tools/clientcmd:go_default_library", - "//staging/src/k8s.io/component-base/cli/flag:go_default_library", "//staging/src/k8s.io/kubectl/pkg/cmd/util:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/i18n:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/templates:go_default_library", @@ -67,22 +21,6 @@ go_library( ], ) -go_test( - name = "go_default_test", - srcs = ["cmd_test.go"], - data = [ - "//api/openapi-spec", - "//pkg/kubectl/cmd/plugin:testdata", - "//test/e2e/testing-manifests:all-srcs", - "//test/fixtures", - ], - embed = [":go_default_library"], - deps = [ - "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library", - "//staging/src/k8s.io/kubectl/pkg/cmd/util:go_default_library", - ], -) - filegroup( name = "package-srcs", srcs = glob(["**"]), @@ -93,51 +31,47 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//pkg/kubectl/cmd/annotate:all-srcs", - "//pkg/kubectl/cmd/apiresources:all-srcs", - "//pkg/kubectl/cmd/apply:all-srcs", - "//pkg/kubectl/cmd/attach:all-srcs", - "//pkg/kubectl/cmd/auth:all-srcs", - "//pkg/kubectl/cmd/autoscale:all-srcs", - "//pkg/kubectl/cmd/certificates:all-srcs", - "//pkg/kubectl/cmd/clusterinfo:all-srcs", - "//pkg/kubectl/cmd/completion:all-srcs", - "//pkg/kubectl/cmd/config:all-srcs", - "//pkg/kubectl/cmd/convert:all-srcs", - "//pkg/kubectl/cmd/cp:all-srcs", - "//pkg/kubectl/cmd/create:all-srcs", - "//pkg/kubectl/cmd/delete:all-srcs", - "//pkg/kubectl/cmd/describe:all-srcs", - "//pkg/kubectl/cmd/diff:all-srcs", - "//pkg/kubectl/cmd/drain:all-srcs", - "//pkg/kubectl/cmd/edit:all-srcs", - "//pkg/kubectl/cmd/exec:all-srcs", - "//pkg/kubectl/cmd/explain:all-srcs", - "//pkg/kubectl/cmd/expose:all-srcs", - "//pkg/kubectl/cmd/get:all-srcs", - "//pkg/kubectl/cmd/help:all-srcs", - "//pkg/kubectl/cmd/kustomize:all-srcs", - "//pkg/kubectl/cmd/label:all-srcs", - "//pkg/kubectl/cmd/logs:all-srcs", - "//pkg/kubectl/cmd/options:all-srcs", - "//pkg/kubectl/cmd/patch:all-srcs", - "//pkg/kubectl/cmd/plugin:all-srcs", - "//pkg/kubectl/cmd/portforward:all-srcs", - "//pkg/kubectl/cmd/proxy:all-srcs", - "//pkg/kubectl/cmd/replace:all-srcs", - "//pkg/kubectl/cmd/rollingupdate:all-srcs", - "//pkg/kubectl/cmd/rollout:all-srcs", - "//pkg/kubectl/cmd/run:all-srcs", - "//pkg/kubectl/cmd/scale:all-srcs", - "//pkg/kubectl/cmd/set:all-srcs", - "//pkg/kubectl/cmd/taint:all-srcs", - "//pkg/kubectl/cmd/testing:all-srcs", - "//pkg/kubectl/cmd/top:all-srcs", - "//pkg/kubectl/cmd/version:all-srcs", - "//pkg/kubectl/cmd/wait:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/cmd/annotate:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/cmd/apiresources:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/cmd/apply:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/cmd/attach:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/cmd/autoscale:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/cmd/certificates:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/cmd/clusterinfo:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/cmd/completion:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/cmd/config:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/cmd/cp:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/cmd/create:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/cmd/delete:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/cmd/describe:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/cmd/diff:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/cmd/drain:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/cmd/edit:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/cmd/exec:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/cmd/explain:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/cmd/expose:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/cmd/help:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/cmd/kustomize:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/cmd/label:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/cmd/logs:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/cmd/options:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/cmd/patch:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/cmd/plugin:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/cmd/portforward:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/cmd/proxy:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/cmd/replace:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/cmd/rollingupdate:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/cmd/rollout:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/cmd/run:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/cmd/scale:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/cmd/set:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/cmd/taint:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/cmd/testing:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/cmd/top:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/cmd/util:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/cmd/version:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/cmd/wait:all-srcs", ], tags = ["automanaged"], - visibility = [ - "//build/visible_to:pkg_kubectl_cmd_CONSUMERS", - ], + visibility = ["//visibility:public"], ) diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/annotate/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/annotate/BUILD index 09c1da8aa86..93411fd9a11 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/annotate/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/annotate/BUILD @@ -3,7 +3,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["annotate.go"], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/annotate", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/annotate", + importpath = "k8s.io/kubectl/pkg/cmd/annotate", visibility = ["//visibility:public"], deps = [ "//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library", @@ -33,7 +34,6 @@ go_test( ], embed = [":go_default_library"], deps = [ - "//pkg/kubectl/cmd/testing:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", @@ -41,6 +41,7 @@ go_test( "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library", "//staging/src/k8s.io/cli-runtime/pkg/resource:go_default_library", "//staging/src/k8s.io/client-go/rest/fake:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/testing:go_default_library", "//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library", ], ) diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/apiresources/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/apiresources/BUILD index 739ed775e89..6898831622a 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/apiresources/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/apiresources/BUILD @@ -6,7 +6,8 @@ go_library( "apiresources.go", "apiversions.go", ], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/apiresources", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/apiresources", + importpath = "k8s.io/kubectl/pkg/cmd/apiresources", visibility = ["//visibility:public"], deps = [ "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/apply/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/apply/BUILD index 058383f879a..ee84fd248c7 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/apply/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/apply/BUILD @@ -8,10 +8,10 @@ go_library( "apply_set_last_applied.go", "apply_view_last_applied.go", ], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/apply", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/apply", + importpath = "k8s.io/kubectl/pkg/cmd/apply", visibility = ["//visibility:public"], deps = [ - "//pkg/kubectl/cmd/delete:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library", @@ -30,6 +30,7 @@ go_library( "//staging/src/k8s.io/cli-runtime/pkg/resource:go_default_library", "//staging/src/k8s.io/client-go/discovery:go_default_library", "//staging/src/k8s.io/client-go/dynamic:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/delete:go_default_library", "//staging/src/k8s.io/kubectl/pkg/cmd/util:go_default_library", "//staging/src/k8s.io/kubectl/pkg/cmd/util/editor:go_default_library", "//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library", @@ -55,7 +56,6 @@ go_test( ], embed = [":go_default_library"], deps = [ - "//pkg/kubectl/cmd/testing:go_default_library", "//staging/src/k8s.io/api/apps/v1:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library", @@ -70,6 +70,7 @@ go_test( "//staging/src/k8s.io/client-go/rest:go_default_library", "//staging/src/k8s.io/client-go/rest/fake:go_default_library", "//staging/src/k8s.io/client-go/testing:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/testing:go_default_library", "//staging/src/k8s.io/kubectl/pkg/cmd/util:go_default_library", "//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/openapi:go_default_library", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/attach/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/attach/BUILD index e91ad66356a..feac0f93be3 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/attach/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/attach/BUILD @@ -3,16 +3,17 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["attach.go"], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/attach", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/attach", + importpath = "k8s.io/kubectl/pkg/cmd/attach", visibility = ["//visibility:public"], deps = [ - "//pkg/kubectl/cmd/exec:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library", "//staging/src/k8s.io/cli-runtime/pkg/resource:go_default_library", "//staging/src/k8s.io/client-go/rest:go_default_library", "//staging/src/k8s.io/client-go/tools/remotecommand:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/exec:go_default_library", "//staging/src/k8s.io/kubectl/pkg/cmd/util:go_default_library", "//staging/src/k8s.io/kubectl/pkg/polymorphichelpers:go_default_library", "//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library", @@ -28,8 +29,6 @@ go_test( srcs = ["attach_test.go"], embed = [":go_default_library"], deps = [ - "//pkg/kubectl/cmd/exec:go_default_library", - "//pkg/kubectl/cmd/testing:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", @@ -38,6 +37,8 @@ go_test( "//staging/src/k8s.io/client-go/rest:go_default_library", "//staging/src/k8s.io/client-go/rest/fake:go_default_library", "//staging/src/k8s.io/client-go/tools/remotecommand:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/exec:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/testing:go_default_library", "//staging/src/k8s.io/kubectl/pkg/polymorphichelpers:go_default_library", "//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library", ], diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/autoscale/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/autoscale/BUILD index 835baf4801c..dfc6fc8d15f 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/autoscale/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/autoscale/BUILD @@ -3,7 +3,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["autoscale.go"], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/autoscale", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/autoscale", + importpath = "k8s.io/kubectl/pkg/cmd/autoscale", visibility = ["//visibility:public"], deps = [ "//staging/src/k8s.io/api/autoscaling/v1:go_default_library", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/certificates/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/certificates/BUILD index b6736d224d0..eb57f661a3d 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/certificates/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/certificates/BUILD @@ -3,7 +3,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["certificates.go"], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/certificates", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/certificates", + importpath = "k8s.io/kubectl/pkg/cmd/certificates", visibility = ["//visibility:public"], deps = [ "//staging/src/k8s.io/api/certificates/v1beta1:go_default_library", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/clusterinfo/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/clusterinfo/BUILD index 4aa0093ad36..8d59ecc5a3a 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/clusterinfo/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/clusterinfo/BUILD @@ -6,7 +6,8 @@ go_library( "clusterinfo.go", "clusterinfo_dump.go", ], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/clusterinfo", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/clusterinfo", + importpath = "k8s.io/kubectl/pkg/cmd/clusterinfo", visibility = ["//visibility:public"], deps = [ "//staging/src/k8s.io/api/core/v1:go_default_library", @@ -33,8 +34,8 @@ go_test( srcs = ["clusterinfo_dump_test.go"], embed = [":go_default_library"], deps = [ - "//pkg/kubectl/cmd/testing:go_default_library", "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/testing:go_default_library", ], ) diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/completion/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/completion/BUILD index 67c2b6670a1..ab02c57527c 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/completion/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/completion/BUILD @@ -3,7 +3,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["completion.go"], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/completion", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/completion", + importpath = "k8s.io/kubectl/pkg/cmd/completion", visibility = ["//visibility:public"], deps = [ "//staging/src/k8s.io/kubectl/pkg/cmd/util:go_default_library", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/config/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/config/BUILD index 2db61ef70b3..98f9ecb49e3 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/config/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/config/BUILD @@ -23,7 +23,8 @@ go_library( "use_context.go", "view.go", ], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/config", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/config", + importpath = "k8s.io/kubectl/pkg/cmd/config", visibility = [ "//build/visible_to:pkg_kubectl_cmd_config_CONSUMERS", ], diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/cp/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/cp/BUILD index d310eb1457a..0b3bfcb57aa 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/cp/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/cp/BUILD @@ -3,13 +3,14 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["cp.go"], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/cp", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/cp", + importpath = "k8s.io/kubectl/pkg/cmd/cp", visibility = ["//visibility:public"], deps = [ - "//pkg/kubectl/cmd/exec:go_default_library", "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library", "//staging/src/k8s.io/client-go/kubernetes:go_default_library", "//staging/src/k8s.io/client-go/rest:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/exec:go_default_library", "//staging/src/k8s.io/kubectl/pkg/cmd/util:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/i18n:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/templates:go_default_library", @@ -23,14 +24,14 @@ go_test( srcs = ["cp_test.go"], embed = [":go_default_library"], deps = [ - "//pkg/kubectl/cmd/exec:go_default_library", - "//pkg/kubectl/cmd/testing:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library", "//staging/src/k8s.io/client-go/rest/fake:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/exec:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/testing:go_default_library", "//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library", "//vendor/github.com/stretchr/testify/assert:go_default_library", "//vendor/github.com/stretchr/testify/require:go_default_library", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/create/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/create/BUILD index 93f206ce6ed..ef40a36347c 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/create/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/create/BUILD @@ -20,7 +20,8 @@ go_library( "create_service.go", "create_serviceaccount.go", ], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/create", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/create", + importpath = "k8s.io/kubectl/pkg/cmd/create", visibility = ["//build/visible_to:pkg_kubectl_cmd_create_CONSUMERS"], deps = [ "//staging/src/k8s.io/api/apps/v1:go_default_library", @@ -81,7 +82,6 @@ go_test( ], embed = [":go_default_library"], deps = [ - "//pkg/kubectl/cmd/testing:go_default_library", "//staging/src/k8s.io/api/apps/v1:go_default_library", "//staging/src/k8s.io/api/batch/v1:go_default_library", "//staging/src/k8s.io/api/batch/v1beta1:go_default_library", @@ -97,6 +97,7 @@ go_test( "//staging/src/k8s.io/cli-runtime/pkg/resource:go_default_library", "//staging/src/k8s.io/client-go/rest:go_default_library", "//staging/src/k8s.io/client-go/rest/fake:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/testing:go_default_library", "//staging/src/k8s.io/kubectl/pkg/generate/versioned:go_default_library", "//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library", "//vendor/github.com/stretchr/testify/assert:go_default_library", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/delete/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/delete/BUILD index fa2e1a00838..2c55d5e5491 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/delete/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/delete/BUILD @@ -6,10 +6,10 @@ go_library( "delete.go", "delete_flags.go", ], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/delete", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/delete", + importpath = "k8s.io/kubectl/pkg/cmd/delete", visibility = ["//visibility:public"], deps = [ - "//pkg/kubectl/cmd/wait:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", @@ -19,6 +19,7 @@ go_library( "//staging/src/k8s.io/cli-runtime/pkg/resource:go_default_library", "//staging/src/k8s.io/client-go/dynamic:go_default_library", "//staging/src/k8s.io/kubectl/pkg/cmd/util:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/wait:go_default_library", "//staging/src/k8s.io/kubectl/pkg/rawhttp:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/i18n:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/templates:go_default_library", @@ -35,13 +36,13 @@ go_test( ], embed = [":go_default_library"], deps = [ - "//pkg/kubectl/cmd/testing:go_default_library", "//staging/src/k8s.io/api/core/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/cli-runtime/pkg/genericclioptions:go_default_library", "//staging/src/k8s.io/cli-runtime/pkg/resource:go_default_library", "//staging/src/k8s.io/client-go/rest/fake:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/testing:go_default_library", "//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", ], diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/describe/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/describe/BUILD index 4134f50ceea..374022d3fb4 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/describe/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/describe/BUILD @@ -3,7 +3,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["describe.go"], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/describe", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/describe", + importpath = "k8s.io/kubectl/pkg/cmd/describe", visibility = ["//visibility:public"], deps = [ "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library", @@ -29,11 +30,11 @@ go_test( ], embed = [":go_default_library"], deps = [ - "//pkg/kubectl/cmd/testing:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library", "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library", "//staging/src/k8s.io/cli-runtime/pkg/resource:go_default_library", "//staging/src/k8s.io/client-go/rest/fake:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/testing:go_default_library", "//staging/src/k8s.io/kubectl/pkg/describe:go_default_library", "//staging/src/k8s.io/kubectl/pkg/describe/versioned:go_default_library", "//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/diff/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/diff/BUILD index 72f234a2c3a..37792f9a508 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/diff/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/diff/BUILD @@ -3,10 +3,10 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["diff.go"], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/diff", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/diff", + importpath = "k8s.io/kubectl/pkg/cmd/diff", visibility = ["//visibility:public"], deps = [ - "//pkg/kubectl/cmd/apply:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", @@ -17,6 +17,7 @@ go_library( "//staging/src/k8s.io/cli-runtime/pkg/resource:go_default_library", "//staging/src/k8s.io/client-go/discovery:go_default_library", "//staging/src/k8s.io/client-go/dynamic:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/apply:go_default_library", "//staging/src/k8s.io/kubectl/pkg/cmd/util:go_default_library", "//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util:go_default_library", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/drain/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/drain/BUILD index 40289f4471d..8dc7fbdf546 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/drain/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/drain/BUILD @@ -3,7 +3,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["drain.go"], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/drain", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/drain", + importpath = "k8s.io/kubectl/pkg/cmd/drain", visibility = ["//visibility:public"], deps = [ "//staging/src/k8s.io/api/core/v1:go_default_library", @@ -31,7 +32,6 @@ go_test( srcs = ["drain_test.go"], embed = [":go_default_library"], deps = [ - "//pkg/kubectl/cmd/testing:go_default_library", "//staging/src/k8s.io/api/apps/v1:go_default_library", "//staging/src/k8s.io/api/batch/v1:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", @@ -46,6 +46,7 @@ go_test( "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library", "//staging/src/k8s.io/cli-runtime/pkg/printers:go_default_library", "//staging/src/k8s.io/client-go/rest/fake:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/testing:go_default_library", "//staging/src/k8s.io/kubectl/pkg/cmd/util:go_default_library", "//staging/src/k8s.io/kubectl/pkg/drain:go_default_library", "//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/edit/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/edit/BUILD index 9f221c89e30..b92f632ec00 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/edit/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/edit/BUILD @@ -3,7 +3,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["edit.go"], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/edit", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/edit", + importpath = "k8s.io/kubectl/pkg/cmd/edit", visibility = ["//visibility:public"], deps = [ "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library", @@ -19,19 +20,19 @@ go_test( name = "go_default_test", srcs = ["edit_test.go"], data = [ - "//pkg/kubectl/cmd/edit/testdata:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata:all-srcs", ], embed = [":go_default_library"], deps = [ - "//pkg/kubectl/cmd/apply:go_default_library", - "//pkg/kubectl/cmd/create:go_default_library", - "//pkg/kubectl/cmd/testing:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/diff:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library", "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library", "//staging/src/k8s.io/cli-runtime/pkg/resource:go_default_library", "//staging/src/k8s.io/client-go/rest/fake:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/apply:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/create:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/testing:go_default_library", "//staging/src/k8s.io/kubectl/pkg/cmd/util:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", "//vendor/gopkg.in/yaml.v2:go_default_library", @@ -49,7 +50,7 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//pkg/kubectl/cmd/edit/testdata:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata:all-srcs", ], tags = ["automanaged"], visibility = ["//visibility:public"], diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/BUILD index 6d03cb77a3f..e9aa714efa5 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/BUILD @@ -13,7 +13,8 @@ go_binary( go_library( name = "go_default_library", srcs = ["record.go"], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/edit/testdata", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/edit/testdata", + importpath = "k8s.io/kubectl/pkg/cmd/edit/testdata", visibility = ["//visibility:private"], deps = ["//vendor/gopkg.in/yaml.v2:go_default_library"], ) diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/exec/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/exec/BUILD index c16cb12859a..d30e3efeaf7 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/exec/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/exec/BUILD @@ -3,7 +3,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["exec.go"], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/exec", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/exec", + importpath = "k8s.io/kubectl/pkg/cmd/exec", visibility = ["//visibility:public"], deps = [ "//staging/src/k8s.io/api/core/v1:go_default_library", @@ -30,7 +31,6 @@ go_test( srcs = ["exec_test.go"], embed = [":go_default_library"], deps = [ - "//pkg/kubectl/cmd/testing:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", @@ -38,6 +38,7 @@ go_test( "//staging/src/k8s.io/client-go/rest:go_default_library", "//staging/src/k8s.io/client-go/rest/fake:go_default_library", "//staging/src/k8s.io/client-go/tools/remotecommand:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/testing:go_default_library", "//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/term:go_default_library", ], diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/explain/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/explain/BUILD index 78f2ce4c00f..62a468576f2 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/explain/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/explain/BUILD @@ -3,7 +3,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["explain.go"], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/explain", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/explain", + importpath = "k8s.io/kubectl/pkg/cmd/explain", visibility = ["//visibility:public"], deps = [ "//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/expose/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/expose/BUILD index 2bf667ce314..99580a2bc75 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/expose/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/expose/BUILD @@ -3,7 +3,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["expose.go"], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/expose", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/expose", + importpath = "k8s.io/kubectl/pkg/cmd/expose", visibility = ["//visibility:public"], deps = [ "//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library", @@ -37,7 +38,6 @@ go_test( ], embed = [":go_default_library"], deps = [ - "//pkg/kubectl/cmd/testing:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", @@ -45,6 +45,7 @@ go_test( "//staging/src/k8s.io/apimachinery/pkg/util/intstr:go_default_library", "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library", "//staging/src/k8s.io/client-go/rest/fake:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/testing:go_default_library", "//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library", ], ) diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/help/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/help/BUILD index 89dde353621..bef8cd52360 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/help/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/help/BUILD @@ -3,7 +3,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["help.go"], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/help", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/help", + importpath = "k8s.io/kubectl/pkg/cmd/help", visibility = ["//visibility:public"], deps = [ "//staging/src/k8s.io/kubectl/pkg/util/i18n:go_default_library", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/kustomize/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/kustomize/BUILD index 2a0d2635722..dfed10869b4 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/kustomize/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/kustomize/BUILD @@ -3,7 +3,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["kustomize.go"], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/kustomize", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/kustomize", + importpath = "k8s.io/kubectl/pkg/cmd/kustomize", visibility = ["//visibility:public"], deps = [ "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/label/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/label/BUILD index 81af6640205..28f8112f6eb 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/label/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/label/BUILD @@ -3,7 +3,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["label.go"], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/label", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/label", + importpath = "k8s.io/kubectl/pkg/cmd/label", visibility = ["//visibility:public"], deps = [ "//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library", @@ -35,13 +36,13 @@ go_test( ], embed = [":go_default_library"], deps = [ - "//pkg/kubectl/cmd/testing:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library", "//staging/src/k8s.io/cli-runtime/pkg/resource:go_default_library", "//staging/src/k8s.io/client-go/rest/fake:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/testing:go_default_library", "//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library", ], ) diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/logs/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/logs/BUILD index afbc39176bc..101b9c42082 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/logs/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/logs/BUILD @@ -3,7 +3,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["logs.go"], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/logs", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/logs", + importpath = "k8s.io/kubectl/pkg/cmd/logs", visibility = ["//visibility:public"], deps = [ "//staging/src/k8s.io/api/core/v1:go_default_library", @@ -26,12 +27,12 @@ go_test( srcs = ["logs_test.go"], embed = [":go_default_library"], deps = [ - "//pkg/kubectl/cmd/testing:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library", "//staging/src/k8s.io/client-go/rest:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/testing:go_default_library", ], ) diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/options/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/options/BUILD index 7b4a8e99c01..f9f0dfdee29 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/options/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/options/BUILD @@ -3,7 +3,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["options.go"], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/options", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/options", + importpath = "k8s.io/kubectl/pkg/cmd/options", visibility = ["//visibility:public"], deps = [ "//staging/src/k8s.io/kubectl/pkg/util/i18n:go_default_library", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/patch/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/patch/BUILD index fc2625783c9..fad8f8c7c05 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/patch/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/patch/BUILD @@ -3,7 +3,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["patch.go"], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/patch", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/patch", + importpath = "k8s.io/kubectl/pkg/cmd/patch", visibility = ["//visibility:public"], deps = [ "//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library", @@ -35,10 +36,10 @@ go_test( ], embed = [":go_default_library"], deps = [ - "//pkg/kubectl/cmd/testing:go_default_library", "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library", "//staging/src/k8s.io/cli-runtime/pkg/resource:go_default_library", "//staging/src/k8s.io/client-go/rest/fake:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/testing:go_default_library", "//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library", ], ) diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/plugin/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/plugin/BUILD index b6948dfc02c..0ca4f4e62cc 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/plugin/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/plugin/BUILD @@ -3,7 +3,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["plugin.go"], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/plugin", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/plugin", + importpath = "k8s.io/kubectl/pkg/cmd/plugin", visibility = ["//visibility:public"], deps = [ "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/portforward/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/portforward/BUILD index a34affa3534..93311f0a7c9 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/portforward/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/portforward/BUILD @@ -3,7 +3,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["portforward.go"], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/portforward", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/portforward", + importpath = "k8s.io/kubectl/pkg/cmd/portforward", visibility = ["//visibility:public"], deps = [ "//staging/src/k8s.io/api/core/v1:go_default_library", @@ -28,13 +29,13 @@ go_test( srcs = ["portforward_test.go"], embed = [":go_default_library"], deps = [ - "//pkg/kubectl/cmd/testing:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/intstr:go_default_library", "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library", "//staging/src/k8s.io/client-go/rest/fake:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/testing:go_default_library", "//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", ], diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/profiling.go b/staging/src/k8s.io/kubectl/pkg/cmd/profiling.go index 2a1c1ce3c15..e1309835d21 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/profiling.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/profiling.go @@ -30,12 +30,12 @@ var ( profileOutput string ) -func addProfilingFlags(flags *pflag.FlagSet) { +func AddProfilingFlags(flags *pflag.FlagSet) { flags.StringVar(&profileName, "profile", "none", "Name of profile to capture. One of (none|cpu|heap|goroutine|threadcreate|block|mutex)") flags.StringVar(&profileOutput, "profile-output", "profile.pprof", "Name of the file to write the profile to") } -func initProfiling() error { +func InitProfiling() error { switch profileName { case "none": return nil @@ -63,7 +63,7 @@ func initProfiling() error { return nil } -func flushProfiling() error { +func FlushProfiling() error { switch profileName { case "none": return nil diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/proxy/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/proxy/BUILD index 6bd635e2008..e75fe8ab8f2 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/proxy/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/proxy/BUILD @@ -3,7 +3,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["proxy.go"], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/proxy", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/proxy", + importpath = "k8s.io/kubectl/pkg/cmd/proxy", visibility = ["//visibility:public"], deps = [ "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/replace/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/replace/BUILD index 689aa9e9f09..97b04ebda72 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/replace/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/replace/BUILD @@ -3,15 +3,16 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["replace.go"], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/replace", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/replace", + importpath = "k8s.io/kubectl/pkg/cmd/replace", visibility = ["//visibility:public"], deps = [ - "//pkg/kubectl/cmd/delete:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library", "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library", "//staging/src/k8s.io/cli-runtime/pkg/resource:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/delete:go_default_library", "//staging/src/k8s.io/kubectl/pkg/cmd/util:go_default_library", "//staging/src/k8s.io/kubectl/pkg/rawhttp:go_default_library", "//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library", @@ -32,11 +33,11 @@ go_test( ], embed = [":go_default_library"], deps = [ - "//pkg/kubectl/cmd/testing:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library", "//staging/src/k8s.io/cli-runtime/pkg/resource:go_default_library", "//staging/src/k8s.io/client-go/rest/fake:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/testing:go_default_library", "//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library", ], ) diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/rollingupdate/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/rollingupdate/BUILD index 731b9db6198..b66f81736d7 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/rollingupdate/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/rollingupdate/BUILD @@ -6,7 +6,8 @@ go_library( "rolling_updater.go", "rollingupdate.go", ], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/rollingupdate", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/rollingupdate", + importpath = "k8s.io/kubectl/pkg/cmd/rollingupdate", visibility = ["//visibility:public"], deps = [ "//staging/src/k8s.io/api/core/v1:go_default_library", @@ -49,7 +50,6 @@ go_test( ], embed = [":go_default_library"], deps = [ - "//pkg/kubectl/cmd/testing:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/equality:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library", @@ -65,6 +65,7 @@ go_test( "//staging/src/k8s.io/client-go/rest:go_default_library", "//staging/src/k8s.io/client-go/rest/fake:go_default_library", "//staging/src/k8s.io/client-go/testing:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/testing:go_default_library", "//staging/src/k8s.io/kubectl/pkg/scale:go_default_library", "//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util:go_default_library", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/rollout/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/rollout/BUILD index fd7c4c4a76c..c876153c1b8 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/rollout/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/rollout/BUILD @@ -15,12 +15,12 @@ go_library( "rollout_status.go", "rollout_undo.go", ], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/rollout", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/rollout", + importpath = "k8s.io/kubectl/pkg/cmd/rollout", visibility = [ "//build/visible_to:pkg_kubectl_cmd_rollout_CONSUMERS", ], deps = [ - "//pkg/kubectl/cmd/set:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", @@ -36,6 +36,7 @@ go_library( "//staging/src/k8s.io/client-go/dynamic:go_default_library", "//staging/src/k8s.io/client-go/tools/cache:go_default_library", "//staging/src/k8s.io/client-go/tools/watch:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/set:go_default_library", "//staging/src/k8s.io/kubectl/pkg/cmd/util:go_default_library", "//staging/src/k8s.io/kubectl/pkg/polymorphichelpers:go_default_library", "//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library", @@ -67,7 +68,6 @@ go_test( srcs = ["rollout_pause_test.go"], embed = [":go_default_library"], deps = [ - "//pkg/kubectl/cmd/testing:go_default_library", "//staging/src/k8s.io/api/extensions/v1beta1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", @@ -75,6 +75,7 @@ go_test( "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library", "//staging/src/k8s.io/client-go/rest:go_default_library", "//staging/src/k8s.io/client-go/rest/fake:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/testing:go_default_library", "//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library", ], ) diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/run/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/run/BUILD index c99c1094afc..553119b59f8 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/run/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/run/BUILD @@ -3,13 +3,10 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["run.go"], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/run", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/run", + importpath = "k8s.io/kubectl/pkg/cmd/run", visibility = ["//visibility:public"], deps = [ - "//pkg/kubectl/cmd/attach:go_default_library", - "//pkg/kubectl/cmd/delete:go_default_library", - "//pkg/kubectl/cmd/exec:go_default_library", - "//pkg/kubectl/cmd/logs:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library", @@ -26,6 +23,10 @@ go_library( "//staging/src/k8s.io/client-go/kubernetes/typed/core/v1:go_default_library", "//staging/src/k8s.io/client-go/tools/cache:go_default_library", "//staging/src/k8s.io/client-go/tools/watch:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/attach:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/delete:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/exec:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/logs:go_default_library", "//staging/src/k8s.io/kubectl/pkg/cmd/util:go_default_library", "//staging/src/k8s.io/kubectl/pkg/generate:go_default_library", "//staging/src/k8s.io/kubectl/pkg/generate/versioned:go_default_library", @@ -47,8 +48,6 @@ go_test( srcs = ["run_test.go"], embed = [":go_default_library"], deps = [ - "//pkg/kubectl/cmd/delete:go_default_library", - "//pkg/kubectl/cmd/testing:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/equality:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", @@ -57,6 +56,8 @@ go_test( "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library", "//staging/src/k8s.io/client-go/rest:go_default_library", "//staging/src/k8s.io/client-go/rest/fake:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/delete:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/testing:go_default_library", "//staging/src/k8s.io/kubectl/pkg/cmd/util:go_default_library", "//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/i18n:go_default_library", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/scale/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/scale/BUILD index d01d30fc66b..79ec124e988 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/scale/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/scale/BUILD @@ -3,7 +3,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["scale.go"], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/scale", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/scale", + importpath = "k8s.io/kubectl/pkg/cmd/scale", visibility = ["//visibility:public"], deps = [ "//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/set/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/set/BUILD index a3dfe6ac9db..ded20d03740 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/set/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/set/BUILD @@ -16,10 +16,10 @@ go_library( "set_serviceaccount.go", "set_subject.go", ], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/set", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/set", + importpath = "k8s.io/kubectl/pkg/cmd/set", visibility = ["//build/visible_to:pkg_kubectl_cmd_set_CONSUMERS"], deps = [ - "//pkg/kubectl/cmd/set/env:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/api/rbac/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library", @@ -34,6 +34,7 @@ go_library( "//staging/src/k8s.io/cli-runtime/pkg/printers:go_default_library", "//staging/src/k8s.io/cli-runtime/pkg/resource:go_default_library", "//staging/src/k8s.io/client-go/kubernetes:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/set/env:go_default_library", "//staging/src/k8s.io/kubectl/pkg/cmd/util:go_default_library", "//staging/src/k8s.io/kubectl/pkg/generate/versioned:go_default_library", "//staging/src/k8s.io/kubectl/pkg/polymorphichelpers:go_default_library", @@ -62,7 +63,6 @@ go_test( ], embed = [":go_default_library"], deps = [ - "//pkg/kubectl/cmd/testing:go_default_library", "//staging/src/k8s.io/api/apps/v1:go_default_library", "//staging/src/k8s.io/api/apps/v1beta1:go_default_library", "//staging/src/k8s.io/api/apps/v1beta2:go_default_library", @@ -78,6 +78,7 @@ go_test( "//staging/src/k8s.io/cli-runtime/pkg/resource:go_default_library", "//staging/src/k8s.io/client-go/rest:go_default_library", "//staging/src/k8s.io/client-go/rest/fake:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/testing:go_default_library", "//staging/src/k8s.io/kubectl/pkg/cmd/util:go_default_library", "//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", @@ -95,7 +96,7 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//pkg/kubectl/cmd/set/env:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/cmd/set/env:all-srcs", ], tags = ["automanaged"], visibility = [ diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/set/env/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/set/env/BUILD index 167872b494e..8def5b594e0 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/set/env/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/set/env/BUILD @@ -7,7 +7,8 @@ go_library( "env_parse.go", "env_resolve.go", ], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/set/env", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/set/env", + importpath = "k8s.io/kubectl/pkg/cmd/set/env", visibility = ["//visibility:public"], deps = [ "//staging/src/k8s.io/api/core/v1:go_default_library", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/taint/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/taint/BUILD index ac05619e50a..bc632caf807 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/taint/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/taint/BUILD @@ -6,7 +6,8 @@ go_library( "taint.go", "utils.go", ], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/taint", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/taint", + importpath = "k8s.io/kubectl/pkg/cmd/taint", visibility = ["//visibility:public"], deps = [ "//staging/src/k8s.io/api/core/v1:go_default_library", @@ -37,13 +38,13 @@ go_test( ], embed = [":go_default_library"], deps = [ - "//pkg/kubectl/cmd/testing:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/strategicpatch:go_default_library", "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library", "//staging/src/k8s.io/client-go/rest/fake:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/testing:go_default_library", "//staging/src/k8s.io/kubectl/pkg/cmd/util:go_default_library", "//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library", ], diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/testing/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/testing/BUILD index 3be364d3c9d..d31e50a57fa 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/testing/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/testing/BUILD @@ -8,7 +8,8 @@ go_library( "util.go", "zz_generated.deepcopy.go", ], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/testing", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/testing", + importpath = "k8s.io/kubectl/pkg/cmd/testing", visibility = ["//build/visible_to:pkg_kubectl_cmd_testing_CONSUMERS"], deps = [ "//staging/src/k8s.io/api/core/v1:go_default_library", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/top/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/top/BUILD index 9db81304218..f7ecd89e911 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/top/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/top/BUILD @@ -7,7 +7,8 @@ go_library( "top_node.go", "top_pod.go", ], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/top", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/top", + importpath = "k8s.io/kubectl/pkg/cmd/top", visibility = ["//visibility:public"], deps = [ "//staging/src/k8s.io/api/core/v1:go_default_library", @@ -38,7 +39,6 @@ go_test( ], embed = [":go_default_library"], deps = [ - "//pkg/kubectl/cmd/testing:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/resource:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", @@ -48,6 +48,7 @@ go_test( "//staging/src/k8s.io/client-go/rest:go_default_library", "//staging/src/k8s.io/client-go/rest/fake:go_default_library", "//staging/src/k8s.io/client-go/testing:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/testing:go_default_library", "//staging/src/k8s.io/kubectl/pkg/cmd/util:go_default_library", "//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library", "//staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1:go_default_library", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/version/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/version/BUILD index 296f037d7e1..f2acee5a66a 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/version/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/version/BUILD @@ -3,7 +3,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["version.go"], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/version", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/version", + importpath = "k8s.io/kubectl/pkg/cmd/version", visibility = ["//visibility:public"], deps = [ "//staging/src/k8s.io/apimachinery/pkg/version:go_default_library", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/wait/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/wait/BUILD index c87f2fd7287..b578bef26fa 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/wait/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/wait/BUILD @@ -3,7 +3,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["wait.go"], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/wait", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/wait", + importpath = "k8s.io/kubectl/pkg/cmd/wait", visibility = ["//visibility:public"], deps = [ "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library", From e2cae2344486af198f8ab38e4dd97d4f24dfd190 Mon Sep 17 00:00:00 2001 From: Sean Sullivan Date: Thu, 1 Aug 2019 13:14:06 -0700 Subject: [PATCH 4/7] Update gofmt --- pkg/kubectl/cmd/auth/cani_test.go | 2 +- pkg/kubectl/cmd/get/get_test.go | 2 +- .../src/k8s.io/kubectl/pkg/cmd/annotate/annotate_test.go | 2 +- staging/src/k8s.io/kubectl/pkg/cmd/apply/apply.go | 2 +- staging/src/k8s.io/kubectl/pkg/cmd/apply/apply_test.go | 2 +- staging/src/k8s.io/kubectl/pkg/cmd/attach/attach.go | 2 +- staging/src/k8s.io/kubectl/pkg/cmd/attach/attach_test.go | 4 ++-- staging/src/k8s.io/kubectl/pkg/cmd/cp/cp.go | 2 +- staging/src/k8s.io/kubectl/pkg/cmd/cp/cp_test.go | 2 +- .../kubectl/pkg/cmd/create/create_clusterrole_test.go | 2 +- .../pkg/cmd/create/create_clusterrolebinding_test.go | 2 +- .../kubectl/pkg/cmd/create/create_configmap_test.go | 2 +- .../kubectl/pkg/cmd/create/create_deployment_test.go | 2 +- .../kubectl/pkg/cmd/create/create_namespace_test.go | 2 +- .../src/k8s.io/kubectl/pkg/cmd/create/create_pdb_test.go | 2 +- .../kubectl/pkg/cmd/create/create_priorityclass_test.go | 2 +- .../src/k8s.io/kubectl/pkg/cmd/create/create_role_test.go | 2 +- .../kubectl/pkg/cmd/create/create_rolebinding_test.go | 2 +- .../k8s.io/kubectl/pkg/cmd/create/create_secret_test.go | 2 +- .../k8s.io/kubectl/pkg/cmd/create/create_service_test.go | 2 +- .../kubectl/pkg/cmd/create/create_serviceaccount_test.go | 2 +- staging/src/k8s.io/kubectl/pkg/cmd/create/create_test.go | 2 +- staging/src/k8s.io/kubectl/pkg/cmd/delete/delete.go | 2 +- staging/src/k8s.io/kubectl/pkg/cmd/delete/delete_test.go | 2 +- .../src/k8s.io/kubectl/pkg/cmd/describe/describe_test.go | 2 +- staging/src/k8s.io/kubectl/pkg/cmd/diff/diff.go | 2 +- staging/src/k8s.io/kubectl/pkg/cmd/drain/drain_test.go | 2 +- staging/src/k8s.io/kubectl/pkg/cmd/edit/edit_test.go | 2 +- staging/src/k8s.io/kubectl/pkg/cmd/exec/exec_test.go | 2 +- staging/src/k8s.io/kubectl/pkg/cmd/expose/expose_test.go | 2 +- staging/src/k8s.io/kubectl/pkg/cmd/label/label_test.go | 2 +- staging/src/k8s.io/kubectl/pkg/cmd/patch/patch_test.go | 2 +- .../kubectl/pkg/cmd/portforward/portforward_test.go | 2 +- staging/src/k8s.io/kubectl/pkg/cmd/replace/replace.go | 2 +- .../src/k8s.io/kubectl/pkg/cmd/replace/replace_test.go | 2 +- .../src/k8s.io/kubectl/pkg/cmd/rollout/rollout_pause.go | 2 +- .../k8s.io/kubectl/pkg/cmd/rollout/rollout_pause_test.go | 2 +- .../src/k8s.io/kubectl/pkg/cmd/rollout/rollout_restart.go | 2 +- .../src/k8s.io/kubectl/pkg/cmd/rollout/rollout_resume.go | 2 +- staging/src/k8s.io/kubectl/pkg/cmd/run/run.go | 8 ++++---- staging/src/k8s.io/kubectl/pkg/cmd/run/run_test.go | 4 ++-- staging/src/k8s.io/kubectl/pkg/cmd/set/set_env.go | 2 +- staging/src/k8s.io/kubectl/pkg/cmd/set/set_env_test.go | 2 +- staging/src/k8s.io/kubectl/pkg/cmd/set/set_image_test.go | 2 +- .../src/k8s.io/kubectl/pkg/cmd/set/set_resources_test.go | 2 +- .../k8s.io/kubectl/pkg/cmd/set/set_serviceaccount_test.go | 2 +- staging/src/k8s.io/kubectl/pkg/cmd/taint/taint_test.go | 2 +- staging/src/k8s.io/kubectl/pkg/cmd/top/top_node_test.go | 2 +- staging/src/k8s.io/kubectl/pkg/cmd/top/top_pod_test.go | 2 +- 49 files changed, 54 insertions(+), 54 deletions(-) diff --git a/pkg/kubectl/cmd/auth/cani_test.go b/pkg/kubectl/cmd/auth/cani_test.go index c788afbfd6f..2f6af7ae127 100644 --- a/pkg/kubectl/cmd/auth/cani_test.go +++ b/pkg/kubectl/cmd/auth/cani_test.go @@ -30,8 +30,8 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" restclient "k8s.io/client-go/rest" "k8s.io/client-go/rest/fake" - "k8s.io/kubectl/pkg/scheme" cmdtesting "k8s.io/kubectl/pkg/cmd/testing" + "k8s.io/kubectl/pkg/scheme" ) func TestRunAccessCheck(t *testing.T) { diff --git a/pkg/kubectl/cmd/get/get_test.go b/pkg/kubectl/cmd/get/get_test.go index e7610a9b213..d02e4d8c7f7 100644 --- a/pkg/kubectl/cmd/get/get_test.go +++ b/pkg/kubectl/cmd/get/get_test.go @@ -47,10 +47,10 @@ import ( "k8s.io/client-go/rest/fake" restclientwatch "k8s.io/client-go/rest/watch" "k8s.io/kube-openapi/pkg/util/proto" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" "k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/util/openapi" openapitesting "k8s.io/kubectl/pkg/util/openapi/testing" - cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) var ( diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/annotate/annotate_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/annotate/annotate_test.go index 46a136e247f..ae9bcff3f6e 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/annotate/annotate_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/annotate/annotate_test.go @@ -29,8 +29,8 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/resource" "k8s.io/client-go/rest/fake" - "k8s.io/kubectl/pkg/scheme" cmdtesting "k8s.io/kubectl/pkg/cmd/testing" + "k8s.io/kubectl/pkg/scheme" ) func TestValidateAnnotationOverwrites(t *testing.T) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/apply/apply.go b/staging/src/k8s.io/kubectl/pkg/cmd/apply/apply.go index b6de182f792..aaa2de08f13 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/apply/apply.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/apply/apply.go @@ -46,6 +46,7 @@ import ( "k8s.io/client-go/dynamic" "k8s.io/klog" oapi "k8s.io/kube-openapi/pkg/util/proto" + "k8s.io/kubectl/pkg/cmd/delete" cmdutil "k8s.io/kubectl/pkg/cmd/util" "k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/util" @@ -53,7 +54,6 @@ import ( "k8s.io/kubectl/pkg/util/openapi" "k8s.io/kubectl/pkg/util/templates" "k8s.io/kubectl/pkg/validation" - "k8s.io/kubectl/pkg/cmd/delete" ) // ApplyOptions defines flags and other configuration parameters for the `apply` command diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/apply/apply_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/apply/apply_test.go index 8e2c8c4892d..fb185a1b343 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/apply/apply_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/apply/apply_test.go @@ -46,10 +46,10 @@ import ( restclient "k8s.io/client-go/rest" "k8s.io/client-go/rest/fake" clienttesting "k8s.io/client-go/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" cmdutil "k8s.io/kubectl/pkg/cmd/util" "k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/util/openapi" - cmdtesting "k8s.io/kubectl/pkg/cmd/testing" utilpointer "k8s.io/utils/pointer" ) diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/attach/attach.go b/staging/src/k8s.io/kubectl/pkg/cmd/attach/attach.go index 4a5b368ceb1..c39e5ce502a 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/attach/attach.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/attach/attach.go @@ -31,12 +31,12 @@ import ( "k8s.io/cli-runtime/pkg/resource" restclient "k8s.io/client-go/rest" "k8s.io/client-go/tools/remotecommand" + "k8s.io/kubectl/pkg/cmd/exec" cmdutil "k8s.io/kubectl/pkg/cmd/util" "k8s.io/kubectl/pkg/polymorphichelpers" "k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" - "k8s.io/kubectl/pkg/cmd/exec" ) var ( diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/attach/attach_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/attach/attach_test.go index ab5fcc69ead..8c6f0192975 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/attach/attach_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/attach/attach_test.go @@ -33,10 +33,10 @@ import ( restclient "k8s.io/client-go/rest" "k8s.io/client-go/rest/fake" "k8s.io/client-go/tools/remotecommand" - "k8s.io/kubectl/pkg/polymorphichelpers" - "k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/cmd/exec" cmdtesting "k8s.io/kubectl/pkg/cmd/testing" + "k8s.io/kubectl/pkg/polymorphichelpers" + "k8s.io/kubectl/pkg/scheme" ) type fakeRemoteAttach struct { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/cp/cp.go b/staging/src/k8s.io/kubectl/pkg/cmd/cp/cp.go index 4cea2de42d2..1c7b0bf6ec5 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/cp/cp.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/cp/cp.go @@ -30,10 +30,10 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/kubernetes" restclient "k8s.io/client-go/rest" + "k8s.io/kubectl/pkg/cmd/exec" cmdutil "k8s.io/kubectl/pkg/cmd/util" "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" - "k8s.io/kubectl/pkg/cmd/exec" "bytes" diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/cp/cp_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/cp/cp_test.go index c281f6c152b..5490a8939c9 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/cp/cp_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/cp/cp_test.go @@ -39,9 +39,9 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/rest/fake" - "k8s.io/kubectl/pkg/scheme" kexec "k8s.io/kubectl/pkg/cmd/exec" cmdtesting "k8s.io/kubectl/pkg/cmd/testing" + "k8s.io/kubectl/pkg/scheme" ) type FileType int diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_clusterrole_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_clusterrole_test.go index 541e8a8ec6e..937763ecbeb 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_clusterrole_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_clusterrole_test.go @@ -25,8 +25,8 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/rest/fake" - "k8s.io/kubectl/pkg/scheme" cmdtesting "k8s.io/kubectl/pkg/cmd/testing" + "k8s.io/kubectl/pkg/scheme" ) func TestCreateClusterRole(t *testing.T) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_clusterrolebinding_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_clusterrolebinding_test.go index 1df8acc7691..cc1d1a9b0b9 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_clusterrolebinding_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_clusterrolebinding_test.go @@ -31,8 +31,8 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" restclient "k8s.io/client-go/rest" "k8s.io/client-go/rest/fake" - "k8s.io/kubectl/pkg/scheme" cmdtesting "k8s.io/kubectl/pkg/cmd/testing" + "k8s.io/kubectl/pkg/scheme" ) func TestCreateClusterRoleBinding(t *testing.T) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_configmap_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_configmap_test.go index 23a872842ca..78495a201db 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_configmap_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_configmap_test.go @@ -24,8 +24,8 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/rest/fake" - "k8s.io/kubectl/pkg/scheme" cmdtesting "k8s.io/kubectl/pkg/cmd/testing" + "k8s.io/kubectl/pkg/scheme" ) func TestCreateConfigMap(t *testing.T) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_deployment_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_deployment_test.go index e89565d4fdd..23540eb24c4 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_deployment_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_deployment_test.go @@ -27,9 +27,9 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" restclient "k8s.io/client-go/rest" "k8s.io/client-go/rest/fake" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" generateversioned "k8s.io/kubectl/pkg/generate/versioned" "k8s.io/kubectl/pkg/scheme" - cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) func Test_generatorFromName(t *testing.T) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_namespace_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_namespace_test.go index 6ad727f9755..1f52306f858 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_namespace_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_namespace_test.go @@ -24,8 +24,8 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/rest/fake" - "k8s.io/kubectl/pkg/scheme" cmdtesting "k8s.io/kubectl/pkg/cmd/testing" + "k8s.io/kubectl/pkg/scheme" ) func TestCreateNamespace(t *testing.T) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_pdb_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_pdb_test.go index 19e20a9ef9e..3633b186a09 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_pdb_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_pdb_test.go @@ -26,8 +26,8 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" restclient "k8s.io/client-go/rest" "k8s.io/client-go/rest/fake" - "k8s.io/kubectl/pkg/scheme" cmdtesting "k8s.io/kubectl/pkg/cmd/testing" + "k8s.io/kubectl/pkg/scheme" ) func TestCreatePdb(t *testing.T) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_priorityclass_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_priorityclass_test.go index de511885998..d4e39b6d8c5 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_priorityclass_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_priorityclass_test.go @@ -26,8 +26,8 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" restclient "k8s.io/client-go/rest" "k8s.io/client-go/rest/fake" - "k8s.io/kubectl/pkg/scheme" cmdtesting "k8s.io/kubectl/pkg/cmd/testing" + "k8s.io/kubectl/pkg/scheme" ) func TestCreatePriorityClass(t *testing.T) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_role_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_role_test.go index ad25e11b575..7de4951592d 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_role_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_role_test.go @@ -27,8 +27,8 @@ import ( "k8s.io/apimachinery/pkg/util/diff" "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/rest/fake" - "k8s.io/kubectl/pkg/scheme" cmdtesting "k8s.io/kubectl/pkg/cmd/testing" + "k8s.io/kubectl/pkg/scheme" ) func TestCreateRole(t *testing.T) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_rolebinding_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_rolebinding_test.go index ba814065635..40d060a1733 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_rolebinding_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_rolebinding_test.go @@ -31,8 +31,8 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" restclient "k8s.io/client-go/rest" "k8s.io/client-go/rest/fake" - "k8s.io/kubectl/pkg/scheme" cmdtesting "k8s.io/kubectl/pkg/cmd/testing" + "k8s.io/kubectl/pkg/scheme" ) var groupVersion = schema.GroupVersion{Group: "rbac.authorization.k8s.io", Version: "v1"} diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_secret_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_secret_test.go index ac5505196ef..075293ba656 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_secret_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_secret_test.go @@ -24,8 +24,8 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/rest/fake" - "k8s.io/kubectl/pkg/scheme" cmdtesting "k8s.io/kubectl/pkg/cmd/testing" + "k8s.io/kubectl/pkg/scheme" ) func TestCreateSecretGeneric(t *testing.T) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_service_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_service_test.go index b9af93b0dcc..79205502151 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_service_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_service_test.go @@ -24,8 +24,8 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/rest/fake" - "k8s.io/kubectl/pkg/scheme" cmdtesting "k8s.io/kubectl/pkg/cmd/testing" + "k8s.io/kubectl/pkg/scheme" ) func TestCreateService(t *testing.T) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_serviceaccount_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_serviceaccount_test.go index 293fc2ccad0..ff0a4cb41f1 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_serviceaccount_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_serviceaccount_test.go @@ -24,8 +24,8 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/rest/fake" - "k8s.io/kubectl/pkg/scheme" cmdtesting "k8s.io/kubectl/pkg/cmd/testing" + "k8s.io/kubectl/pkg/scheme" ) func TestCreateServiceAccount(t *testing.T) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_test.go index c80ef26b236..2dad484dc2f 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_test.go @@ -24,8 +24,8 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/resource" "k8s.io/client-go/rest/fake" - "k8s.io/kubectl/pkg/scheme" cmdtesting "k8s.io/kubectl/pkg/cmd/testing" + "k8s.io/kubectl/pkg/scheme" ) func TestExtraArgsFail(t *testing.T) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/delete/delete.go b/staging/src/k8s.io/kubectl/pkg/cmd/delete/delete.go index e0c8b6a7875..8739a533633 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/delete/delete.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/delete/delete.go @@ -34,10 +34,10 @@ import ( "k8s.io/cli-runtime/pkg/resource" "k8s.io/client-go/dynamic" cmdutil "k8s.io/kubectl/pkg/cmd/util" + cmdwait "k8s.io/kubectl/pkg/cmd/wait" "k8s.io/kubectl/pkg/rawhttp" "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" - cmdwait "k8s.io/kubectl/pkg/cmd/wait" ) var ( diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/delete/delete_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/delete/delete_test.go index da8a733482c..5fdd6254947 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/delete/delete_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/delete/delete_test.go @@ -32,8 +32,8 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/resource" "k8s.io/client-go/rest/fake" - "k8s.io/kubectl/pkg/scheme" cmdtesting "k8s.io/kubectl/pkg/cmd/testing" + "k8s.io/kubectl/pkg/scheme" ) func fakecmd() *cobra.Command { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/describe/describe_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/describe/describe_test.go index e3aec934130..e95e70bef67 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/describe/describe_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/describe/describe_test.go @@ -26,10 +26,10 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/resource" "k8s.io/client-go/rest/fake" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" "k8s.io/kubectl/pkg/describe" versioneddescribe "k8s.io/kubectl/pkg/describe/versioned" "k8s.io/kubectl/pkg/scheme" - cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) // Verifies that schemas that are not in the master tree of Kubernetes can be retrieved via Get. diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/diff/diff.go b/staging/src/k8s.io/kubectl/pkg/cmd/diff/diff.go index 8d49b3839b3..e64df1ddb62 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/diff/diff.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/diff/diff.go @@ -36,13 +36,13 @@ import ( "k8s.io/client-go/discovery" "k8s.io/client-go/dynamic" "k8s.io/klog" + "k8s.io/kubectl/pkg/cmd/apply" cmdutil "k8s.io/kubectl/pkg/cmd/util" "k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/util" "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/openapi" "k8s.io/kubectl/pkg/util/templates" - "k8s.io/kubectl/pkg/cmd/apply" "k8s.io/utils/exec" "sigs.k8s.io/yaml" ) diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/drain/drain_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/drain/drain_test.go index 5c4dd68343d..94e1e1ab9d9 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/drain/drain_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/drain/drain_test.go @@ -47,10 +47,10 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/cli-runtime/pkg/printers" "k8s.io/client-go/rest/fake" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" cmdutil "k8s.io/kubectl/pkg/cmd/util" "k8s.io/kubectl/pkg/drain" "k8s.io/kubectl/pkg/scheme" - cmdtesting "k8s.io/kubectl/pkg/cmd/testing" utilpointer "k8s.io/utils/pointer" ) diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/edit/edit_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/edit/edit_test.go index 5a4392ea518..796242b8b75 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/edit/edit_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/edit/edit_test.go @@ -38,10 +38,10 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/resource" "k8s.io/client-go/rest/fake" - cmdutil "k8s.io/kubectl/pkg/cmd/util" "k8s.io/kubectl/pkg/cmd/apply" "k8s.io/kubectl/pkg/cmd/create" cmdtesting "k8s.io/kubectl/pkg/cmd/testing" + cmdutil "k8s.io/kubectl/pkg/cmd/util" ) type EditTestCase struct { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/exec/exec_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/exec/exec_test.go index b132d44ed60..0880dee257a 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/exec/exec_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/exec/exec_test.go @@ -35,9 +35,9 @@ import ( "k8s.io/client-go/rest/fake" "k8s.io/client-go/tools/remotecommand" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" "k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/util/term" - cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) type fakeRemoteExecutor struct { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/expose/expose_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/expose/expose_test.go index cfe504b07e5..a94592b3272 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/expose/expose_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/expose/expose_test.go @@ -29,8 +29,8 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/rest/fake" - "k8s.io/kubectl/pkg/scheme" cmdtesting "k8s.io/kubectl/pkg/cmd/testing" + "k8s.io/kubectl/pkg/scheme" ) func TestRunExposeService(t *testing.T) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/label/label_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/label/label_test.go index e46232d4b75..828b8a146a3 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/label/label_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/label/label_test.go @@ -29,8 +29,8 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/resource" "k8s.io/client-go/rest/fake" - "k8s.io/kubectl/pkg/scheme" cmdtesting "k8s.io/kubectl/pkg/cmd/testing" + "k8s.io/kubectl/pkg/scheme" ) func TestValidateLabels(t *testing.T) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/patch/patch_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/patch/patch_test.go index ad8b2afe382..b5b7ef2feba 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/patch/patch_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/patch/patch_test.go @@ -24,8 +24,8 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/resource" "k8s.io/client-go/rest/fake" - "k8s.io/kubectl/pkg/scheme" cmdtesting "k8s.io/kubectl/pkg/cmd/testing" + "k8s.io/kubectl/pkg/scheme" ) func TestPatchObject(t *testing.T) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/portforward/portforward_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/portforward/portforward_test.go index bdd67d39468..d3a91c1002b 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/portforward/portforward_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/portforward/portforward_test.go @@ -31,8 +31,8 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/rest/fake" - "k8s.io/kubectl/pkg/scheme" cmdtesting "k8s.io/kubectl/pkg/cmd/testing" + "k8s.io/kubectl/pkg/scheme" ) type fakePortForwarder struct { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/replace/replace.go b/staging/src/k8s.io/kubectl/pkg/cmd/replace/replace.go index 911497e0089..f598001350e 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/replace/replace.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/replace/replace.go @@ -34,6 +34,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/resource" + "k8s.io/kubectl/pkg/cmd/delete" cmdutil "k8s.io/kubectl/pkg/cmd/util" "k8s.io/kubectl/pkg/rawhttp" "k8s.io/kubectl/pkg/scheme" @@ -41,7 +42,6 @@ import ( "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" "k8s.io/kubectl/pkg/validation" - "k8s.io/kubectl/pkg/cmd/delete" ) var ( diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/replace/replace_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/replace/replace_test.go index 48b310b63c4..d90027e71c4 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/replace/replace_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/replace/replace_test.go @@ -25,8 +25,8 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/resource" "k8s.io/client-go/rest/fake" - "k8s.io/kubectl/pkg/scheme" cmdtesting "k8s.io/kubectl/pkg/cmd/testing" + "k8s.io/kubectl/pkg/scheme" ) func TestReplaceObject(t *testing.T) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout_pause.go b/staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout_pause.go index 8c62d20cbc3..645806abd15 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout_pause.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout_pause.go @@ -26,12 +26,12 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/printers" "k8s.io/cli-runtime/pkg/resource" + "k8s.io/kubectl/pkg/cmd/set" cmdutil "k8s.io/kubectl/pkg/cmd/util" "k8s.io/kubectl/pkg/polymorphichelpers" "k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" - "k8s.io/kubectl/pkg/cmd/set" ) // PauseOptions is the start of the data required to perform the operation. As new fields are added, add them here instead of diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout_pause_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout_pause_test.go index e7566b00a3b..28f42136998 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout_pause_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout_pause_test.go @@ -30,8 +30,8 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" restclient "k8s.io/client-go/rest" "k8s.io/client-go/rest/fake" - "k8s.io/kubectl/pkg/scheme" cmdtesting "k8s.io/kubectl/pkg/cmd/testing" + "k8s.io/kubectl/pkg/scheme" ) var rolloutPauseGroupVersionEncoder = schema.GroupVersion{Group: "extensions", Version: "v1beta1"} diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout_restart.go b/staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout_restart.go index ebc49b25cd8..4ef7b54af2f 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout_restart.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout_restart.go @@ -25,12 +25,12 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/printers" "k8s.io/cli-runtime/pkg/resource" + "k8s.io/kubectl/pkg/cmd/set" cmdutil "k8s.io/kubectl/pkg/cmd/util" "k8s.io/kubectl/pkg/polymorphichelpers" "k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" - "k8s.io/kubectl/pkg/cmd/set" ) // RestartOptions is the start of the data required to perform the operation. As new fields are added, add them here instead of diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout_resume.go b/staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout_resume.go index 63a5a8d975b..b41593f9972 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout_resume.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout_resume.go @@ -26,12 +26,12 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/printers" "k8s.io/cli-runtime/pkg/resource" + "k8s.io/kubectl/pkg/cmd/set" cmdutil "k8s.io/kubectl/pkg/cmd/util" "k8s.io/kubectl/pkg/polymorphichelpers" "k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" - "k8s.io/kubectl/pkg/cmd/set" ) // ResumeOptions is the start of the data required to perform the operation. As new fields are added, add them here instead of diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/run/run.go b/staging/src/k8s.io/kubectl/pkg/cmd/run/run.go index 06d2efe92bd..f292bd39932 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/run/run.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/run/run.go @@ -41,6 +41,10 @@ import ( corev1client "k8s.io/client-go/kubernetes/typed/core/v1" "k8s.io/client-go/tools/cache" watchtools "k8s.io/client-go/tools/watch" + "k8s.io/kubectl/pkg/cmd/attach" + "k8s.io/kubectl/pkg/cmd/delete" + "k8s.io/kubectl/pkg/cmd/exec" + "k8s.io/kubectl/pkg/cmd/logs" cmdutil "k8s.io/kubectl/pkg/cmd/util" "k8s.io/kubectl/pkg/generate" generateversioned "k8s.io/kubectl/pkg/generate/versioned" @@ -50,10 +54,6 @@ import ( "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/interrupt" "k8s.io/kubectl/pkg/util/templates" - "k8s.io/kubectl/pkg/cmd/attach" - "k8s.io/kubectl/pkg/cmd/delete" - "k8s.io/kubectl/pkg/cmd/exec" - "k8s.io/kubectl/pkg/cmd/logs" uexec "k8s.io/utils/exec" ) diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/run/run_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/run/run_test.go index aa7d16db49d..0a153a54b8b 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/run/run_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/run/run_test.go @@ -36,11 +36,11 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" restclient "k8s.io/client-go/rest" "k8s.io/client-go/rest/fake" + "k8s.io/kubectl/pkg/cmd/delete" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" cmdutil "k8s.io/kubectl/pkg/cmd/util" "k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/util/i18n" - "k8s.io/kubectl/pkg/cmd/delete" - cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) func TestGetRestartPolicy(t *testing.T) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/set/set_env.go b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_env.go index 263604e4765..cb84c729647 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/set/set_env.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_env.go @@ -34,11 +34,11 @@ import ( "k8s.io/cli-runtime/pkg/printers" "k8s.io/cli-runtime/pkg/resource" "k8s.io/client-go/kubernetes" + envutil "k8s.io/kubectl/pkg/cmd/set/env" cmdutil "k8s.io/kubectl/pkg/cmd/util" "k8s.io/kubectl/pkg/polymorphichelpers" "k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/util/templates" - envutil "k8s.io/kubectl/pkg/cmd/set/env" ) var ( diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/set/set_env_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_env_test.go index 027d931a8f0..9726037e7db 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/set/set_env_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_env_test.go @@ -37,8 +37,8 @@ import ( "k8s.io/cli-runtime/pkg/resource" restclient "k8s.io/client-go/rest" "k8s.io/client-go/rest/fake" - "k8s.io/kubectl/pkg/scheme" cmdtesting "k8s.io/kubectl/pkg/cmd/testing" + "k8s.io/kubectl/pkg/scheme" ) func TestSetEnvLocal(t *testing.T) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/set/set_image_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_image_test.go index cb8f2d80eac..806da6dbfc4 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/set/set_image_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_image_test.go @@ -38,8 +38,8 @@ import ( "k8s.io/cli-runtime/pkg/resource" restclient "k8s.io/client-go/rest" "k8s.io/client-go/rest/fake" - "k8s.io/kubectl/pkg/scheme" cmdtesting "k8s.io/kubectl/pkg/cmd/testing" + "k8s.io/kubectl/pkg/scheme" ) func TestImageLocal(t *testing.T) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/set/set_resources_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_resources_test.go index 9d7f72fc609..69252043483 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/set/set_resources_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_resources_test.go @@ -37,8 +37,8 @@ import ( "k8s.io/cli-runtime/pkg/resource" restclient "k8s.io/client-go/rest" "k8s.io/client-go/rest/fake" - "k8s.io/kubectl/pkg/scheme" cmdtesting "k8s.io/kubectl/pkg/cmd/testing" + "k8s.io/kubectl/pkg/scheme" ) func TestResourcesLocal(t *testing.T) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/set/set_serviceaccount_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_serviceaccount_test.go index 3ec73cd9399..59a3c1ce6ba 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/set/set_serviceaccount_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_serviceaccount_test.go @@ -37,8 +37,8 @@ import ( "k8s.io/cli-runtime/pkg/resource" restclient "k8s.io/client-go/rest" "k8s.io/client-go/rest/fake" - "k8s.io/kubectl/pkg/scheme" cmdtesting "k8s.io/kubectl/pkg/cmd/testing" + "k8s.io/kubectl/pkg/scheme" ) const ( diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/taint/taint_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/taint/taint_test.go index 54d85f86d06..fce91c15e83 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/taint/taint_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/taint/taint_test.go @@ -30,9 +30,9 @@ import ( "k8s.io/apimachinery/pkg/util/strategicpatch" "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/rest/fake" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" cmdutil "k8s.io/kubectl/pkg/cmd/util" "k8s.io/kubectl/pkg/scheme" - cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) func generateNodeAndTaintedNode(oldTaints []corev1.Taint, newTaints []corev1.Taint) (*corev1.Node, *corev1.Node) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/top/top_node_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/top/top_node_test.go index 31fbed974bf..1240f8c3213 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/top/top_node_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/top/top_node_test.go @@ -31,8 +31,8 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/rest/fake" core "k8s.io/client-go/testing" - "k8s.io/kubectl/pkg/scheme" cmdtesting "k8s.io/kubectl/pkg/cmd/testing" + "k8s.io/kubectl/pkg/scheme" metricsv1alpha1api "k8s.io/metrics/pkg/apis/metrics/v1alpha1" metricsv1beta1api "k8s.io/metrics/pkg/apis/metrics/v1beta1" metricsfake "k8s.io/metrics/pkg/client/clientset/versioned/fake" diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/top/top_pod_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/top/top_pod_test.go index abea6a19af6..d077d1d1536 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/top/top_pod_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/top/top_pod_test.go @@ -36,9 +36,9 @@ import ( restclient "k8s.io/client-go/rest" "k8s.io/client-go/rest/fake" core "k8s.io/client-go/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" cmdutil "k8s.io/kubectl/pkg/cmd/util" "k8s.io/kubectl/pkg/scheme" - cmdtesting "k8s.io/kubectl/pkg/cmd/testing" metricsv1alpha1api "k8s.io/metrics/pkg/apis/metrics/v1alpha1" metricsv1beta1api "k8s.io/metrics/pkg/apis/metrics/v1beta1" metricsfake "k8s.io/metrics/pkg/client/clientset/versioned/fake" From 58b59ae4e07f9d3718271a43740a4de9508d8688 Mon Sep 17 00:00:00 2001 From: Sean Sullivan Date: Thu, 1 Aug 2019 15:17:53 -0700 Subject: [PATCH 5/7] Update test data to reflect code move to staging --- pkg/kubectl/cmd/BUILD | 1 + pkg/kubectl/cmd/cmd_test.go | 2 +- .../kubectl/cmd/plugin/testdata}/BUILD | 4 +- pkg/kubectl/cmd/plugin/testdata/kubectl-foo | 3 + .../cmd/plugin/testdata/kubectl-version | 4 ++ staging/src/k8s.io/kubectl/BUILD | 2 +- .../k8s.io/kubectl/pkg/apply/strategy/BUILD | 2 +- .../src/k8s.io/kubectl/pkg/cmd/annotate/BUILD | 4 +- .../kubectl/pkg/cmd/annotate/annotate_test.go | 4 +- .../src/k8s.io/kubectl/pkg/cmd/apply/BUILD | 5 +- .../kubectl/pkg/cmd/apply/apply_test.go | 34 +++++------ .../src/k8s.io/kubectl/pkg/cmd/create/BUILD | 4 +- .../kubectl/pkg/cmd/create/create_test.go | 8 +-- .../src/k8s.io/kubectl/pkg/cmd/delete/BUILD | 4 +- .../kubectl/pkg/cmd/delete/delete_test.go | 18 +++--- .../src/k8s.io/kubectl/pkg/cmd/describe/BUILD | 4 +- .../kubectl/pkg/cmd/describe/describe_test.go | 2 +- .../src/k8s.io/kubectl/pkg/cmd/expose/BUILD | 4 +- .../kubectl/pkg/cmd/expose/expose_test.go | 2 +- .../src/k8s.io/kubectl/pkg/cmd/label/BUILD | 4 +- .../kubectl/pkg/cmd/label/label_test.go | 4 +- .../src/k8s.io/kubectl/pkg/cmd/patch/BUILD | 4 +- .../kubectl/pkg/cmd/patch/patch_test.go | 4 +- .../src/k8s.io/kubectl/pkg/cmd/replace/BUILD | 4 +- .../kubectl/pkg/cmd/replace/replace_test.go | 10 ++-- staging/src/k8s.io/kubectl/pkg/cmd/set/BUILD | 5 +- .../kubectl/pkg/cmd/set/set_env_test.go | 6 +- .../kubectl/pkg/cmd/set/set_image_test.go | 4 +- .../kubectl/pkg/cmd/set/set_resources_test.go | 4 +- .../pkg/cmd/set/set_serviceaccount_test.go | 12 ++-- .../src/k8s.io/kubectl/pkg/util/openapi/BUILD | 4 +- .../kubectl/pkg/util/openapi/validation/BUILD | 4 +- staging/src/k8s.io/kubectl/test/data/BUILD | 24 ++++++++ .../k8s.io/kubectl/test/data/apply/cm.yaml | 16 +++++ .../test/data/apply/deploy-clientside.yaml | 21 +++++++ .../test/data/apply/deploy-serverside.yaml | 46 +++++++++++++++ .../k8s.io/kubectl/test/data/apply/patch.json | 1 + .../kubectl/test/data/apply/rc-args.yaml | 20 +++++++ .../test/data/apply/rc-lastapplied-args.yaml | 23 ++++++++ .../test/data/apply/rc-lastapplied.yaml | 21 +++++++ .../test/data/apply/rc-no-annotation.yaml | 18 ++++++ .../kubectl/test/data/apply/rc-noexist.yaml | 18 ++++++ .../kubectl/test/data/apply/rc-service.yaml | 32 ++++++++++ .../k8s.io/kubectl/test/data/apply/rc.json | 33 +++++++++++ .../k8s.io/kubectl/test/data/apply/rc.yaml | 19 ++++++ .../kubectl/test/data/apply/service.yaml | 11 ++++ .../kubectl/test/data/apply/testdir/rc.yaml | 18 ++++++ .../kubectl/test/data/apply/testdir/rc1.yaml | 18 ++++++ .../test/data/apply/widget-clientside.yaml | 8 +++ .../test/data/apply/widget-serverside.yaml | 10 ++++ .../k8s.io/kubectl/test/data/controller.yaml | 58 +++++++++++++++++++ .../kubectl/test/data/frontend-service.yaml | 16 +++++ .../test/data/redis-master-controller.yaml | 26 +++++++++ .../test/data/redis-master-service.yaml | 16 +++++ .../replace/legacy/frontend-controller.yaml | 29 ++++++++++ .../legacy/redis-master-controller.yaml | 26 +++++++++ .../legacy/redis-slave-controller.yaml | 37 ++++++++++++ .../k8s.io/kubectl/test/data/set/daemon.yaml | 21 +++++++ .../kubectl/test/data/set/deployment.yaml | 21 +++++++ .../src/k8s.io/kubectl/test/data/set/job.yaml | 15 +++++ .../test/data/set/multi-resource-yaml.yaml | 33 +++++++++++ .../test/data/set/namespaced-resource.yaml | 17 ++++++ .../kubectl/test/data/set/redis-slave.yaml | 44 ++++++++++++++ .../kubectl/test/data/set/replication.yaml | 19 ++++++ 64 files changed, 816 insertions(+), 99 deletions(-) rename {staging/src/k8s.io/kubectl/test/data/openapi => pkg/kubectl/cmd/plugin/testdata}/BUILD (89%) create mode 100755 pkg/kubectl/cmd/plugin/testdata/kubectl-foo create mode 100755 pkg/kubectl/cmd/plugin/testdata/kubectl-version create mode 100644 staging/src/k8s.io/kubectl/test/data/BUILD create mode 100644 staging/src/k8s.io/kubectl/test/data/apply/cm.yaml create mode 100644 staging/src/k8s.io/kubectl/test/data/apply/deploy-clientside.yaml create mode 100644 staging/src/k8s.io/kubectl/test/data/apply/deploy-serverside.yaml create mode 100644 staging/src/k8s.io/kubectl/test/data/apply/patch.json create mode 100644 staging/src/k8s.io/kubectl/test/data/apply/rc-args.yaml create mode 100644 staging/src/k8s.io/kubectl/test/data/apply/rc-lastapplied-args.yaml create mode 100644 staging/src/k8s.io/kubectl/test/data/apply/rc-lastapplied.yaml create mode 100644 staging/src/k8s.io/kubectl/test/data/apply/rc-no-annotation.yaml create mode 100644 staging/src/k8s.io/kubectl/test/data/apply/rc-noexist.yaml create mode 100644 staging/src/k8s.io/kubectl/test/data/apply/rc-service.yaml create mode 100644 staging/src/k8s.io/kubectl/test/data/apply/rc.json create mode 100644 staging/src/k8s.io/kubectl/test/data/apply/rc.yaml create mode 100644 staging/src/k8s.io/kubectl/test/data/apply/service.yaml create mode 100644 staging/src/k8s.io/kubectl/test/data/apply/testdir/rc.yaml create mode 100644 staging/src/k8s.io/kubectl/test/data/apply/testdir/rc1.yaml create mode 100644 staging/src/k8s.io/kubectl/test/data/apply/widget-clientside.yaml create mode 100644 staging/src/k8s.io/kubectl/test/data/apply/widget-serverside.yaml create mode 100644 staging/src/k8s.io/kubectl/test/data/controller.yaml create mode 100644 staging/src/k8s.io/kubectl/test/data/frontend-service.yaml create mode 100644 staging/src/k8s.io/kubectl/test/data/redis-master-controller.yaml create mode 100644 staging/src/k8s.io/kubectl/test/data/redis-master-service.yaml create mode 100644 staging/src/k8s.io/kubectl/test/data/replace/legacy/frontend-controller.yaml create mode 100644 staging/src/k8s.io/kubectl/test/data/replace/legacy/redis-master-controller.yaml create mode 100644 staging/src/k8s.io/kubectl/test/data/replace/legacy/redis-slave-controller.yaml create mode 100644 staging/src/k8s.io/kubectl/test/data/set/daemon.yaml create mode 100644 staging/src/k8s.io/kubectl/test/data/set/deployment.yaml create mode 100644 staging/src/k8s.io/kubectl/test/data/set/job.yaml create mode 100644 staging/src/k8s.io/kubectl/test/data/set/multi-resource-yaml.yaml create mode 100644 staging/src/k8s.io/kubectl/test/data/set/namespaced-resource.yaml create mode 100644 staging/src/k8s.io/kubectl/test/data/set/redis-slave.yaml create mode 100644 staging/src/k8s.io/kubectl/test/data/set/replication.yaml diff --git a/pkg/kubectl/cmd/BUILD b/pkg/kubectl/cmd/BUILD index f92760a7de4..e1eb610d12a 100644 --- a/pkg/kubectl/cmd/BUILD +++ b/pkg/kubectl/cmd/BUILD @@ -60,6 +60,7 @@ go_library( go_test( name = "go_default_test", srcs = ["cmd_test.go"], + data = ["//pkg/kubectl/cmd/plugin/testdata"], embed = [":go_default_library"], deps = [ "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library", diff --git a/pkg/kubectl/cmd/cmd_test.go b/pkg/kubectl/cmd/cmd_test.go index d93b240d2e1..f2a19179751 100644 --- a/pkg/kubectl/cmd/cmd_test.go +++ b/pkg/kubectl/cmd/cmd_test.go @@ -100,7 +100,7 @@ func TestKubectlCommandHandlesPlugins(t *testing.T) { } if pluginsHandler.executedPlugin != test.expectPlugin { - t.Fatalf("unexpected plugin execution: expedcted %q, got %q", test.expectPlugin, pluginsHandler.executedPlugin) + t.Fatalf("unexpected plugin execution: expected %q, got %q", test.expectPlugin, pluginsHandler.executedPlugin) } if len(pluginsHandler.withArgs) != len(test.expectPluginArgs) { diff --git a/staging/src/k8s.io/kubectl/test/data/openapi/BUILD b/pkg/kubectl/cmd/plugin/testdata/BUILD similarity index 89% rename from staging/src/k8s.io/kubectl/test/data/openapi/BUILD rename to pkg/kubectl/cmd/plugin/testdata/BUILD index c81558ca336..3377e9a49a0 100644 --- a/staging/src/k8s.io/kubectl/test/data/openapi/BUILD +++ b/pkg/kubectl/cmd/plugin/testdata/BUILD @@ -1,9 +1,9 @@ package(default_visibility = ["//visibility:public"]) filegroup( - name = "openapi", + name = "testdata", srcs = glob([ - "**/*.json", + "**/*", ]), ) diff --git a/pkg/kubectl/cmd/plugin/testdata/kubectl-foo b/pkg/kubectl/cmd/plugin/testdata/kubectl-foo new file mode 100755 index 00000000000..651b7662dda --- /dev/null +++ b/pkg/kubectl/cmd/plugin/testdata/kubectl-foo @@ -0,0 +1,3 @@ +#!/bin/bash + +echo "I am plugin foo" diff --git a/pkg/kubectl/cmd/plugin/testdata/kubectl-version b/pkg/kubectl/cmd/plugin/testdata/kubectl-version new file mode 100755 index 00000000000..3718966b689 --- /dev/null +++ b/pkg/kubectl/cmd/plugin/testdata/kubectl-version @@ -0,0 +1,4 @@ +#!/bin/bash + +# This plugin is a no-op and is used to test plugins +# that overshadow existing kubectl commands diff --git a/staging/src/k8s.io/kubectl/BUILD b/staging/src/k8s.io/kubectl/BUILD index a8ffb840cc8..d93dd8a31f6 100644 --- a/staging/src/k8s.io/kubectl/BUILD +++ b/staging/src/k8s.io/kubectl/BUILD @@ -26,7 +26,7 @@ filegroup( "//staging/src/k8s.io/kubectl/pkg/util:all-srcs", "//staging/src/k8s.io/kubectl/pkg/validation:all-srcs", "//staging/src/k8s.io/kubectl/pkg/version:all-srcs", - "//staging/src/k8s.io/kubectl/test/data/openapi:all-srcs", + "//staging/src/k8s.io/kubectl/test/data:all-srcs", ], tags = ["automanaged"], visibility = ["//visibility:public"], diff --git a/staging/src/k8s.io/kubectl/pkg/apply/strategy/BUILD b/staging/src/k8s.io/kubectl/pkg/apply/strategy/BUILD index d9353918071..344d96aa77b 100644 --- a/staging/src/k8s.io/kubectl/pkg/apply/strategy/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/apply/strategy/BUILD @@ -33,7 +33,7 @@ go_test( ], data = [ "test_swagger.json", - "//staging/src/k8s.io/kubectl/test/data/openapi", + "//staging/src/k8s.io/kubectl/test/data", ], embed = [":go_default_library"], deps = [ diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/annotate/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/annotate/BUILD index 93411fd9a11..fece9753377 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/annotate/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/annotate/BUILD @@ -29,9 +29,7 @@ go_library( go_test( name = "go_default_test", srcs = ["annotate_test.go"], - data = [ - "//test/e2e/testing-manifests:all-srcs", - ], + data = ["//staging/src/k8s.io/kubectl/test/data"], embed = [":go_default_library"], deps = [ "//staging/src/k8s.io/api/core/v1:go_default_library", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/annotate/annotate_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/annotate/annotate_test.go index ae9bcff3f6e..acbe035886a 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/annotate/annotate_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/annotate/annotate_test.go @@ -543,7 +543,7 @@ func TestAnnotateObjectFromFile(t *testing.T) { cmd := NewCmdAnnotate("kubectl", tf, iostreams) cmd.SetOutput(bufOut) options := NewAnnotateOptions(iostreams) - options.Filenames = []string{"../../../../test/e2e/testing-manifests/statefulset/cassandra/controller.yaml"} + options.Filenames = []string{"../../../test/data/controller.yaml"} args := []string{"a=b", "c-"} if err := options.Complete(tf, cmd, args); err != nil { t.Fatalf("unexpected error: %v", err) @@ -574,7 +574,7 @@ func TestAnnotateLocal(t *testing.T) { cmd := NewCmdAnnotate("kubectl", tf, iostreams) options := NewAnnotateOptions(iostreams) options.local = true - options.Filenames = []string{"../../../../test/e2e/testing-manifests/statefulset/cassandra/controller.yaml"} + options.Filenames = []string{"../../../test/data/controller.yaml"} args := []string{"a=b"} if err := options.Complete(tf, cmd, args); err != nil { t.Fatalf("unexpected error: %v", err) diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/apply/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/apply/BUILD index ee84fd248c7..d82f63e524f 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/apply/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/apply/BUILD @@ -50,10 +50,7 @@ go_library( go_test( name = "go_default_test", srcs = ["apply_test.go"], - data = [ - "//api/openapi-spec", - "//test/fixtures", - ], + data = ["//staging/src/k8s.io/kubectl/test/data"], embed = [":go_default_library"], deps = [ "//staging/src/k8s.io/api/apps/v1:go_default_library", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/apply/apply_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/apply/apply_test.go index fb185a1b343..a007032c489 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/apply/apply_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/apply/apply_test.go @@ -54,7 +54,7 @@ import ( ) var ( - fakeSchema = sptest.Fake{Path: filepath.Join("..", "..", "..", "..", "api", "openapi-spec", "swagger.json")} + fakeSchema = sptest.Fake{Path: filepath.Join("..", "..", "..", "test", "data", "openapi", "swagger.json")} testingOpenAPISchemaFns = []func() (openapi.Resources, error){nil, AlwaysErrorOpenAPISchemaFn, openAPISchemaFn} AlwaysErrorOpenAPISchemaFn = func() (openapi.Resources, error) { return nil, errors.New("cannot get openapi spec") @@ -87,23 +87,23 @@ func validateApplyArgs(cmd *cobra.Command, args []string) error { } const ( - filenameCM = "../../../../test/fixtures/pkg/kubectl/cmd/apply/cm.yaml" - filenameRC = "../../../../test/fixtures/pkg/kubectl/cmd/apply/rc.yaml" - filenameRCArgs = "../../../../test/fixtures/pkg/kubectl/cmd/apply/rc-args.yaml" - filenameRCLastAppliedArgs = "../../../../test/fixtures/pkg/kubectl/cmd/apply/rc-lastapplied-args.yaml" - filenameRCNoAnnotation = "../../../../test/fixtures/pkg/kubectl/cmd/apply/rc-no-annotation.yaml" - filenameRCLASTAPPLIED = "../../../../test/fixtures/pkg/kubectl/cmd/apply/rc-lastapplied.yaml" - filenameSVC = "../../../../test/fixtures/pkg/kubectl/cmd/apply/service.yaml" - filenameRCSVC = "../../../../test/fixtures/pkg/kubectl/cmd/apply/rc-service.yaml" - filenameNoExistRC = "../../../../test/fixtures/pkg/kubectl/cmd/apply/rc-noexist.yaml" - filenameRCPatchTest = "../../../../test/fixtures/pkg/kubectl/cmd/apply/patch.json" - dirName = "../../../../test/fixtures/pkg/kubectl/cmd/apply/testdir" - filenameRCJSON = "../../../../test/fixtures/pkg/kubectl/cmd/apply/rc.json" + filenameCM = "../../../test/data/apply/cm.yaml" + filenameRC = "../../../test/data/apply/rc.yaml" + filenameRCArgs = "../../../test/data/apply/rc-args.yaml" + filenameRCLastAppliedArgs = "../../../test/data/apply/rc-lastapplied-args.yaml" + filenameRCNoAnnotation = "../../../test/data/apply/rc-no-annotation.yaml" + filenameRCLASTAPPLIED = "../../../test/data/apply/rc-lastapplied.yaml" + filenameSVC = "../../../test/data/apply/service.yaml" + filenameRCSVC = "../../../test/data/apply/rc-service.yaml" + filenameNoExistRC = "../../../test/data/apply/rc-noexist.yaml" + filenameRCPatchTest = "../../../test/data/apply/patch.json" + dirName = "../../../test/data/apply/testdir" + filenameRCJSON = "../../../test/data/apply/rc.json" - filenameWidgetClientside = "../../../../test/fixtures/pkg/kubectl/cmd/apply/widget-clientside.yaml" - filenameWidgetServerside = "../../../../test/fixtures/pkg/kubectl/cmd/apply/widget-serverside.yaml" - filenameDeployObjServerside = "../../../../test/fixtures/pkg/kubectl/cmd/apply/deploy-serverside.yaml" - filenameDeployObjClientside = "../../../../test/fixtures/pkg/kubectl/cmd/apply/deploy-clientside.yaml" + filenameWidgetClientside = "../../../test/data/apply/widget-clientside.yaml" + filenameWidgetServerside = "../../../test/data/apply/widget-serverside.yaml" + filenameDeployObjServerside = "../../../test/data/apply/deploy-serverside.yaml" + filenameDeployObjClientside = "../../../test/data/apply/deploy-clientside.yaml" ) func readConfigMapList(t *testing.T, filename string) [][]byte { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/create/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/create/BUILD index ef40a36347c..4d34881f4bb 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/create/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/create/BUILD @@ -77,9 +77,7 @@ go_test( "create_serviceaccount_test.go", "create_test.go", ], - data = [ - "//test/e2e/testing-manifests:all-srcs", - ], + data = ["//staging/src/k8s.io/kubectl/test/data"], embed = [":go_default_library"], deps = [ "//staging/src/k8s.io/api/apps/v1:go_default_library", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_test.go index 2dad484dc2f..e817f729953 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_test.go @@ -67,7 +67,7 @@ func TestCreateObject(t *testing.T) { ioStreams, _, buf, _ := genericclioptions.NewTestIOStreams() cmd := NewCmdCreate(tf, ioStreams) - cmd.Flags().Set("filename", "../../../../test/e2e/testing-manifests/guestbook/legacy/redis-master-controller.yaml") + cmd.Flags().Set("filename", "../../../test/data/redis-master-controller.yaml") cmd.Flags().Set("output", "name") cmd.Run(cmd, []string{}) @@ -104,8 +104,8 @@ func TestCreateMultipleObject(t *testing.T) { ioStreams, _, buf, _ := genericclioptions.NewTestIOStreams() cmd := NewCmdCreate(tf, ioStreams) - cmd.Flags().Set("filename", "../../../../test/e2e/testing-manifests/guestbook/legacy/redis-master-controller.yaml") - cmd.Flags().Set("filename", "../../../../test/e2e/testing-manifests/guestbook/frontend-service.yaml") + cmd.Flags().Set("filename", "../../../test/data/redis-master-controller.yaml") + cmd.Flags().Set("filename", "../../../test/data/frontend-service.yaml") cmd.Flags().Set("output", "name") cmd.Run(cmd, []string{}) @@ -141,7 +141,7 @@ func TestCreateDirectory(t *testing.T) { ioStreams, _, buf, _ := genericclioptions.NewTestIOStreams() cmd := NewCmdCreate(tf, ioStreams) - cmd.Flags().Set("filename", "../../../../test/e2e/testing-manifests/guestbook/legacy") + cmd.Flags().Set("filename", "../../../test/data/replace/legacy") cmd.Flags().Set("output", "name") cmd.Run(cmd, []string{}) diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/delete/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/delete/BUILD index 2c55d5e5491..27338c61496 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/delete/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/delete/BUILD @@ -31,9 +31,7 @@ go_library( go_test( name = "go_default_test", srcs = ["delete_test.go"], - data = [ - "//test/e2e/testing-manifests:all-srcs", - ], + data = ["//staging/src/k8s.io/kubectl/test/data"], embed = [":go_default_library"], deps = [ "//staging/src/k8s.io/api/core/v1:go_default_library", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/delete/delete_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/delete/delete_test.go index 5fdd6254947..79d996c97b2 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/delete/delete_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/delete/delete_test.go @@ -38,9 +38,9 @@ import ( func fakecmd() *cobra.Command { cmd := &cobra.Command{ - Use: "delete ([-f FILENAME] | TYPE [(NAME | -l label | --all)])", + Use: "delete ([-f FILENAME] | TYPE [(NAME | -l label | --all)])", DisableFlagsInUseLine: true, - Run: func(cmd *cobra.Command, args []string) {}, + Run: func(cmd *cobra.Command, args []string) {}, } return cmd } @@ -237,7 +237,7 @@ func TestDeleteObject(t *testing.T) { streams, _, buf, _ := genericclioptions.NewTestIOStreams() cmd := NewCmdDelete(tf, streams) - cmd.Flags().Set("filename", "../../../../test/e2e/testing-manifests/guestbook/legacy/redis-master-controller.yaml") + cmd.Flags().Set("filename", "../../../test/data/redis-master-controller.yaml") cmd.Flags().Set("cascade", "false") cmd.Flags().Set("output", "name") cmd.Run(cmd, []string{}) @@ -317,7 +317,7 @@ func TestDeleteObjectNotFound(t *testing.T) { options := &DeleteOptions{ FilenameOptions: resource.FilenameOptions{ - Filenames: []string{"../../../../test/e2e/testing-manifests/guestbook/legacy/redis-master-controller.yaml"}, + Filenames: []string{"../../../test/data/redis-master-controller.yaml"}, }, GracePeriod: -1, Cascade: false, @@ -354,7 +354,7 @@ func TestDeleteObjectIgnoreNotFound(t *testing.T) { streams, _, buf, _ := genericclioptions.NewTestIOStreams() cmd := NewCmdDelete(tf, streams) - cmd.Flags().Set("filename", "../../../../test/e2e/testing-manifests/guestbook/legacy/redis-master-controller.yaml") + cmd.Flags().Set("filename", "../../../test/data/redis-master-controller.yaml") cmd.Flags().Set("cascade", "false") cmd.Flags().Set("ignore-not-found", "true") cmd.Flags().Set("output", "name") @@ -482,8 +482,8 @@ func TestDeleteMultipleObject(t *testing.T) { streams, _, buf, _ := genericclioptions.NewTestIOStreams() cmd := NewCmdDelete(tf, streams) - cmd.Flags().Set("filename", "../../../../test/e2e/testing-manifests/guestbook/legacy/redis-master-controller.yaml") - cmd.Flags().Set("filename", "../../../../test/e2e/testing-manifests/guestbook/frontend-service.yaml") + cmd.Flags().Set("filename", "../../../test/data/redis-master-controller.yaml") + cmd.Flags().Set("filename", "../../../test/data/frontend-service.yaml") cmd.Flags().Set("cascade", "false") cmd.Flags().Set("output", "name") cmd.Run(cmd, []string{}) @@ -520,7 +520,7 @@ func TestDeleteMultipleObjectContinueOnMissing(t *testing.T) { options := &DeleteOptions{ FilenameOptions: resource.FilenameOptions{ - Filenames: []string{"../../../../test/e2e/testing-manifests/guestbook/legacy/redis-master-controller.yaml", "../../../../test/e2e/testing-manifests/guestbook/frontend-service.yaml"}, + Filenames: []string{"../../../test/data/redis-master-controller.yaml", "../../../test/data/frontend-service.yaml"}, }, GracePeriod: -1, Cascade: false, @@ -604,7 +604,7 @@ func TestDeleteDirectory(t *testing.T) { streams, _, buf, _ := genericclioptions.NewTestIOStreams() cmd := NewCmdDelete(tf, streams) - cmd.Flags().Set("filename", "../../../../test/e2e/testing-manifests/guestbook/legacy") + cmd.Flags().Set("filename", "../../../test/data/replace/legacy") cmd.Flags().Set("cascade", "false") cmd.Flags().Set("output", "name") cmd.Run(cmd, []string{}) diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/describe/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/describe/BUILD index 374022d3fb4..3e7065bfc2b 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/describe/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/describe/BUILD @@ -25,9 +25,7 @@ go_library( go_test( name = "go_default_test", srcs = ["describe_test.go"], - data = [ - "//test/e2e/testing-manifests:all-srcs", - ], + data = ["//staging/src/k8s.io/kubectl/test/data"], embed = [":go_default_library"], deps = [ "//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/describe/describe_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/describe/describe_test.go index e95e70bef67..d758e159f22 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/describe/describe_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/describe/describe_test.go @@ -126,7 +126,7 @@ func TestDescribeObject(t *testing.T) { streams, _, buf, _ := genericclioptions.NewTestIOStreams() cmd := NewCmdDescribe("kubectl", tf, streams) - cmd.Flags().Set("filename", "../../../../test/e2e/testing-manifests/guestbook/legacy/redis-master-controller.yaml") + cmd.Flags().Set("filename", "../../../test/data/redis-master-controller.yaml") cmd.Run(cmd, []string{}) if d.Name != "redis-master" || d.Namespace != "test" { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/expose/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/expose/BUILD index 99580a2bc75..ad2eb448164 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/expose/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/expose/BUILD @@ -33,9 +33,7 @@ go_library( go_test( name = "go_default_test", srcs = ["expose_test.go"], - data = [ - "//test/e2e/testing-manifests:all-srcs", - ], + data = ["//staging/src/k8s.io/kubectl/test/data"], embed = [":go_default_library"], deps = [ "//staging/src/k8s.io/api/core/v1:go_default_library", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/expose/expose_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/expose/expose_test.go index a94592b3272..267d5d0c05d 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/expose/expose_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/expose/expose_test.go @@ -306,7 +306,7 @@ func TestRunExposeService(t *testing.T) { Selector: map[string]string{"app": "go"}, }, }, - flags: map[string]string{"filename": "../../../../test/e2e/testing-manifests/guestbook/redis-master-service.yaml", "selector": "func=stream", "protocol": "UDP", "port": "14", "name": "foo", "labels": "svc=test", "dry-run": "true"}, + flags: map[string]string{"filename": "../../../test/data/redis-master-service.yaml", "selector": "func=stream", "protocol": "UDP", "port": "14", "name": "foo", "labels": "svc=test", "dry-run": "true"}, output: &corev1.Service{ ObjectMeta: metav1.ObjectMeta{Name: "foo", Labels: map[string]string{"svc": "test"}}, Spec: corev1.ServiceSpec{ diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/label/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/label/BUILD index 28f8112f6eb..8b0a1043a07 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/label/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/label/BUILD @@ -31,9 +31,7 @@ go_library( go_test( name = "go_default_test", srcs = ["label_test.go"], - data = [ - "//test/e2e/testing-manifests:all-srcs", - ], + data = ["//staging/src/k8s.io/kubectl/test/data"], embed = [":go_default_library"], deps = [ "//staging/src/k8s.io/api/core/v1:go_default_library", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/label/label_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/label/label_test.go index 828b8a146a3..f2634167295 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/label/label_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/label/label_test.go @@ -392,7 +392,7 @@ func TestLabelForResourceFromFile(t *testing.T) { ioStreams, _, buf, _ := genericclioptions.NewTestIOStreams() cmd := NewCmdLabel(tf, ioStreams) opts := NewLabelOptions(ioStreams) - opts.Filenames = []string{"../../../../test/e2e/testing-manifests/statefulset/cassandra/controller.yaml"} + opts.Filenames = []string{"../../../test/data/controller.yaml"} err := opts.Complete(tf, cmd, []string{"a=b"}) if err == nil { err = opts.Validate() @@ -424,7 +424,7 @@ func TestLabelLocal(t *testing.T) { ioStreams, _, buf, _ := genericclioptions.NewTestIOStreams() cmd := NewCmdLabel(tf, ioStreams) opts := NewLabelOptions(ioStreams) - opts.Filenames = []string{"../../../../test/e2e/testing-manifests/statefulset/cassandra/controller.yaml"} + opts.Filenames = []string{"../../../test/data/controller.yaml"} opts.local = true err := opts.Complete(tf, cmd, []string{"a=b"}) if err == nil { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/patch/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/patch/BUILD index fad8f8c7c05..6912d0ef10d 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/patch/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/patch/BUILD @@ -31,9 +31,7 @@ go_library( go_test( name = "go_default_test", srcs = ["patch_test.go"], - data = [ - "//test/e2e/testing-manifests:all-srcs", - ], + data = ["//staging/src/k8s.io/kubectl/test/data"], embed = [":go_default_library"], deps = [ "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/patch/patch_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/patch/patch_test.go index b5b7ef2feba..ac3335c5a72 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/patch/patch_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/patch/patch_test.go @@ -95,7 +95,7 @@ func TestPatchObjectFromFile(t *testing.T) { cmd.Flags().Set("namespace", "test") cmd.Flags().Set("patch", `{"spec":{"type":"NodePort"}}`) cmd.Flags().Set("output", "name") - cmd.Flags().Set("filename", "../../../../test/e2e/testing-manifests/guestbook/frontend-service.yaml") + cmd.Flags().Set("filename", "../../../test/data/frontend-service.yaml") cmd.Run(cmd, []string{}) // uses the name from the response @@ -181,7 +181,7 @@ func TestPatchObjectFromFileOutput(t *testing.T) { cmd.Flags().Set("namespace", "test") cmd.Flags().Set("patch", `{"spec":{"type":"NodePort"}}`) cmd.Flags().Set("output", "yaml") - cmd.Flags().Set("filename", "../../../../test/e2e/testing-manifests/guestbook/frontend-service.yaml") + cmd.Flags().Set("filename", "../../../test/data/frontend-service.yaml") cmd.Run(cmd, []string{}) t.Log(buf.String()) diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/replace/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/replace/BUILD index 97b04ebda72..5bd24eff8c8 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/replace/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/replace/BUILD @@ -28,9 +28,7 @@ go_library( go_test( name = "go_default_test", srcs = ["replace_test.go"], - data = [ - "//test/e2e/testing-manifests:all-srcs", - ], + data = ["//staging/src/k8s.io/kubectl/test/data"], embed = [":go_default_library"], deps = [ "//staging/src/k8s.io/api/core/v1:go_default_library", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/replace/replace_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/replace/replace_test.go index d90027e71c4..e2a2b8f8b09 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/replace/replace_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/replace/replace_test.go @@ -65,7 +65,7 @@ func TestReplaceObject(t *testing.T) { streams, _, buf, _ := genericclioptions.NewTestIOStreams() cmd := NewCmdReplace(tf, streams) - cmd.Flags().Set("filename", "../../../../test/e2e/testing-manifests/guestbook/legacy/redis-master-controller.yaml") + cmd.Flags().Set("filename", "../../../test/data/redis-master-controller.yaml") cmd.Flags().Set("output", "name") cmd.Run(cmd, []string{}) @@ -135,8 +135,8 @@ func TestReplaceMultipleObject(t *testing.T) { streams, _, buf, _ := genericclioptions.NewTestIOStreams() cmd := NewCmdReplace(tf, streams) - cmd.Flags().Set("filename", "../../../../test/e2e/testing-manifests/guestbook/legacy/redis-master-controller.yaml") - cmd.Flags().Set("filename", "../../../../test/e2e/testing-manifests/guestbook/frontend-service.yaml") + cmd.Flags().Set("filename", "../../../test/data/redis-master-controller.yaml") + cmd.Flags().Set("filename", "../../../test/data/frontend-service.yaml") cmd.Flags().Set("output", "name") cmd.Run(cmd, []string{}) @@ -192,7 +192,7 @@ func TestReplaceDirectory(t *testing.T) { streams, _, buf, _ := genericclioptions.NewTestIOStreams() cmd := NewCmdReplace(tf, streams) - cmd.Flags().Set("filename", "../../../../test/e2e/testing-manifests/guestbook/legacy") + cmd.Flags().Set("filename", "../../../test/data/replace/legacy") cmd.Flags().Set("namespace", "test") cmd.Flags().Set("output", "name") cmd.Run(cmd, []string{}) @@ -238,7 +238,7 @@ func TestForceReplaceObjectNotFound(t *testing.T) { streams, _, buf, _ := genericclioptions.NewTestIOStreams() cmd := NewCmdReplace(tf, streams) - cmd.Flags().Set("filename", "../../../../test/e2e/testing-manifests/guestbook/legacy/redis-master-controller.yaml") + cmd.Flags().Set("filename", "../../../test/data/redis-master-controller.yaml") cmd.Flags().Set("force", "true") cmd.Flags().Set("cascade", "false") cmd.Flags().Set("output", "name") diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/set/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/set/BUILD index ded20d03740..169cd35930d 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/set/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/set/BUILD @@ -57,10 +57,7 @@ go_test( "set_subject_test.go", "set_test.go", ], - data = [ - "//test/e2e/testing-manifests:all-srcs", - "//test/fixtures", - ], + data = ["//staging/src/k8s.io/kubectl/test/data"], embed = [":go_default_library"], deps = [ "//staging/src/k8s.io/api/apps/v1:go_default_library", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/set/set_env_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_env_test.go index 9726037e7db..0e6560cc801 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/set/set_env_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_env_test.go @@ -60,7 +60,7 @@ func TestSetEnvLocal(t *testing.T) { opts := NewEnvOptions(streams) opts.PrintFlags = genericclioptions.NewPrintFlags("").WithDefaultOutput(outputFormat).WithTypeSetter(scheme.Scheme) opts.FilenameOptions = resource.FilenameOptions{ - Filenames: []string{"../../../../test/e2e/testing-manifests/statefulset/cassandra/controller.yaml"}, + Filenames: []string{"../../../test/data/controller.yaml"}, } opts.Local = true @@ -97,7 +97,7 @@ func TestSetEnvLocalNamespace(t *testing.T) { opts := NewEnvOptions(streams) opts.PrintFlags = genericclioptions.NewPrintFlags("").WithDefaultOutput(outputFormat).WithTypeSetter(scheme.Scheme) opts.FilenameOptions = resource.FilenameOptions{ - Filenames: []string{"../../../../test/fixtures/pkg/kubectl/cmd/set/namespaced-resource.yaml"}, + Filenames: []string{"../../../test/data/set/namespaced-resource.yaml"}, } opts.Local = true @@ -134,7 +134,7 @@ func TestSetMultiResourcesEnvLocal(t *testing.T) { opts := NewEnvOptions(streams) opts.PrintFlags = genericclioptions.NewPrintFlags("").WithDefaultOutput(outputFormat).WithTypeSetter(scheme.Scheme) opts.FilenameOptions = resource.FilenameOptions{ - Filenames: []string{"../../../../test/fixtures/pkg/kubectl/cmd/set/multi-resource-yaml.yaml"}, + Filenames: []string{"../../../test/data/set/multi-resource-yaml.yaml"}, } opts.Local = true diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/set/set_image_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_image_test.go index 806da6dbfc4..6cd1ffb29bc 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/set/set_image_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_image_test.go @@ -67,7 +67,7 @@ func TestImageLocal(t *testing.T) { opts := SetImageOptions{ PrintFlags: genericclioptions.NewPrintFlags("").WithDefaultOutput(outputFormat).WithTypeSetter(scheme.Scheme), FilenameOptions: resource.FilenameOptions{ - Filenames: []string{"../../../../test/e2e/testing-manifests/statefulset/cassandra/controller.yaml"}}, + Filenames: []string{"../../../test/data/controller.yaml"}}, Local: true, IOStreams: streams, } @@ -179,7 +179,7 @@ func TestSetMultiResourcesImageLocal(t *testing.T) { opts := SetImageOptions{ PrintFlags: genericclioptions.NewPrintFlags("").WithDefaultOutput(outputFormat).WithTypeSetter(scheme.Scheme), FilenameOptions: resource.FilenameOptions{ - Filenames: []string{"../../../../test/fixtures/pkg/kubectl/cmd/set/multi-resource-yaml.yaml"}}, + Filenames: []string{"../../../test/data/set/multi-resource-yaml.yaml"}}, Local: true, IOStreams: streams, } diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/set/set_resources_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_resources_test.go index 69252043483..cc8202640ca 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/set/set_resources_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_resources_test.go @@ -66,7 +66,7 @@ func TestResourcesLocal(t *testing.T) { opts := SetResourcesOptions{ PrintFlags: genericclioptions.NewPrintFlags("").WithDefaultOutput(outputFormat).WithTypeSetter(scheme.Scheme), FilenameOptions: resource.FilenameOptions{ - Filenames: []string{"../../../../test/e2e/testing-manifests/statefulset/cassandra/controller.yaml"}}, + Filenames: []string{"../../../test/data/controller.yaml"}}, Local: true, Limits: "cpu=200m,memory=512Mi", Requests: "cpu=200m,memory=512Mi", @@ -114,7 +114,7 @@ func TestSetMultiResourcesLimitsLocal(t *testing.T) { opts := SetResourcesOptions{ PrintFlags: genericclioptions.NewPrintFlags("").WithDefaultOutput(outputFormat).WithTypeSetter(scheme.Scheme), FilenameOptions: resource.FilenameOptions{ - Filenames: []string{"../../../../test/fixtures/pkg/kubectl/cmd/set/multi-resource-yaml.yaml"}}, + Filenames: []string{"../../../test/data/set/multi-resource-yaml.yaml"}}, Local: true, Limits: "cpu=200m,memory=512Mi", Requests: "cpu=200m,memory=512Mi", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/set/set_serviceaccount_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_serviceaccount_test.go index 59a3c1ce6ba..aa7e3dd6366 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/set/set_serviceaccount_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_serviceaccount_test.go @@ -57,11 +57,11 @@ func TestSetServiceAccountLocal(t *testing.T) { yaml string apiGroup string }{ - {yaml: "../../../../test/fixtures/doc-yaml/user-guide/replication.yaml", apiGroup: ""}, - {yaml: "../../../../test/fixtures/doc-yaml/admin/daemon.yaml", apiGroup: "extensions"}, - {yaml: "../../../../test/fixtures/doc-yaml/user-guide/replicaset/redis-slave.yaml", apiGroup: "extensions"}, - {yaml: "../../../../test/fixtures/doc-yaml/user-guide/job.yaml", apiGroup: "batch"}, - {yaml: "../../../../test/fixtures/doc-yaml/user-guide/deployment.yaml", apiGroup: "extensions"}, + {yaml: "../../../test/data/set/replication.yaml", apiGroup: ""}, + {yaml: "../../../test/data/set/daemon.yaml", apiGroup: "extensions"}, + {yaml: "../../../test/data/set/redis-slave.yaml", apiGroup: "extensions"}, + {yaml: "../../../test/data/set/job.yaml", apiGroup: "batch"}, + {yaml: "../../../test/data/set/deployment.yaml", apiGroup: "extensions"}, } for i, input := range inputs { @@ -122,7 +122,7 @@ func TestSetServiceAccountMultiLocal(t *testing.T) { opts := SetServiceAccountOptions{ PrintFlags: genericclioptions.NewPrintFlags("").WithDefaultOutput(outputFormat).WithTypeSetter(scheme.Scheme), fileNameOptions: resource.FilenameOptions{ - Filenames: []string{"../../../../test/fixtures/pkg/kubectl/cmd/set/multi-resource-yaml.yaml"}}, + Filenames: []string{"../../../test/data/set/multi-resource-yaml.yaml"}}, local: true, IOStreams: streams, } diff --git a/staging/src/k8s.io/kubectl/pkg/util/openapi/BUILD b/staging/src/k8s.io/kubectl/pkg/util/openapi/BUILD index e01cd8c7fd3..235f4a4e316 100644 --- a/staging/src/k8s.io/kubectl/pkg/util/openapi/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/util/openapi/BUILD @@ -30,9 +30,7 @@ go_test( "openapi_suite_test.go", "openapi_test.go", ], - data = [ - "//staging/src/k8s.io/kubectl/test/data/openapi", - ], + data = ["//staging/src/k8s.io/kubectl/test/data"], embed = [":go_default_library"], deps = [ "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", diff --git a/staging/src/k8s.io/kubectl/pkg/util/openapi/validation/BUILD b/staging/src/k8s.io/kubectl/pkg/util/openapi/validation/BUILD index f731d73a611..f2ede189d79 100644 --- a/staging/src/k8s.io/kubectl/pkg/util/openapi/validation/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/util/openapi/validation/BUILD @@ -22,9 +22,7 @@ go_test( "validation_suite_test.go", "validation_test.go", ], - data = [ - "//staging/src/k8s.io/kubectl/test/data/openapi", - ], + data = ["//staging/src/k8s.io/kubectl/test/data"], embed = [":go_default_library"], deps = [ "//staging/src/k8s.io/apimachinery/pkg/util/errors:go_default_library", diff --git a/staging/src/k8s.io/kubectl/test/data/BUILD b/staging/src/k8s.io/kubectl/test/data/BUILD new file mode 100644 index 00000000000..ebcce3684ee --- /dev/null +++ b/staging/src/k8s.io/kubectl/test/data/BUILD @@ -0,0 +1,24 @@ +package(default_visibility = ["//visibility:public"]) + +filegroup( + name = "data", + srcs = glob([ + "**/*.yaml", + "**/*.yml", + "**/*.json", + ]), +) + +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/staging/src/k8s.io/kubectl/test/data/apply/cm.yaml b/staging/src/k8s.io/kubectl/test/data/apply/cm.yaml new file mode 100644 index 00000000000..ef3200581d9 --- /dev/null +++ b/staging/src/k8s.io/kubectl/test/data/apply/cm.yaml @@ -0,0 +1,16 @@ +apiVersion: v1 +items: +- kind: ConfigMap + apiVersion: v1 + metadata: + name: test0 + data: + key1: apple +- kind: ConfigMap + apiVersion: v1 + metadata: + name: test1 + data: + key2: apple +kind: ConfigMapList +metadata: {} diff --git a/staging/src/k8s.io/kubectl/test/data/apply/deploy-clientside.yaml b/staging/src/k8s.io/kubectl/test/data/apply/deploy-clientside.yaml new file mode 100644 index 00000000000..4261fb09b96 --- /dev/null +++ b/staging/src/k8s.io/kubectl/test/data/apply/deploy-clientside.yaml @@ -0,0 +1,21 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: nginx-deployment + labels: + name: nginx +spec: + selector: + matchLabels: + name: nginx + strategy: + type: Recreate + rollingUpdate: null + template: + metadata: + labels: + name: nginx + spec: + containers: + - name: nginx + image: nginx diff --git a/staging/src/k8s.io/kubectl/test/data/apply/deploy-serverside.yaml b/staging/src/k8s.io/kubectl/test/data/apply/deploy-serverside.yaml new file mode 100644 index 00000000000..664b87fd770 --- /dev/null +++ b/staging/src/k8s.io/kubectl/test/data/apply/deploy-serverside.yaml @@ -0,0 +1,46 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + annotations: + deployment.kubernetes.io/revision: "1" + kubectl.kubernetes.io/last-applied-configuration: '{"kind":"Deployment","apiVersion":"apps/v1","metadata":{"name":"nginx-deployment","creationTimestamp":null,"labels":{"name":"nginx"}},"spec":{"selector":{"matchLabels":{"name":"nginx"}},"template":{"metadata":{"creationTimestamp":null,"labels":{"name":"nginx"}},"spec":{"containers":[{"name":"nginx","image":"nginx","resources":{}}]}},"strategy":{}},"status":{}}' + creationTimestamp: "2016-10-24T22:15:06Z" + generation: 6 + labels: + name: nginx + name: nginx-deployment + namespace: test + resourceVersion: "355959" + selfLink: /apis/extensions/v1beta1/namespaces/test/deployments/nginx-deployment + uid: 51ac266e-9a37-11e6-8738-0800270c4edc +spec: + replicas: 1 + selector: + matchLabels: + name: nginx + strategy: + rollingUpdate: + maxSurge: 1 + maxUnavailable: 1 + type: RollingUpdate + template: + metadata: + creationTimestamp: null + labels: + name: nginx + spec: + containers: + - image: nginx + imagePullPolicy: Always + name: nginx + resources: {} + terminationMessagePath: /dev/termination-log + dnsPolicy: ClusterFirst + restartPolicy: Always + securityContext: {} + terminationGracePeriodSeconds: 30 +status: + availableReplicas: 1 + observedGeneration: 6 + replicas: 1 + updatedReplicas: 1 diff --git a/staging/src/k8s.io/kubectl/test/data/apply/patch.json b/staging/src/k8s.io/kubectl/test/data/apply/patch.json new file mode 100644 index 00000000000..99542fb7022 --- /dev/null +++ b/staging/src/k8s.io/kubectl/test/data/apply/patch.json @@ -0,0 +1 @@ +{"apiVersion":"v1","kind":"ReplicationController","metadata":{"labels":{"name":"test-rc"},"name":"test-rc","namespace":"test"},"spec":{"replicas":1,"template":{"metadata":{"labels":{"name":"test-rc"}},"spec":{"containers":[{"image":"nginx","name":"test-rc","ports":[{"containerPort":80}]}]}}}} diff --git a/staging/src/k8s.io/kubectl/test/data/apply/rc-args.yaml b/staging/src/k8s.io/kubectl/test/data/apply/rc-args.yaml new file mode 100644 index 00000000000..84688732835 --- /dev/null +++ b/staging/src/k8s.io/kubectl/test/data/apply/rc-args.yaml @@ -0,0 +1,20 @@ +apiVersion: v1 +kind: ReplicationController +metadata: + name: test-rc + labels: + name: test-rc +spec: + replicas: 1 + template: + metadata: + labels: + name: test-rc + spec: + containers: + - name: test-rc + image: nginx + args: + - -random_flag=%s@domain.com + ports: + - containerPort: 80 diff --git a/staging/src/k8s.io/kubectl/test/data/apply/rc-lastapplied-args.yaml b/staging/src/k8s.io/kubectl/test/data/apply/rc-lastapplied-args.yaml new file mode 100644 index 00000000000..16e1d7ba899 --- /dev/null +++ b/staging/src/k8s.io/kubectl/test/data/apply/rc-lastapplied-args.yaml @@ -0,0 +1,23 @@ +apiVersion: v1 +kind: ReplicationController +metadata: + annotations: + kubectl.kubernetes.io/last-applied-configuration: | + {"args":"-random_flag=%s@domain.com"} + name: test-rc + labels: + name: test-rc +spec: + replicas: 1 + template: + metadata: + labels: + name: test-rc + spec: + containers: + - name: test-rc + image: nginx + args: + - -random_flag=%s@domain.com + ports: + - containerPort: 80 diff --git a/staging/src/k8s.io/kubectl/test/data/apply/rc-lastapplied.yaml b/staging/src/k8s.io/kubectl/test/data/apply/rc-lastapplied.yaml new file mode 100644 index 00000000000..6db0a5c47a1 --- /dev/null +++ b/staging/src/k8s.io/kubectl/test/data/apply/rc-lastapplied.yaml @@ -0,0 +1,21 @@ +apiVersion: v1 +kind: ReplicationController +metadata: + annotations: + kubectl.kubernetes.io/last-applied-configuration: | + {"test":1234} + name: test-rc + labels: + name: test-rc +spec: + replicas: 1 + template: + metadata: + labels: + name: test-rc + spec: + containers: + - name: test-rc + image: nginx + ports: + - containerPort: 80 diff --git a/staging/src/k8s.io/kubectl/test/data/apply/rc-no-annotation.yaml b/staging/src/k8s.io/kubectl/test/data/apply/rc-no-annotation.yaml new file mode 100644 index 00000000000..2cf3b46a1f3 --- /dev/null +++ b/staging/src/k8s.io/kubectl/test/data/apply/rc-no-annotation.yaml @@ -0,0 +1,18 @@ +apiVersion: v1 +kind: ReplicationController +metadata: + name: no-annotation + labels: + name: no-annotation +spec: + replicas: 1 + template: + metadata: + labels: + name: no-annotation + spec: + containers: + - name: no-annotation + image: nginx + ports: + - containerPort: 80 diff --git a/staging/src/k8s.io/kubectl/test/data/apply/rc-noexist.yaml b/staging/src/k8s.io/kubectl/test/data/apply/rc-noexist.yaml new file mode 100644 index 00000000000..df1d372ea4a --- /dev/null +++ b/staging/src/k8s.io/kubectl/test/data/apply/rc-noexist.yaml @@ -0,0 +1,18 @@ +apiVersion: v1 +kind: ReplicationController +metadata: + name: no-exist + labels: + name: no-exist +spec: + replicas: 1 + template: + metadata: + labels: + name: no-exist + spec: + containers: + - name: no-exist + image: nginx + ports: + - containerPort: 80 diff --git a/staging/src/k8s.io/kubectl/test/data/apply/rc-service.yaml b/staging/src/k8s.io/kubectl/test/data/apply/rc-service.yaml new file mode 100644 index 00000000000..23cf17d99ac --- /dev/null +++ b/staging/src/k8s.io/kubectl/test/data/apply/rc-service.yaml @@ -0,0 +1,32 @@ +apiVersion: v1 +kind: List +items: + - apiVersion: v1 + kind: Service + metadata: + name: test-service + labels: + name: test-service + spec: + ports: + - port: 80 + selector: + name: test-rc + - apiVersion: v1 + kind: ReplicationController + metadata: + name: test-rc + labels: + name: test-rc + spec: + replicas: 1 + template: + metadata: + labels: + name: test-rc + spec: + containers: + - name: test-rc + image: nginx + ports: + - containerPort: 80 diff --git a/staging/src/k8s.io/kubectl/test/data/apply/rc.json b/staging/src/k8s.io/kubectl/test/data/apply/rc.json new file mode 100644 index 00000000000..ae6db775f3b --- /dev/null +++ b/staging/src/k8s.io/kubectl/test/data/apply/rc.json @@ -0,0 +1,33 @@ +{ + "apiVersion": "v1", + "kind": "ReplicationController", + "metadata": { + "name": "test-rc", + "labels": { + "name": "test-rc" + } + }, + "spec": { + "replicas": 1, + "template": { + "metadata": { + "labels": { + "name": "test-rc" + } + }, + "spec": { + "containers": [ + { + "name": "test-rc", + "image": "nginx", + "ports": [ + { + "containerPort": 80 + } + ] + } + ] + } + } + } +} diff --git a/staging/src/k8s.io/kubectl/test/data/apply/rc.yaml b/staging/src/k8s.io/kubectl/test/data/apply/rc.yaml new file mode 100644 index 00000000000..24dc67ceb52 --- /dev/null +++ b/staging/src/k8s.io/kubectl/test/data/apply/rc.yaml @@ -0,0 +1,19 @@ +apiVersion: v1 +kind: ReplicationController +metadata: + name: test-rc + namespace: test + labels: + name: test-rc +spec: + replicas: 1 + template: + metadata: + labels: + name: test-rc + spec: + containers: + - name: test-rc + image: nginx + ports: + - containerPort: 80 diff --git a/staging/src/k8s.io/kubectl/test/data/apply/service.yaml b/staging/src/k8s.io/kubectl/test/data/apply/service.yaml new file mode 100644 index 00000000000..073970761b8 --- /dev/null +++ b/staging/src/k8s.io/kubectl/test/data/apply/service.yaml @@ -0,0 +1,11 @@ +apiVersion: v1 +kind: Service +metadata: + name: test-service + labels: + name: test-service +spec: + ports: + - port: 80 + selector: + name: test-rc diff --git a/staging/src/k8s.io/kubectl/test/data/apply/testdir/rc.yaml b/staging/src/k8s.io/kubectl/test/data/apply/testdir/rc.yaml new file mode 100644 index 00000000000..1c1bf15be7f --- /dev/null +++ b/staging/src/k8s.io/kubectl/test/data/apply/testdir/rc.yaml @@ -0,0 +1,18 @@ +apiVersion: v1 +kind: ReplicationController +metadata: + name: test-rc + labels: + name: test-rc +spec: + replicas: 1 + template: + metadata: + labels: + name: test-rc + spec: + containers: + - name: test-rc + image: nginx + ports: + - containerPort: 80 diff --git a/staging/src/k8s.io/kubectl/test/data/apply/testdir/rc1.yaml b/staging/src/k8s.io/kubectl/test/data/apply/testdir/rc1.yaml new file mode 100644 index 00000000000..1c1bf15be7f --- /dev/null +++ b/staging/src/k8s.io/kubectl/test/data/apply/testdir/rc1.yaml @@ -0,0 +1,18 @@ +apiVersion: v1 +kind: ReplicationController +metadata: + name: test-rc + labels: + name: test-rc +spec: + replicas: 1 + template: + metadata: + labels: + name: test-rc + spec: + containers: + - name: test-rc + image: nginx + ports: + - containerPort: 80 diff --git a/staging/src/k8s.io/kubectl/test/data/apply/widget-clientside.yaml b/staging/src/k8s.io/kubectl/test/data/apply/widget-clientside.yaml new file mode 100644 index 00000000000..4688160fe22 --- /dev/null +++ b/staging/src/k8s.io/kubectl/test/data/apply/widget-clientside.yaml @@ -0,0 +1,8 @@ +apiVersion: "unit-test.test.com/v1" +kind: Widget +metadata: + name: "widget" + namespace: "test" + labels: + foo: bar +key: "value" \ No newline at end of file diff --git a/staging/src/k8s.io/kubectl/test/data/apply/widget-serverside.yaml b/staging/src/k8s.io/kubectl/test/data/apply/widget-serverside.yaml new file mode 100644 index 00000000000..9fab75a8421 --- /dev/null +++ b/staging/src/k8s.io/kubectl/test/data/apply/widget-serverside.yaml @@ -0,0 +1,10 @@ +apiVersion: "unit-test.test.com/v1" +kind: Widget +metadata: + name: "widget" + namespace: "test" + annotations: + "kubectl.kubernetes.io/last-applied-configuration": "{\"apiVersion\":\"unit-test.test.com/v1\",\"key\":\"value\",\"kind\":\"Widget\",\"metadata\":{\"annotations\":{},\"labels\":{\"foo\":\"bar\"},\"name\":\"widget\",\"namespace\":\"test\"}}\n" + labels: + foo: bar +key: "value" \ No newline at end of file diff --git a/staging/src/k8s.io/kubectl/test/data/controller.yaml b/staging/src/k8s.io/kubectl/test/data/controller.yaml new file mode 100644 index 00000000000..f11aeb3ce66 --- /dev/null +++ b/staging/src/k8s.io/kubectl/test/data/controller.yaml @@ -0,0 +1,58 @@ +apiVersion: v1 +kind: ReplicationController +metadata: + name: cassandra + # The labels will be applied automatically + # from the labels in the pod template, if not set + # labels: + # app: cassandra +spec: + replicas: 2 + # The selector will be applied automatically + # from the labels in the pod template, if not set. + # selector: + # app: cassandra + template: + metadata: + labels: + app: cassandra + spec: + containers: + - command: + - /run.sh + resources: + limits: + cpu: 0.5 + env: + - name: MAX_HEAP_SIZE + value: 512M + - name: HEAP_NEWSIZE + value: 100M + - name: CASSANDRA_SEED_PROVIDER + value: "io.k8s.cassandra.KubernetesSeedProvider" + - name: POD_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: POD_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + image: gcr.io/google-samples/cassandra:v13 + name: cassandra + ports: + - containerPort: 7000 + name: intra-node + - containerPort: 7001 + name: tls-intra-node + - containerPort: 7199 + name: jmx + - containerPort: 9042 + name: cql + volumeMounts: + - mountPath: /cassandra_data + name: data + volumes: + - name: data + emptyDir: {} + diff --git a/staging/src/k8s.io/kubectl/test/data/frontend-service.yaml b/staging/src/k8s.io/kubectl/test/data/frontend-service.yaml new file mode 100644 index 00000000000..ee50fd847cf --- /dev/null +++ b/staging/src/k8s.io/kubectl/test/data/frontend-service.yaml @@ -0,0 +1,16 @@ +apiVersion: v1 +kind: Service +metadata: + name: frontend + labels: + app: guestbook + tier: frontend +spec: + # if your cluster supports it, uncomment the following to automatically create + # an external load-balanced IP for the frontend service. + # type: LoadBalancer + ports: + - port: 80 + selector: + app: guestbook + tier: frontend diff --git a/staging/src/k8s.io/kubectl/test/data/redis-master-controller.yaml b/staging/src/k8s.io/kubectl/test/data/redis-master-controller.yaml new file mode 100644 index 00000000000..60a1a6fabaa --- /dev/null +++ b/staging/src/k8s.io/kubectl/test/data/redis-master-controller.yaml @@ -0,0 +1,26 @@ +apiVersion: v1 +kind: ReplicationController +metadata: + name: redis-master + labels: + app: redis + role: master + tier: backend +spec: + replicas: 1 + template: + metadata: + labels: + app: redis + role: master + tier: backend + spec: + containers: + - name: master + image: docker.io/library/redis:5.0.5-alpine + resources: + requests: + cpu: 100m + memory: 100Mi + ports: + - containerPort: 6379 diff --git a/staging/src/k8s.io/kubectl/test/data/redis-master-service.yaml b/staging/src/k8s.io/kubectl/test/data/redis-master-service.yaml new file mode 100644 index 00000000000..a484014f1fe --- /dev/null +++ b/staging/src/k8s.io/kubectl/test/data/redis-master-service.yaml @@ -0,0 +1,16 @@ +apiVersion: v1 +kind: Service +metadata: + name: redis-master + labels: + app: redis + role: master + tier: backend +spec: + ports: + - port: 6379 + targetPort: 6379 + selector: + app: redis + role: master + tier: backend diff --git a/staging/src/k8s.io/kubectl/test/data/replace/legacy/frontend-controller.yaml b/staging/src/k8s.io/kubectl/test/data/replace/legacy/frontend-controller.yaml new file mode 100644 index 00000000000..f2f7f1d24dc --- /dev/null +++ b/staging/src/k8s.io/kubectl/test/data/replace/legacy/frontend-controller.yaml @@ -0,0 +1,29 @@ +apiVersion: v1 +kind: ReplicationController +metadata: + name: frontend +spec: + replicas: 3 + template: + metadata: + labels: + app: guestbook + tier: frontend + spec: + containers: + - name: php-redis + image: gcr.io/google_samples/gb-frontend:v4 + resources: + requests: + cpu: 100m + memory: 100Mi + env: + - name: GET_HOSTS_FROM + value: dns + # If your cluster config does not include a dns service, then to + # instead access environment variables to find service host + # info, comment out the 'value: dns' line above, and uncomment the + # line below: + # value: env + ports: + - containerPort: 80 diff --git a/staging/src/k8s.io/kubectl/test/data/replace/legacy/redis-master-controller.yaml b/staging/src/k8s.io/kubectl/test/data/replace/legacy/redis-master-controller.yaml new file mode 100644 index 00000000000..60a1a6fabaa --- /dev/null +++ b/staging/src/k8s.io/kubectl/test/data/replace/legacy/redis-master-controller.yaml @@ -0,0 +1,26 @@ +apiVersion: v1 +kind: ReplicationController +metadata: + name: redis-master + labels: + app: redis + role: master + tier: backend +spec: + replicas: 1 + template: + metadata: + labels: + app: redis + role: master + tier: backend + spec: + containers: + - name: master + image: docker.io/library/redis:5.0.5-alpine + resources: + requests: + cpu: 100m + memory: 100Mi + ports: + - containerPort: 6379 diff --git a/staging/src/k8s.io/kubectl/test/data/replace/legacy/redis-slave-controller.yaml b/staging/src/k8s.io/kubectl/test/data/replace/legacy/redis-slave-controller.yaml new file mode 100644 index 00000000000..3376794b345 --- /dev/null +++ b/staging/src/k8s.io/kubectl/test/data/replace/legacy/redis-slave-controller.yaml @@ -0,0 +1,37 @@ +apiVersion: v1 +kind: ReplicationController +metadata: + name: redis-slave + labels: + app: redis + role: slave + tier: backend +spec: + replicas: 2 + template: + metadata: + labels: + app: redis + role: slave + tier: backend + spec: + containers: + - name: slave + image: docker.io/library/redis:5.0.5-alpine + # We are only implementing the dns option of: + # https://github.com/kubernetes/examples/blob/97c7ed0eb6555a4b667d2877f965d392e00abc45/guestbook/redis-slave/run.sh + command: [ "redis-server", "--slaveof", "redis-master", "6379" ] + resources: + requests: + cpu: 100m + memory: 100Mi + env: + - name: GET_HOSTS_FROM + value: dns + # If your cluster config does not include a dns service, then to + # instead access an environment variable to find the master + # service's host, comment out the 'value: dns' line above, and + # uncomment the line below: + # value: env + ports: + - containerPort: 6379 diff --git a/staging/src/k8s.io/kubectl/test/data/set/daemon.yaml b/staging/src/k8s.io/kubectl/test/data/set/daemon.yaml new file mode 100644 index 00000000000..46ceb752abd --- /dev/null +++ b/staging/src/k8s.io/kubectl/test/data/set/daemon.yaml @@ -0,0 +1,21 @@ +apiVersion: apps/v1 +kind: DaemonSet +metadata: + name: prometheus-node-exporter +spec: + selector: + matchLabels: + daemon: prom-node-exp + template: + metadata: + name: prometheus-node-exporter + labels: + daemon: prom-node-exp + spec: + containers: + - name: c + image: prom/prometheus + ports: + - containerPort: 9090 + hostPort: 9090 + name: serverport diff --git a/staging/src/k8s.io/kubectl/test/data/set/deployment.yaml b/staging/src/k8s.io/kubectl/test/data/set/deployment.yaml new file mode 100644 index 00000000000..a7b66993d15 --- /dev/null +++ b/staging/src/k8s.io/kubectl/test/data/set/deployment.yaml @@ -0,0 +1,21 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: nginx-deployment + labels: + name: nginx-deployment +spec: + replicas: 3 + selector: + matchLabels: + name: nginx + template: + metadata: + labels: + name: nginx + spec: + containers: + - name: nginx + image: nginx + ports: + - containerPort: 80 diff --git a/staging/src/k8s.io/kubectl/test/data/set/job.yaml b/staging/src/k8s.io/kubectl/test/data/set/job.yaml new file mode 100644 index 00000000000..ece4512a8ac --- /dev/null +++ b/staging/src/k8s.io/kubectl/test/data/set/job.yaml @@ -0,0 +1,15 @@ +apiVersion: batch/v1 +kind: Job +metadata: + name: pi +spec: + template: + metadata: + name: pi + spec: + containers: + - name: pi + image: perl + command: ["perl", "-Mbignum=bpi", "-wle", "print bpi(2000)"] + restartPolicy: Never + diff --git a/staging/src/k8s.io/kubectl/test/data/set/multi-resource-yaml.yaml b/staging/src/k8s.io/kubectl/test/data/set/multi-resource-yaml.yaml new file mode 100644 index 00000000000..6a2eed872a9 --- /dev/null +++ b/staging/src/k8s.io/kubectl/test/data/set/multi-resource-yaml.yaml @@ -0,0 +1,33 @@ +apiVersion: v1 +kind: ReplicationController +metadata: + name: first-rc +spec: + replicas: 1 + selector: + app: mock + template: + metadata: + labels: + app: mock + spec: + containers: + - name: mock-container + image: k8s.gcr.io/pause:3.1 +--- +apiVersion: v1 +kind: ReplicationController +metadata: + name: second-rc +spec: + replicas: 1 + selector: + app: mock + template: + metadata: + labels: + app: mock + spec: + containers: + - name: mock-container + image: k8s.gcr.io/pause:3.1 diff --git a/staging/src/k8s.io/kubectl/test/data/set/namespaced-resource.yaml b/staging/src/k8s.io/kubectl/test/data/set/namespaced-resource.yaml new file mode 100644 index 00000000000..71d9b24bae1 --- /dev/null +++ b/staging/src/k8s.io/kubectl/test/data/set/namespaced-resource.yaml @@ -0,0 +1,17 @@ +apiVersion: v1 +kind: ReplicationController +metadata: + name: namespaced-rc + namespace: existing-ns +spec: + replicas: 1 + selector: + app: mock + template: + metadata: + labels: + app: mock + spec: + containers: + - name: mock-container + image: k8s.gcr.io/pause:3.1 diff --git a/staging/src/k8s.io/kubectl/test/data/set/redis-slave.yaml b/staging/src/k8s.io/kubectl/test/data/set/redis-slave.yaml new file mode 100644 index 00000000000..d237c4d4290 --- /dev/null +++ b/staging/src/k8s.io/kubectl/test/data/set/redis-slave.yaml @@ -0,0 +1,44 @@ +apiVersion: apps/v1 +kind: ReplicaSet +metadata: + name: redis-slave + labels: + app: redis + role: slave + tier: backend +spec: + # this replicas value is default + # modify it according to your case + replicas: 2 + selector: + matchLabels: + app: redis + role: slave + tier: backend + template: + metadata: + labels: + app: redis + role: slave + tier: backend + spec: + containers: + - name: slave + image: docker.io/library/redis:5.0.5-alpine + # We are only implementing the dns option of: + # https://github.com/kubernetes/examples/blob/97c7ed0eb6555a4b667d2877f965d392e00abc45/guestbook/redis-slave/run.sh + command: [ "redis-server", "--slaveof", "redis-master", "6379" ] + resources: + requests: + cpu: 100m + memory: 100Mi + env: + - name: GET_HOSTS_FROM + value: dns + # If your cluster config does not include a dns service, then to + # instead access an environment variable to find the master + # service's host, comment out the 'value: dns' line above, and + # uncomment the line below. + # value: env + ports: + - containerPort: 6379 diff --git a/staging/src/k8s.io/kubectl/test/data/set/replication.yaml b/staging/src/k8s.io/kubectl/test/data/set/replication.yaml new file mode 100644 index 00000000000..6eff0b9b576 --- /dev/null +++ b/staging/src/k8s.io/kubectl/test/data/set/replication.yaml @@ -0,0 +1,19 @@ +apiVersion: v1 +kind: ReplicationController +metadata: + name: nginx +spec: + replicas: 3 + selector: + app: nginx + template: + metadata: + name: nginx + labels: + app: nginx + spec: + containers: + - name: nginx + image: nginx + ports: + - containerPort: 80 From 5fcf9bd79ccf676de8dcc6f726ef24a7d1d5cf01 Mon Sep 17 00:00:00 2001 From: Sean Sullivan Date: Thu, 1 Aug 2019 15:25:56 -0700 Subject: [PATCH 6/7] Update vendor modules to reflect code move to staging --- go.mod | 6 ----- pkg/kubectl/cmd/BUILD | 1 + staging/src/k8s.io/kubectl/go.mod | 13 ++++++++++ staging/src/k8s.io/kubectl/go.sum | 23 +++++++++++++++++ vendor/modules.txt | 41 ++++++++++++++++++++++++++++++- 5 files changed, 77 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index 014aa370217..261f318c073 100644 --- a/go.mod +++ b/go.mod @@ -44,7 +44,6 @@ require ( github.com/cpuguy83/go-md2man v1.0.10 github.com/cyphar/filepath-securejoin v0.2.2 // indirect github.com/davecgh/go-spew v1.1.1 - github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd github.com/docker/distribution v2.7.1+incompatible github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0 github.com/docker/go-connections v0.3.0 @@ -66,9 +65,6 @@ require ( github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903 github.com/golang/mock v1.2.0 github.com/golang/protobuf v1.2.0 - github.com/golangplus/bytes v0.0.0-20160111154220-45c989fe5450 // indirect - github.com/golangplus/fmt v0.0.0-20150411045040-2a5d6d7d2995 // indirect - github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e // indirect github.com/google/cadvisor v0.33.2-0.20190411163913-9db8c7dee20a github.com/google/certificate-transparency-go v1.0.21 // indirect github.com/google/go-cmp v0.3.0 @@ -82,7 +78,6 @@ require ( github.com/heketi/rest v0.0.0-20180404230133-aa6a65207413 // indirect github.com/heketi/tests v0.0.0-20151005000721-f3775cbcefd6 // indirect github.com/heketi/utils v0.0.0-20170317161834-435bc5bdfa64 // indirect - github.com/jonboulle/clockwork v0.1.0 github.com/json-iterator/go v1.1.6 github.com/karrick/godirwalk v1.7.5 // indirect github.com/libopenstorage/openstorage v1.0.0 @@ -176,7 +171,6 @@ require ( k8s.io/repo-infra v0.0.0-20181204233714-00fe14e3d1a3 k8s.io/sample-apiserver v0.0.0 k8s.io/utils v0.0.0-20190607212802-c55fbcfc754a - sigs.k8s.io/kustomize v2.0.3+incompatible sigs.k8s.io/yaml v1.1.0 vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc ) diff --git a/pkg/kubectl/cmd/BUILD b/pkg/kubectl/cmd/BUILD index e1eb610d12a..853b55cf1e9 100644 --- a/pkg/kubectl/cmd/BUILD +++ b/pkg/kubectl/cmd/BUILD @@ -82,6 +82,7 @@ filegroup( "//pkg/kubectl/cmd/auth:all-srcs", "//pkg/kubectl/cmd/convert:all-srcs", "//pkg/kubectl/cmd/get:all-srcs", + "//pkg/kubectl/cmd/plugin/testdata:all-srcs", ], tags = ["automanaged"], visibility = ["//visibility:public"], diff --git a/staging/src/k8s.io/kubectl/go.mod b/staging/src/k8s.io/kubectl/go.mod index b0b22b60b7c..54c1d9453a2 100644 --- a/staging/src/k8s.io/kubectl/go.mod +++ b/staging/src/k8s.io/kubectl/go.mod @@ -8,20 +8,30 @@ require ( github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5 + github.com/davecgh/go-spew v1.1.1 + github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd + github.com/docker/distribution v2.7.1+incompatible github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0 github.com/evanphx/json-patch v4.2.0+incompatible github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d github.com/fatih/camelcase v1.0.0 github.com/go-openapi/spec v0.19.2 + github.com/golangplus/bytes v0.0.0-20160111154220-45c989fe5450 // indirect + github.com/golangplus/fmt v0.0.0-20150411045040-2a5d6d7d2995 // indirect + github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e // indirect github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d + github.com/jonboulle/clockwork v0.1.0 github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de + github.com/lithammer/dedent v1.1.0 github.com/mitchellh/go-wordwrap v1.0.0 github.com/onsi/ginkgo v1.8.0 github.com/onsi/gomega v1.5.0 + github.com/opencontainers/go-digest v1.0.0-rc1 // indirect github.com/russross/blackfriday v1.5.2 github.com/sirupsen/logrus v1.4.2 // indirect github.com/spf13/cobra v0.0.4 github.com/spf13/pflag v1.0.3 + github.com/stretchr/testify v1.3.0 golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f gopkg.in/yaml.v2 v2.2.2 gotest.tools v2.2.0+incompatible // indirect @@ -29,10 +39,12 @@ require ( k8s.io/apimachinery v0.0.0 k8s.io/cli-runtime v0.0.0 k8s.io/client-go v0.0.0 + k8s.io/component-base v0.0.0 k8s.io/klog v0.3.1 k8s.io/kube-openapi v0.0.0-20190709113604-33be087ad058 k8s.io/metrics v0.0.0 k8s.io/utils v0.0.0-20190607212802-c55fbcfc754a + sigs.k8s.io/kustomize v2.0.3+incompatible sigs.k8s.io/yaml v1.1.0 ) @@ -48,6 +60,7 @@ replace ( k8s.io/cli-runtime => ../cli-runtime k8s.io/client-go => ../client-go k8s.io/code-generator => ../code-generator + k8s.io/component-base => ../component-base k8s.io/kubectl => ../kubectl k8s.io/metrics => ../metrics ) diff --git a/staging/src/k8s.io/kubectl/go.sum b/staging/src/k8s.io/kubectl/go.sum index a726a44c4c8..4ff4c6650ff 100644 --- a/staging/src/k8s.io/kubectl/go.sum +++ b/staging/src/k8s.io/kubectl/go.sum @@ -14,6 +14,8 @@ github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdko github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M= github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= +github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= +github.com/blang/semver v3.5.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5 h1:7aWHqerlJ41y6FOsEUvknqgXnGmJyJSbjhAWq5pO4F8= github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5/go.mod h1:/iP1qXHoty45bqomnu2LM+VVyAEdWN+vtSHGlQgyxbw= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= @@ -24,7 +26,11 @@ github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd h1:uVsMphB1eRx7xB1njzL3fuMdWRN8HtVzoUOItHMwv5c= +github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd/go.mod h1:dv4zxwHi5C/8AeI+4gX4dCWOIvNi7I6JCSX0HvlKPgE= github.com/dgrijalva/jwt-go v0.0.0-20160705203006-01aeca54ebda/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= +github.com/docker/distribution v2.7.1+incompatible h1:a5mlkVzth6W5A4fOsS3D2EO5BUmsJpcB+cRlLU7cSug= +github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0 h1:w3NnFcKR5241cfmQU5ZZAsf0xcpId6mWOupTvJlUX2U= github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96 h1:cenwrSVm+Z7QLSV/BsnenAOcDXdX4cMv4wP0B/5QbPg= @@ -64,6 +70,12 @@ github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4er github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golangplus/bytes v0.0.0-20160111154220-45c989fe5450 h1:7xqw01UYS+KCI25bMrPxwNYkSns2Db1ziQPpVq99FpE= +github.com/golangplus/bytes v0.0.0-20160111154220-45c989fe5450/go.mod h1:Bk6SMAONeMXrxql8uvOKuAZSu8aM5RUGv+1C6IJaEho= +github.com/golangplus/fmt v0.0.0-20150411045040-2a5d6d7d2995 h1:f5gsjBiF9tRRVomCvrkGMMWI8W1f2OBFar2c5oakAP0= +github.com/golangplus/fmt v0.0.0-20150411045040-2a5d6d7d2995/go.mod h1:lJgMEyOkYFkPcDKwRXegd+iM6E7matEszMG5HhwytU8= +github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e h1:KhcknUwkWHKZPbFy2P7jH5LKJ3La+0ZeknkkmrSgqb0= +github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e/go.mod h1:0AA//k/eakGydO4jKRoRL2j92ZKSzTgj9tclaCrvXHk= github.com/google/btree v0.0.0-20160524151835-7d79101e329e h1:JHB7F/4TJCrYBW8+GZO8VkWDj1jxcWuCl6uxKODiyi4= github.com/google/btree v0.0.0-20160524151835-7d79101e329e/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY= @@ -87,6 +99,8 @@ github.com/imdario/mergo v0.3.5 h1:JboBksRwiiAJWvIYJVo46AfV+IAIKZpfrSzVKj42R4Q= github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/jonboulle/clockwork v0.1.0 h1:VKV+ZcuP6l3yW9doeqz6ziZGgcynBVQO+obU0+0hcPo= +github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.6 h1:MrUvLMLTMxbqFJ9kzlvat/rYZqZnW3u4wkLzWTaFwKs= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= @@ -102,10 +116,13 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhnIaL+V+BEER86oLrvS+kWobKpbJuye0= github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE= +github.com/lithammer/dedent v1.1.0 h1:VNzHMVCBNG1j0fh3OrsFRkVUwStdDArbgBWoPAffktY= +github.com/lithammer/dedent v1.1.0/go.mod h1:jrXYCQtgg0nJiN+StA2KgR7w6CiQNv9Fd/Z9BP0jIOc= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63 h1:nTT4s92Dgz2HlrB2NaMgvlfqHH39OgMhA7z3PK7PGD4= github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-wordwrap v1.0.0 h1:6GlHJ/LTGMrIJbwgdqdl2eEH8o+Exx/0m8ir9Gns0u4= github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= @@ -125,6 +142,8 @@ github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+W github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.5.0 h1:izbySO9zDPmjJ8rDjLvkA2zJHIo+HkYXHnf7eN7SSyo= github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/opencontainers/go-digest v1.0.0-rc1 h1:WzifXhOVOEOuFYOJAW6aQqW0TooG2iki3E3Ii+WN7gQ= +github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI= github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= @@ -133,6 +152,10 @@ github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM= +github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= +github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod h1:uYEyJGbgTkfkS4+E/PavXkNJcbFIpEtjt2B0KDQ5+9M= github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= diff --git a/vendor/modules.txt b/vendor/modules.txt index eac0da21902..7a9063bc906 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1169,7 +1169,6 @@ k8s.io/apimachinery/pkg/util/remotecommand k8s.io/apimachinery/pkg/util/runtime k8s.io/apimachinery/pkg/util/sets k8s.io/apimachinery/pkg/util/strategicpatch -k8s.io/apimachinery/pkg/util/strategicpatch/testing k8s.io/apimachinery/pkg/util/uuid k8s.io/apimachinery/pkg/util/validation k8s.io/apimachinery/pkg/util/validation/field @@ -1650,10 +1649,50 @@ k8s.io/kube-proxy/config/v1alpha1 k8s.io/kube-scheduler/config/v1alpha1 # k8s.io/kubectl v0.0.0 => ./staging/src/k8s.io/kubectl k8s.io/kubectl/pkg/apps +k8s.io/kubectl/pkg/cmd +k8s.io/kubectl/pkg/cmd/annotate +k8s.io/kubectl/pkg/cmd/apiresources +k8s.io/kubectl/pkg/cmd/apply +k8s.io/kubectl/pkg/cmd/attach +k8s.io/kubectl/pkg/cmd/autoscale +k8s.io/kubectl/pkg/cmd/certificates +k8s.io/kubectl/pkg/cmd/clusterinfo +k8s.io/kubectl/pkg/cmd/completion +k8s.io/kubectl/pkg/cmd/config +k8s.io/kubectl/pkg/cmd/cp +k8s.io/kubectl/pkg/cmd/create +k8s.io/kubectl/pkg/cmd/delete +k8s.io/kubectl/pkg/cmd/describe +k8s.io/kubectl/pkg/cmd/diff +k8s.io/kubectl/pkg/cmd/drain +k8s.io/kubectl/pkg/cmd/edit +k8s.io/kubectl/pkg/cmd/exec +k8s.io/kubectl/pkg/cmd/explain +k8s.io/kubectl/pkg/cmd/expose +k8s.io/kubectl/pkg/cmd/kustomize +k8s.io/kubectl/pkg/cmd/label +k8s.io/kubectl/pkg/cmd/logs +k8s.io/kubectl/pkg/cmd/options +k8s.io/kubectl/pkg/cmd/patch +k8s.io/kubectl/pkg/cmd/plugin +k8s.io/kubectl/pkg/cmd/portforward +k8s.io/kubectl/pkg/cmd/proxy +k8s.io/kubectl/pkg/cmd/replace +k8s.io/kubectl/pkg/cmd/rollingupdate +k8s.io/kubectl/pkg/cmd/rollout +k8s.io/kubectl/pkg/cmd/run +k8s.io/kubectl/pkg/cmd/scale +k8s.io/kubectl/pkg/cmd/set +k8s.io/kubectl/pkg/cmd/set/env +k8s.io/kubectl/pkg/cmd/taint +k8s.io/kubectl/pkg/cmd/testing +k8s.io/kubectl/pkg/cmd/top k8s.io/kubectl/pkg/cmd/util k8s.io/kubectl/pkg/cmd/util/editor k8s.io/kubectl/pkg/cmd/util/editor/crlf k8s.io/kubectl/pkg/cmd/util/sanity +k8s.io/kubectl/pkg/cmd/version +k8s.io/kubectl/pkg/cmd/wait k8s.io/kubectl/pkg/describe k8s.io/kubectl/pkg/describe/versioned k8s.io/kubectl/pkg/drain From 4e64aaf27e66218571542446498cc47db5df95ff Mon Sep 17 00:00:00 2001 From: Sean Sullivan Date: Thu, 1 Aug 2019 15:38:06 -0700 Subject: [PATCH 7/7] Update .golint_failures to reflect code move to staging --- hack/.golint_failures | 59 ++++++++++--------- staging/publishing/import-restrictions.yaml | 1 + staging/publishing/rules.yaml | 4 ++ .../kubectl/pkg/cmd/delete/delete_test.go | 4 +- 4 files changed, 37 insertions(+), 31 deletions(-) diff --git a/hack/.golint_failures b/hack/.golint_failures index ea895ebf5f6..c88eb8933f1 100644 --- a/hack/.golint_failures +++ b/hack/.golint_failures @@ -107,37 +107,8 @@ pkg/credentialprovider/gcp pkg/features pkg/kubeapiserver pkg/kubeapiserver/options -pkg/kubectl/cmd/annotate -pkg/kubectl/cmd/apply -pkg/kubectl/cmd/attach -pkg/kubectl/cmd/autoscale -pkg/kubectl/cmd/certificates -pkg/kubectl/cmd/clusterinfo pkg/kubectl/cmd/convert -pkg/kubectl/cmd/create -pkg/kubectl/cmd/delete -pkg/kubectl/cmd/describe -pkg/kubectl/cmd/diff -pkg/kubectl/cmd/drain -pkg/kubectl/cmd/exec -pkg/kubectl/cmd/explain -pkg/kubectl/cmd/expose pkg/kubectl/cmd/get -pkg/kubectl/cmd/label -pkg/kubectl/cmd/logs -pkg/kubectl/cmd/patch -pkg/kubectl/cmd/plugin -pkg/kubectl/cmd/portforward -pkg/kubectl/cmd/replace -pkg/kubectl/cmd/rollingupdate -pkg/kubectl/cmd/rollout -pkg/kubectl/cmd/run -pkg/kubectl/cmd/scale -pkg/kubectl/cmd/set -pkg/kubectl/cmd/taint -pkg/kubectl/cmd/testing -pkg/kubectl/cmd/top -pkg/kubectl/cmd/wait pkg/kubelet pkg/kubelet/apis/config pkg/kubelet/apis/config/v1beta1 @@ -530,7 +501,37 @@ staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1 staging/src/k8s.io/kube-aggregator/pkg/apiserver staging/src/k8s.io/kube-aggregator/pkg/controllers/autoregister staging/src/k8s.io/kube-proxy/config/v1alpha1 +staging/src/k8s.io/kubectl/pkg/cmd +staging/src/k8s.io/kubectl/pkg/cmd/annotate +staging/src/k8s.io/kubectl/pkg/cmd/apply +staging/src/k8s.io/kubectl/pkg/cmd/attach +staging/src/k8s.io/kubectl/pkg/cmd/autoscale +staging/src/k8s.io/kubectl/pkg/cmd/certificates +staging/src/k8s.io/kubectl/pkg/cmd/clusterinfo +staging/src/k8s.io/kubectl/pkg/cmd/create +staging/src/k8s.io/kubectl/pkg/cmd/delete +staging/src/k8s.io/kubectl/pkg/cmd/describe +staging/src/k8s.io/kubectl/pkg/cmd/diff +staging/src/k8s.io/kubectl/pkg/cmd/drain +staging/src/k8s.io/kubectl/pkg/cmd/exec +staging/src/k8s.io/kubectl/pkg/cmd/explain +staging/src/k8s.io/kubectl/pkg/cmd/expose +staging/src/k8s.io/kubectl/pkg/cmd/label +staging/src/k8s.io/kubectl/pkg/cmd/logs +staging/src/k8s.io/kubectl/pkg/cmd/patch +staging/src/k8s.io/kubectl/pkg/cmd/plugin +staging/src/k8s.io/kubectl/pkg/cmd/portforward +staging/src/k8s.io/kubectl/pkg/cmd/replace +staging/src/k8s.io/kubectl/pkg/cmd/rollingupdate +staging/src/k8s.io/kubectl/pkg/cmd/rollout +staging/src/k8s.io/kubectl/pkg/cmd/run +staging/src/k8s.io/kubectl/pkg/cmd/scale +staging/src/k8s.io/kubectl/pkg/cmd/set +staging/src/k8s.io/kubectl/pkg/cmd/taint +staging/src/k8s.io/kubectl/pkg/cmd/testing +staging/src/k8s.io/kubectl/pkg/cmd/top staging/src/k8s.io/kubectl/pkg/cmd/util +staging/src/k8s.io/kubectl/pkg/cmd/wait staging/src/k8s.io/kubectl/pkg/describe/versioned staging/src/k8s.io/kubectl/pkg/generate staging/src/k8s.io/kubectl/pkg/generate/versioned diff --git a/staging/publishing/import-restrictions.yaml b/staging/publishing/import-restrictions.yaml index 23745917817..4a90a20ecbf 100644 --- a/staging/publishing/import-restrictions.yaml +++ b/staging/publishing/import-restrictions.yaml @@ -130,6 +130,7 @@ - k8s.io/apimachinery - k8s.io/cli-runtime - k8s.io/client-go + - k8s.io/component-base - k8s.io/kubectl - k8s.io/kube-openapi - k8s.io/metrics diff --git a/staging/publishing/rules.yaml b/staging/publishing/rules.yaml index aef49d3a94f..d34f598afaa 100644 --- a/staging/publishing/rules.yaml +++ b/staging/publishing/rules.yaml @@ -628,6 +628,8 @@ rules: branch: master - repository: code-generator branch: master + - repository: component-base + branch: master - repository: metrics branch: master - source: @@ -643,6 +645,8 @@ rules: - repository: client-go branch: release-12.0 - repository: code-generator + branch: release-1.15 + - repository: component-base branch: release-1.15 - repository: metrics branch: release-1.15 diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/delete/delete_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/delete/delete_test.go index 79d996c97b2..f587060bb45 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/delete/delete_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/delete/delete_test.go @@ -38,9 +38,9 @@ import ( func fakecmd() *cobra.Command { cmd := &cobra.Command{ - Use: "delete ([-f FILENAME] | TYPE [(NAME | -l label | --all)])", + Use: "delete ([-f FILENAME] | TYPE [(NAME | -l label | --all)])", DisableFlagsInUseLine: true, - Run: func(cmd *cobra.Command, args []string) {}, + Run: func(cmd *cobra.Command, args []string) {}, } return cmd }