From d3bd0eb1d5cefc25e4476d8dc086ebd90439ef4e Mon Sep 17 00:00:00 2001 From: David Eads Date: Wed, 1 Aug 2018 10:01:32 -0400 Subject: [PATCH] make package name match all the import aliases --- cmd/kubeadm/app/apis/kubeadm/fuzzer/BUILD | 2 +- cmd/kubeadm/app/apis/kubeadm/fuzzer/fuzzer_test.go | 2 +- hack/.golint_failures | 4 ++-- pkg/api/testing/BUILD | 8 ++++---- pkg/api/testing/conversion_test.go | 2 +- pkg/api/testing/copy_test.go | 4 ++-- pkg/api/testing/defaulting_test.go | 2 +- pkg/api/testing/fuzzer.go | 4 ++-- pkg/api/testing/serialization_proto_test.go | 2 +- pkg/api/testing/serialization_test.go | 4 ++-- pkg/api/testing/unstructured_test.go | 2 +- pkg/apis/core/v1/BUILD | 2 +- pkg/apis/core/v1/conversion_test.go | 2 +- pkg/kubelet/apis/kubeletconfig/scheme/BUILD | 2 +- pkg/kubelet/apis/kubeletconfig/scheme/scheme_test.go | 2 +- pkg/proxy/apis/kubeproxyconfig/scheme/BUILD | 2 +- pkg/proxy/apis/kubeproxyconfig/scheme/scheme_test.go | 2 +- staging/src/BUILD | 2 +- staging/src/k8s.io/api/BUILD | 4 ++-- staging/src/k8s.io/api/roundtrip_test.go | 4 ++-- .../pkg/apis/apiextensions/install/BUILD | 2 +- .../pkg/apis/apiextensions/install/roundtrip_test.go | 2 +- .../k8s.io/apiextensions-apiserver/pkg/apiserver/BUILD | 2 +- .../pkg/apiserver/customresource_handler_test.go | 2 +- .../pkg/apiserver/validation/BUILD | 2 +- .../pkg/apiserver/validation/validation_test.go | 2 +- .../apimachinery/pkg/api/{testing => apitesting}/BUILD | 8 ++++---- .../apimachinery/pkg/api/{testing => apitesting}/codec.go | 0 .../pkg/api/{testing => apitesting}/fuzzer/BUILD | 4 ++-- .../pkg/api/{testing => apitesting}/fuzzer/fuzzer.go | 0 .../pkg/api/{testing => apitesting}/fuzzer/valuefuzz.go | 0 .../api/{testing => apitesting}/fuzzer/valuefuzz_test.go | 0 .../pkg/api/{testing => apitesting}/roundtrip/BUILD | 8 ++++---- .../api/{testing => apitesting}/roundtrip/roundtrip.go | 4 ++-- .../src/k8s.io/apimachinery/pkg/apis/meta/fuzzer/BUILD | 4 ++-- .../k8s.io/apimachinery/pkg/apis/meta/fuzzer/fuzzer.go | 4 ++-- .../apimachinery/pkg/apis/meta/internalversion/BUILD | 2 +- .../pkg/apis/meta/internalversion/roundtrip_test.go | 2 +- .../apimachinery/pkg/apis/testapigroup/fuzzer/BUILD | 4 ++-- .../apimachinery/pkg/apis/testapigroup/fuzzer/fuzzer.go | 4 ++-- .../apimachinery/pkg/apis/testapigroup/install/BUILD | 2 +- .../pkg/apis/testapigroup/install/roundtrip_test.go | 2 +- staging/src/k8s.io/apimachinery/pkg/test/BUILD | 2 +- .../pkg/test/apis_meta_v1_unstructed_unstructure_test.go | 2 +- .../k8s.io/apimachinery/pkg/test/runtime_helper_test.go | 2 +- .../apimachinery/pkg/test/runtime_unversioned_test.go | 2 +- staging/src/k8s.io/apiserver/pkg/apis/audit/install/BUILD | 2 +- .../apiserver/pkg/apis/audit/install/roundtrip_test.go | 2 +- .../src/k8s.io/apiserver/pkg/apis/example/fuzzer/BUILD | 4 ++-- .../k8s.io/apiserver/pkg/apis/example/fuzzer/fuzzer.go | 4 ++-- .../src/k8s.io/apiserver/pkg/apis/example/install/BUILD | 2 +- .../apiserver/pkg/apis/example/install/roundtrip_test.go | 2 +- .../src/k8s.io/apiserver/pkg/apis/example2/install/BUILD | 2 +- .../apiserver/pkg/apis/example2/install/roundtrip_test.go | 2 +- staging/src/k8s.io/apiserver/pkg/endpoints/BUILD | 2 +- .../src/k8s.io/apiserver/pkg/endpoints/apiserver_test.go | 2 +- .../k8s.io/apiserver/pkg/registry/generic/registry/BUILD | 2 +- .../apiserver/pkg/registry/generic/registry/store_test.go | 2 +- staging/src/k8s.io/apiserver/pkg/storage/etcd/BUILD | 2 +- .../k8s.io/apiserver/pkg/storage/etcd/etcd_helper_test.go | 2 +- .../apiserver/pkg/storage/etcd/etcd_watcher_test.go | 2 +- staging/src/k8s.io/apiserver/pkg/storage/etcd3/BUILD | 2 +- .../src/k8s.io/apiserver/pkg/storage/etcd3/store_test.go | 2 +- .../k8s.io/apiserver/pkg/storage/etcd3/watcher_test.go | 2 +- .../apiserver/pkg/storage/storagebackend/factory/BUILD | 2 +- .../pkg/storage/storagebackend/factory/tls_test.go | 2 +- staging/src/k8s.io/apiserver/pkg/storage/tests/BUILD | 2 +- .../src/k8s.io/apiserver/pkg/storage/tests/cacher_test.go | 2 +- staging/src/k8s.io/client-go/scale/BUILD | 2 +- staging/src/k8s.io/client-go/scale/roundtrip_test.go | 2 +- .../k8s.io/sample-apiserver/pkg/apis/wardle/install/BUILD | 2 +- .../pkg/apis/wardle/install/roundtrip_test.go | 2 +- staging/src/k8s.io/sample-apiserver/pkg/apiserver/BUILD | 2 +- .../k8s.io/sample-apiserver/pkg/apiserver/scheme_test.go | 2 +- 74 files changed, 93 insertions(+), 93 deletions(-) rename staging/src/k8s.io/apimachinery/pkg/api/{testing => apitesting}/BUILD (78%) rename staging/src/k8s.io/apimachinery/pkg/api/{testing => apitesting}/codec.go (100%) rename staging/src/k8s.io/apimachinery/pkg/api/{testing => apitesting}/fuzzer/BUILD (89%) rename staging/src/k8s.io/apimachinery/pkg/api/{testing => apitesting}/fuzzer/fuzzer.go (100%) rename staging/src/k8s.io/apimachinery/pkg/api/{testing => apitesting}/fuzzer/valuefuzz.go (100%) rename staging/src/k8s.io/apimachinery/pkg/api/{testing => apitesting}/fuzzer/valuefuzz_test.go (100%) rename staging/src/k8s.io/apimachinery/pkg/api/{testing => apitesting}/roundtrip/BUILD (85%) rename staging/src/k8s.io/apimachinery/pkg/api/{testing => apitesting}/roundtrip/roundtrip.go (99%) diff --git a/cmd/kubeadm/app/apis/kubeadm/fuzzer/BUILD b/cmd/kubeadm/app/apis/kubeadm/fuzzer/BUILD index cbdd5f02d94..930d1e18339 100644 --- a/cmd/kubeadm/app/apis/kubeadm/fuzzer/BUILD +++ b/cmd/kubeadm/app/apis/kubeadm/fuzzer/BUILD @@ -44,6 +44,6 @@ go_test( embed = [":go_default_library"], deps = [ "//cmd/kubeadm/app/apis/kubeadm/scheme:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/api/testing/roundtrip:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/api/apitesting/roundtrip:go_default_library", ], ) diff --git a/cmd/kubeadm/app/apis/kubeadm/fuzzer/fuzzer_test.go b/cmd/kubeadm/app/apis/kubeadm/fuzzer/fuzzer_test.go index 79d99c3ce43..76014a56ff1 100644 --- a/cmd/kubeadm/app/apis/kubeadm/fuzzer/fuzzer_test.go +++ b/cmd/kubeadm/app/apis/kubeadm/fuzzer/fuzzer_test.go @@ -19,7 +19,7 @@ package fuzzer import ( "testing" - "k8s.io/apimachinery/pkg/api/testing/roundtrip" + "k8s.io/apimachinery/pkg/api/apitesting/roundtrip" "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/scheme" ) diff --git a/hack/.golint_failures b/hack/.golint_failures index f597c9e39ac..990c320d67e 100644 --- a/hack/.golint_failures +++ b/hack/.golint_failures @@ -469,9 +469,9 @@ staging/src/k8s.io/apiextensions-apiserver/pkg/controller/finalizer staging/src/k8s.io/apiextensions-apiserver/pkg/controller/status staging/src/k8s.io/apiextensions-apiserver/pkg/features staging/src/k8s.io/apiextensions-apiserver/pkg/registry/customresourcedefinition +staging/src/k8s.io/apimachinery/pkg/api/apitesting/fuzzer +staging/src/k8s.io/apimachinery/pkg/api/apitesting/roundtrip staging/src/k8s.io/apimachinery/pkg/api/meta -staging/src/k8s.io/apimachinery/pkg/api/testing/fuzzer -staging/src/k8s.io/apimachinery/pkg/api/testing/roundtrip staging/src/k8s.io/apimachinery/pkg/api/validation staging/src/k8s.io/apimachinery/pkg/api/validation/path staging/src/k8s.io/apimachinery/pkg/apis/meta/fuzzer diff --git a/pkg/api/testing/BUILD b/pkg/api/testing/BUILD index 62f0c722ad6..af88089ba0f 100644 --- a/pkg/api/testing/BUILD +++ b/pkg/api/testing/BUILD @@ -32,8 +32,8 @@ go_library( "//pkg/apis/rbac/fuzzer:go_default_library", "//pkg/apis/storage/fuzzer:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/api/testing:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/api/testing/fuzzer:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/api/apitesting:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/api/apitesting/fuzzer:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/fuzzer:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/fields:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", @@ -85,10 +85,10 @@ go_test( "//pkg/apis/extensions/v1beta1:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/api/extensions/v1beta1:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/api/apitesting/fuzzer:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/api/apitesting/roundtrip:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/equality:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/api/testing/fuzzer:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/api/testing/roundtrip:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/conversion:go_default_library", diff --git a/pkg/api/testing/conversion_test.go b/pkg/api/testing/conversion_test.go index e572a6e7834..1064e050c8c 100644 --- a/pkg/api/testing/conversion_test.go +++ b/pkg/api/testing/conversion_test.go @@ -21,8 +21,8 @@ import ( "math/rand" "testing" + "k8s.io/apimachinery/pkg/api/apitesting/fuzzer" apiequality "k8s.io/apimachinery/pkg/api/equality" - "k8s.io/apimachinery/pkg/api/testing/fuzzer" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/diff" diff --git a/pkg/api/testing/copy_test.go b/pkg/api/testing/copy_test.go index c8a7891e686..2ed8d943215 100644 --- a/pkg/api/testing/copy_test.go +++ b/pkg/api/testing/copy_test.go @@ -24,8 +24,8 @@ import ( "github.com/google/gofuzz" - "k8s.io/apimachinery/pkg/api/testing/fuzzer" - "k8s.io/apimachinery/pkg/api/testing/roundtrip" + "k8s.io/apimachinery/pkg/api/apitesting/fuzzer" + "k8s.io/apimachinery/pkg/api/apitesting/roundtrip" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/diff" diff --git a/pkg/api/testing/defaulting_test.go b/pkg/api/testing/defaulting_test.go index 0dfe70959e4..48f02d29b02 100644 --- a/pkg/api/testing/defaulting_test.go +++ b/pkg/api/testing/defaulting_test.go @@ -26,7 +26,7 @@ import ( apiv1 "k8s.io/api/core/v1" extensionsv1beta1 "k8s.io/api/extensions/v1beta1" - roundtrip "k8s.io/apimachinery/pkg/api/testing/roundtrip" + roundtrip "k8s.io/apimachinery/pkg/api/apitesting/roundtrip" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/api/testing/fuzzer.go b/pkg/api/testing/fuzzer.go index 4779ae9ec46..85d3d264bc2 100644 --- a/pkg/api/testing/fuzzer.go +++ b/pkg/api/testing/fuzzer.go @@ -22,8 +22,8 @@ import ( fuzz "github.com/google/gofuzz" "k8s.io/api/core/v1" - apitesting "k8s.io/apimachinery/pkg/api/testing" - "k8s.io/apimachinery/pkg/api/testing/fuzzer" + apitesting "k8s.io/apimachinery/pkg/api/apitesting" + "k8s.io/apimachinery/pkg/api/apitesting/fuzzer" genericfuzzer "k8s.io/apimachinery/pkg/apis/meta/fuzzer" "k8s.io/apimachinery/pkg/runtime" runtimeserializer "k8s.io/apimachinery/pkg/runtime/serializer" diff --git a/pkg/api/testing/serialization_proto_test.go b/pkg/api/testing/serialization_proto_test.go index 45c90e818a0..90bca94daf4 100644 --- a/pkg/api/testing/serialization_proto_test.go +++ b/pkg/api/testing/serialization_proto_test.go @@ -26,8 +26,8 @@ import ( "github.com/gogo/protobuf/proto" "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/api/apitesting/fuzzer" apiequality "k8s.io/apimachinery/pkg/api/equality" - "k8s.io/apimachinery/pkg/api/testing/fuzzer" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/api/testing/serialization_test.go b/pkg/api/testing/serialization_test.go index 9b521c25291..446ffc74e13 100644 --- a/pkg/api/testing/serialization_test.go +++ b/pkg/api/testing/serialization_test.go @@ -29,10 +29,10 @@ import ( "k8s.io/api/core/v1" "k8s.io/api/extensions/v1beta1" + "k8s.io/apimachinery/pkg/api/apitesting/fuzzer" + "k8s.io/apimachinery/pkg/api/apitesting/roundtrip" apiequality "k8s.io/apimachinery/pkg/api/equality" "k8s.io/apimachinery/pkg/api/meta" - "k8s.io/apimachinery/pkg/api/testing/fuzzer" - "k8s.io/apimachinery/pkg/api/testing/roundtrip" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/conversion" "k8s.io/apimachinery/pkg/runtime" diff --git a/pkg/api/testing/unstructured_test.go b/pkg/api/testing/unstructured_test.go index 7e991878a1d..6d352b48bf7 100644 --- a/pkg/api/testing/unstructured_test.go +++ b/pkg/api/testing/unstructured_test.go @@ -24,9 +24,9 @@ import ( "github.com/google/gofuzz" "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/api/apitesting/fuzzer" apiequality "k8s.io/apimachinery/pkg/api/equality" "k8s.io/apimachinery/pkg/api/meta" - "k8s.io/apimachinery/pkg/api/testing/fuzzer" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metaunstruct "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" diff --git a/pkg/apis/core/v1/BUILD b/pkg/apis/core/v1/BUILD index bf8cfdc83b9..180f0bad98b 100644 --- a/pkg/apis/core/v1/BUILD +++ b/pkg/apis/core/v1/BUILD @@ -46,9 +46,9 @@ go_test( "//pkg/apis/extensions:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/api/extensions/v1beta1:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/api/apitesting/fuzzer:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/equality:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/resource:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/api/testing/fuzzer:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/fuzzer: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", diff --git a/pkg/apis/core/v1/conversion_test.go b/pkg/apis/core/v1/conversion_test.go index b68e5f3ccb5..3e82415d80b 100644 --- a/pkg/apis/core/v1/conversion_test.go +++ b/pkg/apis/core/v1/conversion_test.go @@ -26,9 +26,9 @@ import ( "k8s.io/api/core/v1" extensionsv1beta1 "k8s.io/api/extensions/v1beta1" + "k8s.io/apimachinery/pkg/api/apitesting/fuzzer" apiequality "k8s.io/apimachinery/pkg/api/equality" "k8s.io/apimachinery/pkg/api/resource" - "k8s.io/apimachinery/pkg/api/testing/fuzzer" metafuzzer "k8s.io/apimachinery/pkg/apis/meta/fuzzer" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/pkg/kubelet/apis/kubeletconfig/scheme/BUILD b/pkg/kubelet/apis/kubeletconfig/scheme/BUILD index e50853d9866..1dc740b500b 100644 --- a/pkg/kubelet/apis/kubeletconfig/scheme/BUILD +++ b/pkg/kubelet/apis/kubeletconfig/scheme/BUILD @@ -33,6 +33,6 @@ go_test( embed = [":go_default_library"], deps = [ "//pkg/kubelet/apis/kubeletconfig/fuzzer:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/api/testing/roundtrip:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/api/apitesting/roundtrip:go_default_library", ], ) diff --git a/pkg/kubelet/apis/kubeletconfig/scheme/scheme_test.go b/pkg/kubelet/apis/kubeletconfig/scheme/scheme_test.go index 0f593107098..bbb91b320a9 100644 --- a/pkg/kubelet/apis/kubeletconfig/scheme/scheme_test.go +++ b/pkg/kubelet/apis/kubeletconfig/scheme/scheme_test.go @@ -19,7 +19,7 @@ package scheme import ( "testing" - "k8s.io/apimachinery/pkg/api/testing/roundtrip" + "k8s.io/apimachinery/pkg/api/apitesting/roundtrip" "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/fuzzer" ) diff --git a/pkg/proxy/apis/kubeproxyconfig/scheme/BUILD b/pkg/proxy/apis/kubeproxyconfig/scheme/BUILD index 608d2fb85c5..b07609d1410 100644 --- a/pkg/proxy/apis/kubeproxyconfig/scheme/BUILD +++ b/pkg/proxy/apis/kubeproxyconfig/scheme/BUILD @@ -34,6 +34,6 @@ go_test( embed = [":go_default_library"], deps = [ "//pkg/proxy/apis/kubeproxyconfig/fuzzer:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/api/testing/roundtrip:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/api/apitesting/roundtrip:go_default_library", ], ) diff --git a/pkg/proxy/apis/kubeproxyconfig/scheme/scheme_test.go b/pkg/proxy/apis/kubeproxyconfig/scheme/scheme_test.go index 1a6702d69e3..8d43c40fb5a 100644 --- a/pkg/proxy/apis/kubeproxyconfig/scheme/scheme_test.go +++ b/pkg/proxy/apis/kubeproxyconfig/scheme/scheme_test.go @@ -19,7 +19,7 @@ package scheme import ( "testing" - "k8s.io/apimachinery/pkg/api/testing/roundtrip" + "k8s.io/apimachinery/pkg/api/apitesting/roundtrip" "k8s.io/kubernetes/pkg/proxy/apis/kubeproxyconfig/fuzzer" ) diff --git a/staging/src/BUILD b/staging/src/BUILD index d4744ab8f01..7fd5eff446d 100644 --- a/staging/src/BUILD +++ b/staging/src/BUILD @@ -17,11 +17,11 @@ filegroup( ":package-srcs", "//staging/src/k8s.io/api:all-srcs", "//staging/src/k8s.io/apiextensions-apiserver:all-srcs", + "//staging/src/k8s.io/apimachinery/pkg/api/apitesting:all-srcs", "//staging/src/k8s.io/apimachinery/pkg/api/equality:all-srcs", "//staging/src/k8s.io/apimachinery/pkg/api/errors:all-srcs", "//staging/src/k8s.io/apimachinery/pkg/api/meta:all-srcs", "//staging/src/k8s.io/apimachinery/pkg/api/resource:all-srcs", - "//staging/src/k8s.io/apimachinery/pkg/api/testing:all-srcs", "//staging/src/k8s.io/apimachinery/pkg/api/validation:all-srcs", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/fuzzer:all-srcs", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/internalversion:all-srcs", diff --git a/staging/src/k8s.io/api/BUILD b/staging/src/k8s.io/api/BUILD index 0cf2c711efd..fbcac21668d 100644 --- a/staging/src/k8s.io/api/BUILD +++ b/staging/src/k8s.io/api/BUILD @@ -35,8 +35,8 @@ go_test( "//staging/src/k8s.io/api/storage/v1:go_default_library", "//staging/src/k8s.io/api/storage/v1alpha1:go_default_library", "//staging/src/k8s.io/api/storage/v1beta1:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/api/testing/fuzzer:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/api/testing/roundtrip:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/api/apitesting/fuzzer:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/api/apitesting/roundtrip:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/fuzzer: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", diff --git a/staging/src/k8s.io/api/roundtrip_test.go b/staging/src/k8s.io/api/roundtrip_test.go index 33b10da9770..0c79c3eb4bc 100644 --- a/staging/src/k8s.io/api/roundtrip_test.go +++ b/staging/src/k8s.io/api/roundtrip_test.go @@ -53,8 +53,8 @@ import ( storagev1beta1 "k8s.io/api/storage/v1beta1" "github.com/stretchr/testify/require" - "k8s.io/apimachinery/pkg/api/testing/fuzzer" - "k8s.io/apimachinery/pkg/api/testing/roundtrip" + "k8s.io/apimachinery/pkg/api/apitesting/fuzzer" + "k8s.io/apimachinery/pkg/api/apitesting/roundtrip" genericfuzzer "k8s.io/apimachinery/pkg/apis/meta/fuzzer" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/install/BUILD b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/install/BUILD index 7e799a680de..738200af986 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/install/BUILD +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/install/BUILD @@ -12,7 +12,7 @@ go_test( embed = [":go_default_library"], deps = [ "//staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/fuzzer:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/api/testing/roundtrip:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/api/apitesting/roundtrip:go_default_library", ], ) diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/install/roundtrip_test.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/install/roundtrip_test.go index 353e81287ce..f199dd5e543 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/install/roundtrip_test.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/install/roundtrip_test.go @@ -20,7 +20,7 @@ import ( "testing" apiextensionsfuzzer "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/fuzzer" - "k8s.io/apimachinery/pkg/api/testing/roundtrip" + "k8s.io/apimachinery/pkg/api/apitesting/roundtrip" ) func TestRoundTrip(t *testing.T) { diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/BUILD b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/BUILD index 0dd57c98f2c..7bdf1a397fd 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/BUILD +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/BUILD @@ -88,8 +88,8 @@ go_test( "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions:go_default_library", "//staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/conversion:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/api/apitesting/fuzzer:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/equality:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/api/testing/fuzzer:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/fuzzer:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured:go_default_library", diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/customresource_handler_test.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/customresource_handler_test.go index 2061785378a..fa7c84e6631 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/customresource_handler_test.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/customresource_handler_test.go @@ -24,8 +24,8 @@ import ( corev1 "k8s.io/api/core/v1" "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions" "k8s.io/apiextensions-apiserver/pkg/apiserver/conversion" + "k8s.io/apimachinery/pkg/api/apitesting/fuzzer" "k8s.io/apimachinery/pkg/api/equality" - "k8s.io/apimachinery/pkg/api/testing/fuzzer" metafuzzer "k8s.io/apimachinery/pkg/apis/meta/fuzzer" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/validation/BUILD b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/validation/BUILD index afe5e500b17..38117619d08 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/validation/BUILD +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/validation/BUILD @@ -40,8 +40,8 @@ go_test( "//staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions:go_default_library", "//staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/fuzzer:go_default_library", "//staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/api/apitesting/fuzzer:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/equality:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/api/testing/fuzzer:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime/serializer:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/json:go_default_library", diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/validation/validation_test.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/validation/validation_test.go index 3d9c50c840c..ef73c008b0d 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/validation/validation_test.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/validation/validation_test.go @@ -22,8 +22,8 @@ import ( "github.com/go-openapi/spec" + "k8s.io/apimachinery/pkg/api/apitesting/fuzzer" apiequality "k8s.io/apimachinery/pkg/api/equality" - "k8s.io/apimachinery/pkg/api/testing/fuzzer" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/serializer" "k8s.io/apimachinery/pkg/util/json" diff --git a/staging/src/k8s.io/apimachinery/pkg/api/testing/BUILD b/staging/src/k8s.io/apimachinery/pkg/api/apitesting/BUILD similarity index 78% rename from staging/src/k8s.io/apimachinery/pkg/api/testing/BUILD rename to staging/src/k8s.io/apimachinery/pkg/api/apitesting/BUILD index f4bc65e2317..40a3072b8c7 100644 --- a/staging/src/k8s.io/apimachinery/pkg/api/testing/BUILD +++ b/staging/src/k8s.io/apimachinery/pkg/api/apitesting/BUILD @@ -8,8 +8,8 @@ load( go_library( name = "go_default_library", srcs = ["codec.go"], - importmap = "k8s.io/kubernetes/vendor/k8s.io/apimachinery/pkg/api/testing", - importpath = "k8s.io/apimachinery/pkg/api/testing", + importmap = "k8s.io/kubernetes/vendor/k8s.io/apimachinery/pkg/api/apitesting", + importpath = "k8s.io/apimachinery/pkg/api/apitesting", deps = [ "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", @@ -29,8 +29,8 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//staging/src/k8s.io/apimachinery/pkg/api/testing/fuzzer:all-srcs", - "//staging/src/k8s.io/apimachinery/pkg/api/testing/roundtrip:all-srcs", + "//staging/src/k8s.io/apimachinery/pkg/api/apitesting/fuzzer:all-srcs", + "//staging/src/k8s.io/apimachinery/pkg/api/apitesting/roundtrip:all-srcs", ], tags = ["automanaged"], ) diff --git a/staging/src/k8s.io/apimachinery/pkg/api/testing/codec.go b/staging/src/k8s.io/apimachinery/pkg/api/apitesting/codec.go similarity index 100% rename from staging/src/k8s.io/apimachinery/pkg/api/testing/codec.go rename to staging/src/k8s.io/apimachinery/pkg/api/apitesting/codec.go diff --git a/staging/src/k8s.io/apimachinery/pkg/api/testing/fuzzer/BUILD b/staging/src/k8s.io/apimachinery/pkg/api/apitesting/fuzzer/BUILD similarity index 89% rename from staging/src/k8s.io/apimachinery/pkg/api/testing/fuzzer/BUILD rename to staging/src/k8s.io/apimachinery/pkg/api/apitesting/fuzzer/BUILD index 29074d8af38..4d52592b4c7 100644 --- a/staging/src/k8s.io/apimachinery/pkg/api/testing/fuzzer/BUILD +++ b/staging/src/k8s.io/apimachinery/pkg/api/apitesting/fuzzer/BUILD @@ -18,8 +18,8 @@ go_library( "fuzzer.go", "valuefuzz.go", ], - importmap = "k8s.io/kubernetes/vendor/k8s.io/apimachinery/pkg/api/testing/fuzzer", - importpath = "k8s.io/apimachinery/pkg/api/testing/fuzzer", + importmap = "k8s.io/kubernetes/vendor/k8s.io/apimachinery/pkg/api/apitesting/fuzzer", + importpath = "k8s.io/apimachinery/pkg/api/apitesting/fuzzer", deps = [ "//staging/src/k8s.io/apimachinery/pkg/runtime/serializer:go_default_library", "//vendor/github.com/google/gofuzz:go_default_library", diff --git a/staging/src/k8s.io/apimachinery/pkg/api/testing/fuzzer/fuzzer.go b/staging/src/k8s.io/apimachinery/pkg/api/apitesting/fuzzer/fuzzer.go similarity index 100% rename from staging/src/k8s.io/apimachinery/pkg/api/testing/fuzzer/fuzzer.go rename to staging/src/k8s.io/apimachinery/pkg/api/apitesting/fuzzer/fuzzer.go diff --git a/staging/src/k8s.io/apimachinery/pkg/api/testing/fuzzer/valuefuzz.go b/staging/src/k8s.io/apimachinery/pkg/api/apitesting/fuzzer/valuefuzz.go similarity index 100% rename from staging/src/k8s.io/apimachinery/pkg/api/testing/fuzzer/valuefuzz.go rename to staging/src/k8s.io/apimachinery/pkg/api/apitesting/fuzzer/valuefuzz.go diff --git a/staging/src/k8s.io/apimachinery/pkg/api/testing/fuzzer/valuefuzz_test.go b/staging/src/k8s.io/apimachinery/pkg/api/apitesting/fuzzer/valuefuzz_test.go similarity index 100% rename from staging/src/k8s.io/apimachinery/pkg/api/testing/fuzzer/valuefuzz_test.go rename to staging/src/k8s.io/apimachinery/pkg/api/apitesting/fuzzer/valuefuzz_test.go diff --git a/staging/src/k8s.io/apimachinery/pkg/api/testing/roundtrip/BUILD b/staging/src/k8s.io/apimachinery/pkg/api/apitesting/roundtrip/BUILD similarity index 85% rename from staging/src/k8s.io/apimachinery/pkg/api/testing/roundtrip/BUILD rename to staging/src/k8s.io/apimachinery/pkg/api/apitesting/roundtrip/BUILD index f58bbe9180d..d154bc8e424 100644 --- a/staging/src/k8s.io/apimachinery/pkg/api/testing/roundtrip/BUILD +++ b/staging/src/k8s.io/apimachinery/pkg/api/apitesting/roundtrip/BUILD @@ -8,13 +8,13 @@ load( go_library( name = "go_default_library", srcs = ["roundtrip.go"], - importmap = "k8s.io/kubernetes/vendor/k8s.io/apimachinery/pkg/api/testing/roundtrip", - importpath = "k8s.io/apimachinery/pkg/api/testing/roundtrip", + importmap = "k8s.io/kubernetes/vendor/k8s.io/apimachinery/pkg/api/apitesting/roundtrip", + importpath = "k8s.io/apimachinery/pkg/api/apitesting/roundtrip", deps = [ + "//staging/src/k8s.io/apimachinery/pkg/api/apitesting:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/api/apitesting/fuzzer:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/equality:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/api/testing:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/api/testing/fuzzer:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/fuzzer:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", diff --git a/staging/src/k8s.io/apimachinery/pkg/api/testing/roundtrip/roundtrip.go b/staging/src/k8s.io/apimachinery/pkg/api/apitesting/roundtrip/roundtrip.go similarity index 99% rename from staging/src/k8s.io/apimachinery/pkg/api/testing/roundtrip/roundtrip.go rename to staging/src/k8s.io/apimachinery/pkg/api/apitesting/roundtrip/roundtrip.go index f8b12aa859a..809160d7170 100644 --- a/staging/src/k8s.io/apimachinery/pkg/api/testing/roundtrip/roundtrip.go +++ b/staging/src/k8s.io/apimachinery/pkg/api/apitesting/roundtrip/roundtrip.go @@ -29,10 +29,10 @@ import ( "github.com/google/gofuzz" flag "github.com/spf13/pflag" + apitesting "k8s.io/apimachinery/pkg/api/apitesting" + "k8s.io/apimachinery/pkg/api/apitesting/fuzzer" apiequality "k8s.io/apimachinery/pkg/api/equality" apimeta "k8s.io/apimachinery/pkg/api/meta" - apitesting "k8s.io/apimachinery/pkg/api/testing" - "k8s.io/apimachinery/pkg/api/testing/fuzzer" metafuzzer "k8s.io/apimachinery/pkg/apis/meta/fuzzer" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/meta/fuzzer/BUILD b/staging/src/k8s.io/apimachinery/pkg/apis/meta/fuzzer/BUILD index 8708af82406..2bd5c6701dc 100644 --- a/staging/src/k8s.io/apimachinery/pkg/apis/meta/fuzzer/BUILD +++ b/staging/src/k8s.io/apimachinery/pkg/apis/meta/fuzzer/BUILD @@ -11,9 +11,9 @@ go_library( importmap = "k8s.io/kubernetes/vendor/k8s.io/apimachinery/pkg/apis/meta/fuzzer", importpath = "k8s.io/apimachinery/pkg/apis/meta/fuzzer", deps = [ + "//staging/src/k8s.io/apimachinery/pkg/api/apitesting:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/api/apitesting/fuzzer:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/resource:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/api/testing:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/api/testing/fuzzer:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1beta1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/meta/fuzzer/fuzzer.go b/staging/src/k8s.io/apimachinery/pkg/apis/meta/fuzzer/fuzzer.go index 3a28f743118..c067aa5581a 100644 --- a/staging/src/k8s.io/apimachinery/pkg/apis/meta/fuzzer/fuzzer.go +++ b/staging/src/k8s.io/apimachinery/pkg/apis/meta/fuzzer/fuzzer.go @@ -25,9 +25,9 @@ import ( "github.com/google/gofuzz" + apitesting "k8s.io/apimachinery/pkg/api/apitesting" + "k8s.io/apimachinery/pkg/api/apitesting/fuzzer" "k8s.io/apimachinery/pkg/api/resource" - apitesting "k8s.io/apimachinery/pkg/api/testing" - "k8s.io/apimachinery/pkg/api/testing/fuzzer" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1beta1 "k8s.io/apimachinery/pkg/apis/meta/v1beta1" "k8s.io/apimachinery/pkg/runtime" diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/meta/internalversion/BUILD b/staging/src/k8s.io/apimachinery/pkg/apis/meta/internalversion/BUILD index a950875e2ef..603eb10cbc7 100644 --- a/staging/src/k8s.io/apimachinery/pkg/apis/meta/internalversion/BUILD +++ b/staging/src/k8s.io/apimachinery/pkg/apis/meta/internalversion/BUILD @@ -14,7 +14,7 @@ go_test( ], embed = [":go_default_library"], deps = [ - "//staging/src/k8s.io/apimachinery/pkg/api/testing/roundtrip:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/api/apitesting/roundtrip:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/fuzzer:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/diff:go_default_library", diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/meta/internalversion/roundtrip_test.go b/staging/src/k8s.io/apimachinery/pkg/apis/meta/internalversion/roundtrip_test.go index 725aa316d06..cca50eb4a89 100644 --- a/staging/src/k8s.io/apimachinery/pkg/apis/meta/internalversion/roundtrip_test.go +++ b/staging/src/k8s.io/apimachinery/pkg/apis/meta/internalversion/roundtrip_test.go @@ -19,7 +19,7 @@ package internalversion import ( "testing" - "k8s.io/apimachinery/pkg/api/testing/roundtrip" + "k8s.io/apimachinery/pkg/api/apitesting/roundtrip" "k8s.io/apimachinery/pkg/apis/meta/fuzzer" ) diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/testapigroup/fuzzer/BUILD b/staging/src/k8s.io/apimachinery/pkg/apis/testapigroup/fuzzer/BUILD index a9e87f1cb83..7e2969e9320 100644 --- a/staging/src/k8s.io/apimachinery/pkg/apis/testapigroup/fuzzer/BUILD +++ b/staging/src/k8s.io/apimachinery/pkg/apis/testapigroup/fuzzer/BUILD @@ -11,8 +11,8 @@ go_library( importmap = "k8s.io/kubernetes/vendor/k8s.io/apimachinery/pkg/apis/testapigroup/fuzzer", importpath = "k8s.io/apimachinery/pkg/apis/testapigroup/fuzzer", deps = [ - "//staging/src/k8s.io/apimachinery/pkg/api/testing:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/api/testing/fuzzer:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/api/apitesting:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/api/apitesting/fuzzer:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/testapigroup:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/testapigroup/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/testapigroup/fuzzer/fuzzer.go b/staging/src/k8s.io/apimachinery/pkg/apis/testapigroup/fuzzer/fuzzer.go index a6b93b03791..26d7ddd889b 100644 --- a/staging/src/k8s.io/apimachinery/pkg/apis/testapigroup/fuzzer/fuzzer.go +++ b/staging/src/k8s.io/apimachinery/pkg/apis/testapigroup/fuzzer/fuzzer.go @@ -21,8 +21,8 @@ import ( "github.com/google/gofuzz" - apitesting "k8s.io/apimachinery/pkg/api/testing" - "k8s.io/apimachinery/pkg/api/testing/fuzzer" + apitesting "k8s.io/apimachinery/pkg/api/apitesting" + "k8s.io/apimachinery/pkg/api/apitesting/fuzzer" "k8s.io/apimachinery/pkg/apis/testapigroup" "k8s.io/apimachinery/pkg/apis/testapigroup/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/testapigroup/install/BUILD b/staging/src/k8s.io/apimachinery/pkg/apis/testapigroup/install/BUILD index 5fb1319489b..52b6c048851 100644 --- a/staging/src/k8s.io/apimachinery/pkg/apis/testapigroup/install/BUILD +++ b/staging/src/k8s.io/apimachinery/pkg/apis/testapigroup/install/BUILD @@ -24,7 +24,7 @@ go_test( srcs = ["roundtrip_test.go"], embed = [":go_default_library"], deps = [ - "//staging/src/k8s.io/apimachinery/pkg/api/testing/roundtrip:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/api/apitesting/roundtrip:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/testapigroup/fuzzer:go_default_library", ], ) diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/testapigroup/install/roundtrip_test.go b/staging/src/k8s.io/apimachinery/pkg/apis/testapigroup/install/roundtrip_test.go index da1a9c8ad97..7ad4986b545 100644 --- a/staging/src/k8s.io/apimachinery/pkg/apis/testapigroup/install/roundtrip_test.go +++ b/staging/src/k8s.io/apimachinery/pkg/apis/testapigroup/install/roundtrip_test.go @@ -19,7 +19,7 @@ package install import ( "testing" - "k8s.io/apimachinery/pkg/api/testing/roundtrip" + "k8s.io/apimachinery/pkg/api/apitesting/roundtrip" testapigroupfuzzer "k8s.io/apimachinery/pkg/apis/testapigroup/fuzzer" ) diff --git a/staging/src/k8s.io/apimachinery/pkg/test/BUILD b/staging/src/k8s.io/apimachinery/pkg/test/BUILD index a5d3d876749..d37f55ff3e1 100644 --- a/staging/src/k8s.io/apimachinery/pkg/test/BUILD +++ b/staging/src/k8s.io/apimachinery/pkg/test/BUILD @@ -18,9 +18,9 @@ go_test( ], embed = [":go_default_library"], deps = [ + "//staging/src/k8s.io/apimachinery/pkg/api/apitesting:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/equality:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/api/testing:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/testapigroup:go_default_library", diff --git a/staging/src/k8s.io/apimachinery/pkg/test/apis_meta_v1_unstructed_unstructure_test.go b/staging/src/k8s.io/apimachinery/pkg/test/apis_meta_v1_unstructed_unstructure_test.go index 08179540e01..4445fb0c2b6 100644 --- a/staging/src/k8s.io/apimachinery/pkg/test/apis_meta_v1_unstructed_unstructure_test.go +++ b/staging/src/k8s.io/apimachinery/pkg/test/apis_meta_v1_unstructed_unstructure_test.go @@ -24,7 +24,7 @@ import ( "testing" "time" - apitesting "k8s.io/apimachinery/pkg/api/testing" + apitesting "k8s.io/apimachinery/pkg/api/apitesting" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/apis/testapigroup" diff --git a/staging/src/k8s.io/apimachinery/pkg/test/runtime_helper_test.go b/staging/src/k8s.io/apimachinery/pkg/test/runtime_helper_test.go index 0106fb20bf3..31e6e7af5ca 100644 --- a/staging/src/k8s.io/apimachinery/pkg/test/runtime_helper_test.go +++ b/staging/src/k8s.io/apimachinery/pkg/test/runtime_helper_test.go @@ -19,7 +19,7 @@ package test import ( "testing" - apitesting "k8s.io/apimachinery/pkg/api/testing" + apitesting "k8s.io/apimachinery/pkg/api/apitesting" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/testapigroup" "k8s.io/apimachinery/pkg/runtime" diff --git a/staging/src/k8s.io/apimachinery/pkg/test/runtime_unversioned_test.go b/staging/src/k8s.io/apimachinery/pkg/test/runtime_unversioned_test.go index 4bf833a93e8..4fa920650d9 100644 --- a/staging/src/k8s.io/apimachinery/pkg/test/runtime_unversioned_test.go +++ b/staging/src/k8s.io/apimachinery/pkg/test/runtime_unversioned_test.go @@ -23,7 +23,7 @@ import ( // TODO: Ideally we should create the necessary package structure in e.g., // pkg/conversion/test/... instead of importing pkg/api here. - apitesting "k8s.io/apimachinery/pkg/api/testing" + apitesting "k8s.io/apimachinery/pkg/api/apitesting" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/staging/src/k8s.io/apiserver/pkg/apis/audit/install/BUILD b/staging/src/k8s.io/apiserver/pkg/apis/audit/install/BUILD index c06ebf76244..d43a2057449 100644 --- a/staging/src/k8s.io/apiserver/pkg/apis/audit/install/BUILD +++ b/staging/src/k8s.io/apiserver/pkg/apis/audit/install/BUILD @@ -38,7 +38,7 @@ go_test( srcs = ["roundtrip_test.go"], embed = [":go_default_library"], deps = [ - "//staging/src/k8s.io/apimachinery/pkg/api/testing/roundtrip:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/api/apitesting/roundtrip:go_default_library", "//staging/src/k8s.io/apiserver/pkg/apis/audit/fuzzer:go_default_library", ], ) diff --git a/staging/src/k8s.io/apiserver/pkg/apis/audit/install/roundtrip_test.go b/staging/src/k8s.io/apiserver/pkg/apis/audit/install/roundtrip_test.go index b3199e7b5d1..9497a364594 100644 --- a/staging/src/k8s.io/apiserver/pkg/apis/audit/install/roundtrip_test.go +++ b/staging/src/k8s.io/apiserver/pkg/apis/audit/install/roundtrip_test.go @@ -19,7 +19,7 @@ package install import ( "testing" - "k8s.io/apimachinery/pkg/api/testing/roundtrip" + "k8s.io/apimachinery/pkg/api/apitesting/roundtrip" "k8s.io/apiserver/pkg/apis/audit/fuzzer" ) diff --git a/staging/src/k8s.io/apiserver/pkg/apis/example/fuzzer/BUILD b/staging/src/k8s.io/apiserver/pkg/apis/example/fuzzer/BUILD index fb42e99eca3..f394f6061b3 100644 --- a/staging/src/k8s.io/apiserver/pkg/apis/example/fuzzer/BUILD +++ b/staging/src/k8s.io/apiserver/pkg/apis/example/fuzzer/BUILD @@ -11,8 +11,8 @@ go_library( importmap = "k8s.io/kubernetes/vendor/k8s.io/apiserver/pkg/apis/example/fuzzer", importpath = "k8s.io/apiserver/pkg/apis/example/fuzzer", deps = [ - "//staging/src/k8s.io/apimachinery/pkg/api/testing:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/api/testing/fuzzer:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/api/apitesting:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/api/apitesting/fuzzer:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime/serializer:go_default_library", "//staging/src/k8s.io/apiserver/pkg/apis/example:go_default_library", diff --git a/staging/src/k8s.io/apiserver/pkg/apis/example/fuzzer/fuzzer.go b/staging/src/k8s.io/apiserver/pkg/apis/example/fuzzer/fuzzer.go index d31b54fea75..58c08540694 100644 --- a/staging/src/k8s.io/apiserver/pkg/apis/example/fuzzer/fuzzer.go +++ b/staging/src/k8s.io/apiserver/pkg/apis/example/fuzzer/fuzzer.go @@ -21,8 +21,8 @@ import ( "github.com/google/gofuzz" - apitesting "k8s.io/apimachinery/pkg/api/testing" - "k8s.io/apimachinery/pkg/api/testing/fuzzer" + apitesting "k8s.io/apimachinery/pkg/api/apitesting" + "k8s.io/apimachinery/pkg/api/apitesting/fuzzer" "k8s.io/apimachinery/pkg/runtime" runtimeserializer "k8s.io/apimachinery/pkg/runtime/serializer" "k8s.io/apiserver/pkg/apis/example" diff --git a/staging/src/k8s.io/apiserver/pkg/apis/example/install/BUILD b/staging/src/k8s.io/apiserver/pkg/apis/example/install/BUILD index 7a4c7cf60cb..3461bf37e79 100644 --- a/staging/src/k8s.io/apiserver/pkg/apis/example/install/BUILD +++ b/staging/src/k8s.io/apiserver/pkg/apis/example/install/BUILD @@ -24,7 +24,7 @@ go_test( srcs = ["roundtrip_test.go"], embed = [":go_default_library"], deps = [ - "//staging/src/k8s.io/apimachinery/pkg/api/testing/roundtrip:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/api/apitesting/roundtrip:go_default_library", "//staging/src/k8s.io/apiserver/pkg/apis/example/fuzzer:go_default_library", ], ) diff --git a/staging/src/k8s.io/apiserver/pkg/apis/example/install/roundtrip_test.go b/staging/src/k8s.io/apiserver/pkg/apis/example/install/roundtrip_test.go index 7f8d4e82a6a..7f67418d245 100644 --- a/staging/src/k8s.io/apiserver/pkg/apis/example/install/roundtrip_test.go +++ b/staging/src/k8s.io/apiserver/pkg/apis/example/install/roundtrip_test.go @@ -19,7 +19,7 @@ package install import ( "testing" - "k8s.io/apimachinery/pkg/api/testing/roundtrip" + "k8s.io/apimachinery/pkg/api/apitesting/roundtrip" examplefuzzer "k8s.io/apiserver/pkg/apis/example/fuzzer" ) diff --git a/staging/src/k8s.io/apiserver/pkg/apis/example2/install/BUILD b/staging/src/k8s.io/apiserver/pkg/apis/example2/install/BUILD index 49de838886a..548fbcf2978 100644 --- a/staging/src/k8s.io/apiserver/pkg/apis/example2/install/BUILD +++ b/staging/src/k8s.io/apiserver/pkg/apis/example2/install/BUILD @@ -24,7 +24,7 @@ go_test( srcs = ["roundtrip_test.go"], embed = [":go_default_library"], deps = [ - "//staging/src/k8s.io/apimachinery/pkg/api/testing/roundtrip:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/api/apitesting/roundtrip:go_default_library", "//staging/src/k8s.io/apiserver/pkg/apis/example/fuzzer:go_default_library", ], ) diff --git a/staging/src/k8s.io/apiserver/pkg/apis/example2/install/roundtrip_test.go b/staging/src/k8s.io/apiserver/pkg/apis/example2/install/roundtrip_test.go index 7f8d4e82a6a..7f67418d245 100644 --- a/staging/src/k8s.io/apiserver/pkg/apis/example2/install/roundtrip_test.go +++ b/staging/src/k8s.io/apiserver/pkg/apis/example2/install/roundtrip_test.go @@ -19,7 +19,7 @@ package install import ( "testing" - "k8s.io/apimachinery/pkg/api/testing/roundtrip" + "k8s.io/apimachinery/pkg/api/apitesting/roundtrip" examplefuzzer "k8s.io/apiserver/pkg/apis/example/fuzzer" ) diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/BUILD b/staging/src/k8s.io/apiserver/pkg/endpoints/BUILD index ef6df76066c..6d3d56cec22 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/BUILD +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/BUILD @@ -17,10 +17,10 @@ go_test( ], embed = [":go_default_library"], deps = [ + "//staging/src/k8s.io/apimachinery/pkg/api/apitesting/fuzzer: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", "//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/api/testing/fuzzer:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/internalversion:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured:go_default_library", diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/apiserver_test.go b/staging/src/k8s.io/apiserver/pkg/endpoints/apiserver_test.go index 30b55eb9292..1e56a3b3a2f 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/apiserver_test.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/apiserver_test.go @@ -39,10 +39,10 @@ import ( "github.com/emicklei/go-restful" + fuzzer "k8s.io/apimachinery/pkg/api/apitesting/fuzzer" apiequality "k8s.io/apimachinery/pkg/api/equality" apierrs "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/meta" - fuzzer "k8s.io/apimachinery/pkg/api/testing/fuzzer" metainternalversion "k8s.io/apimachinery/pkg/apis/meta/internalversion" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" diff --git a/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/BUILD b/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/BUILD index 2cc28fd05a3..d56a4e0a613 100644 --- a/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/BUILD +++ b/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/BUILD @@ -14,10 +14,10 @@ go_test( ], embed = [":go_default_library"], deps = [ + "//staging/src/k8s.io/apimachinery/pkg/api/apitesting: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", "//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/api/testing:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/internalversion:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/fields:go_default_library", diff --git a/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/store_test.go b/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/store_test.go index 76310225a30..76957349b4e 100644 --- a/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/store_test.go +++ b/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/store_test.go @@ -27,10 +27,10 @@ import ( "testing" "time" + apitesting "k8s.io/apimachinery/pkg/api/apitesting" apiequality "k8s.io/apimachinery/pkg/api/equality" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/meta" - apitesting "k8s.io/apimachinery/pkg/api/testing" metainternalversion "k8s.io/apimachinery/pkg/apis/meta/internalversion" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/fields" diff --git a/staging/src/k8s.io/apiserver/pkg/storage/etcd/BUILD b/staging/src/k8s.io/apiserver/pkg/storage/etcd/BUILD index 986628cf592..eea138675bb 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/etcd/BUILD +++ b/staging/src/k8s.io/apiserver/pkg/storage/etcd/BUILD @@ -15,8 +15,8 @@ go_test( ], embed = [":go_default_library"], deps = [ + "//staging/src/k8s.io/apimachinery/pkg/api/apitesting:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/equality:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/api/testing:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/conversion:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/fields:go_default_library", diff --git a/staging/src/k8s.io/apiserver/pkg/storage/etcd/etcd_helper_test.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd/etcd_helper_test.go index c89270eb11a..a695fe253ae 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/etcd/etcd_helper_test.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/etcd/etcd_helper_test.go @@ -29,7 +29,7 @@ import ( etcd "github.com/coreos/etcd/client" "github.com/stretchr/testify/require" - apitesting "k8s.io/apimachinery/pkg/api/testing" + apitesting "k8s.io/apimachinery/pkg/api/apitesting" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/conversion" "k8s.io/apimachinery/pkg/fields" diff --git a/staging/src/k8s.io/apiserver/pkg/storage/etcd/etcd_watcher_test.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd/etcd_watcher_test.go index b2aff1c27e3..38ccb308ee3 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/etcd/etcd_watcher_test.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/etcd/etcd_watcher_test.go @@ -21,8 +21,8 @@ import ( rt "runtime" "testing" + apitesting "k8s.io/apimachinery/pkg/api/apitesting" apiequality "k8s.io/apimachinery/pkg/api/equality" - apitesting "k8s.io/apimachinery/pkg/api/testing" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/labels" diff --git a/staging/src/k8s.io/apiserver/pkg/storage/etcd3/BUILD b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/BUILD index 7bcd3a213be..30698779cc8 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/etcd3/BUILD +++ b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/BUILD @@ -16,8 +16,8 @@ go_test( ], embed = [":go_default_library"], deps = [ + "//staging/src/k8s.io/apimachinery/pkg/api/apitesting:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/api/testing:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/fields:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/labels:go_default_library", diff --git a/staging/src/k8s.io/apiserver/pkg/storage/etcd3/store_test.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/store_test.go index 7bd0c53fbb4..b73639117ea 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/etcd3/store_test.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/store_test.go @@ -31,8 +31,8 @@ import ( "github.com/coreos/etcd/clientv3" "github.com/coreos/etcd/integration" "github.com/coreos/pkg/capnslog" + apitesting "k8s.io/apimachinery/pkg/api/apitesting" apierrors "k8s.io/apimachinery/pkg/api/errors" - apitesting "k8s.io/apimachinery/pkg/api/testing" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/labels" diff --git a/staging/src/k8s.io/apiserver/pkg/storage/etcd3/watcher_test.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/watcher_test.go index c4ad51541db..53a8c1b4d55 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/etcd3/watcher_test.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/watcher_test.go @@ -27,7 +27,7 @@ import ( "github.com/coreos/etcd/clientv3" "github.com/coreos/etcd/integration" - apitesting "k8s.io/apimachinery/pkg/api/testing" + apitesting "k8s.io/apimachinery/pkg/api/apitesting" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/labels" diff --git a/staging/src/k8s.io/apiserver/pkg/storage/storagebackend/factory/BUILD b/staging/src/k8s.io/apiserver/pkg/storage/storagebackend/factory/BUILD index 0ca2cfc9a47..3e4ef1fbae5 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/storagebackend/factory/BUILD +++ b/staging/src/k8s.io/apiserver/pkg/storage/storagebackend/factory/BUILD @@ -11,7 +11,7 @@ go_test( srcs = ["tls_test.go"], embed = [":go_default_library"], deps = [ - "//staging/src/k8s.io/apimachinery/pkg/api/testing:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/api/apitesting: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/runtime/serializer:go_default_library", diff --git a/staging/src/k8s.io/apiserver/pkg/storage/storagebackend/factory/tls_test.go b/staging/src/k8s.io/apiserver/pkg/storage/storagebackend/factory/tls_test.go index 5273c403127..9286c7bc2cd 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/storagebackend/factory/tls_test.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/storagebackend/factory/tls_test.go @@ -27,7 +27,7 @@ import ( "github.com/coreos/etcd/integration" "github.com/coreos/etcd/pkg/transport" - apitesting "k8s.io/apimachinery/pkg/api/testing" + apitesting "k8s.io/apimachinery/pkg/api/apitesting" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/serializer" diff --git a/staging/src/k8s.io/apiserver/pkg/storage/tests/BUILD b/staging/src/k8s.io/apiserver/pkg/storage/tests/BUILD index a46db60c152..5fee66a22d0 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/tests/BUILD +++ b/staging/src/k8s.io/apiserver/pkg/storage/tests/BUILD @@ -11,10 +11,10 @@ go_test( srcs = ["cacher_test.go"], embed = [":go_default_library"], deps = [ + "//staging/src/k8s.io/apimachinery/pkg/api/apitesting: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", "//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/api/testing:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/fields:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/labels:go_default_library", diff --git a/staging/src/k8s.io/apiserver/pkg/storage/tests/cacher_test.go b/staging/src/k8s.io/apiserver/pkg/storage/tests/cacher_test.go index 87ae7ff383d..42571822b8c 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/tests/cacher_test.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/tests/cacher_test.go @@ -25,10 +25,10 @@ import ( "testing" "time" + apitesting "k8s.io/apimachinery/pkg/api/apitesting" apiequality "k8s.io/apimachinery/pkg/api/equality" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/meta" - apitesting "k8s.io/apimachinery/pkg/api/testing" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/labels" diff --git a/staging/src/k8s.io/client-go/scale/BUILD b/staging/src/k8s.io/client-go/scale/BUILD index 0e9828fd033..859cd593c3d 100644 --- a/staging/src/k8s.io/client-go/scale/BUILD +++ b/staging/src/k8s.io/client-go/scale/BUILD @@ -44,7 +44,7 @@ go_test( "//staging/src/k8s.io/api/autoscaling/v1:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/api/extensions/v1beta1:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/api/testing/roundtrip:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/api/apitesting/roundtrip: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/runtime/schema:go_default_library", diff --git a/staging/src/k8s.io/client-go/scale/roundtrip_test.go b/staging/src/k8s.io/client-go/scale/roundtrip_test.go index 2d3b28bf6c6..1da98704e68 100644 --- a/staging/src/k8s.io/client-go/scale/roundtrip_test.go +++ b/staging/src/k8s.io/client-go/scale/roundtrip_test.go @@ -19,7 +19,7 @@ package scale import ( "testing" - "k8s.io/apimachinery/pkg/api/testing/roundtrip" + "k8s.io/apimachinery/pkg/api/apitesting/roundtrip" ) // NB: this can't be in the scheme package, because importing' diff --git a/staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/install/BUILD b/staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/install/BUILD index 544a05f6e8a..05f9d988bf7 100644 --- a/staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/install/BUILD +++ b/staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/install/BUILD @@ -11,7 +11,7 @@ go_test( srcs = ["roundtrip_test.go"], embed = [":go_default_library"], deps = [ - "//staging/src/k8s.io/apimachinery/pkg/api/testing/roundtrip:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/api/apitesting/roundtrip:go_default_library", "//staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/fuzzer:go_default_library", ], ) diff --git a/staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/install/roundtrip_test.go b/staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/install/roundtrip_test.go index d50b32dfd9f..89cd8c02e47 100644 --- a/staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/install/roundtrip_test.go +++ b/staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/install/roundtrip_test.go @@ -19,7 +19,7 @@ package install import ( "testing" - "k8s.io/apimachinery/pkg/api/testing/roundtrip" + "k8s.io/apimachinery/pkg/api/apitesting/roundtrip" wardlefuzzer "k8s.io/sample-apiserver/pkg/apis/wardle/fuzzer" ) diff --git a/staging/src/k8s.io/sample-apiserver/pkg/apiserver/BUILD b/staging/src/k8s.io/sample-apiserver/pkg/apiserver/BUILD index 3170e3268e0..ae318165770 100644 --- a/staging/src/k8s.io/sample-apiserver/pkg/apiserver/BUILD +++ b/staging/src/k8s.io/sample-apiserver/pkg/apiserver/BUILD @@ -11,7 +11,7 @@ go_test( srcs = ["scheme_test.go"], embed = [":go_default_library"], deps = [ - "//staging/src/k8s.io/apimachinery/pkg/api/testing/roundtrip:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/api/apitesting/roundtrip:go_default_library", "//staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/fuzzer:go_default_library", ], ) diff --git a/staging/src/k8s.io/sample-apiserver/pkg/apiserver/scheme_test.go b/staging/src/k8s.io/sample-apiserver/pkg/apiserver/scheme_test.go index 060a8be7e5e..fbdd1073574 100644 --- a/staging/src/k8s.io/sample-apiserver/pkg/apiserver/scheme_test.go +++ b/staging/src/k8s.io/sample-apiserver/pkg/apiserver/scheme_test.go @@ -19,7 +19,7 @@ package apiserver import ( "testing" - "k8s.io/apimachinery/pkg/api/testing/roundtrip" + "k8s.io/apimachinery/pkg/api/apitesting/roundtrip" wardlefuzzer "k8s.io/sample-apiserver/pkg/apis/wardle/fuzzer" )