diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/fake/BUILD b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/fake/BUILD index 14845425740..16eb66a06bd 100644 --- a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/fake/BUILD +++ b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/fake/BUILD @@ -19,11 +19,11 @@ go_library( "//cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1:go_default_library", "//cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake:go_default_library", "//pkg/api:go_default_library", - "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/client-go/discovery", "//vendor:k8s.io/client-go/discovery/fake", + "//vendor:k8s.io/client-go/testing", ], ) diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/fake/clientset_generated.go b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/fake/clientset_generated.go index e3a1935fc11..2755dc19661 100644 --- a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/fake/clientset_generated.go +++ b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/fake/clientset_generated.go @@ -21,11 +21,11 @@ import ( "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/discovery" fakediscovery "k8s.io/client-go/discovery/fake" + "k8s.io/client-go/testing" clientset "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/clientset" v1alpha1apiregistration "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1" fakev1alpha1apiregistration "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client/testing/core" ) // NewSimpleClientset returns a clientset that will respond with the provided objects. @@ -33,17 +33,17 @@ import ( // without applying any validations and/or defaults. It shouldn't be considered a replacement // for a real clientset and is mostly useful in simple unit tests. func NewSimpleClientset(objects ...runtime.Object) *Clientset { - o := core.NewObjectTracker(api.Scheme, api.Codecs.UniversalDecoder()) + o := testing.NewObjectTracker(api.Registry, api.Scheme, api.Codecs.UniversalDecoder()) for _, obj := range objects { if err := o.Add(obj); err != nil { panic(err) } } - fakePtr := core.Fake{} - fakePtr.AddReactor("*", "*", core.ObjectReaction(o, api.Registry.RESTMapper())) + fakePtr := testing.Fake{} + fakePtr.AddReactor("*", "*", testing.ObjectReaction(o, api.Registry.RESTMapper())) - fakePtr.AddWatchReactor("*", core.DefaultWatchReactor(watch.NewFake(), nil)) + fakePtr.AddWatchReactor("*", testing.DefaultWatchReactor(watch.NewFake(), nil)) return &Clientset{fakePtr} } @@ -52,7 +52,7 @@ func NewSimpleClientset(objects ...runtime.Object) *Clientset { // struct to get a default implementation. This makes faking out just the method // you want to test easier. type Clientset struct { - core.Fake + testing.Fake } func (c *Clientset) Discovery() discovery.DiscoveryInterface { diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/BUILD b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/BUILD index c1d8b2838ae..3950b38e3a8 100644 --- a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/BUILD +++ b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/BUILD @@ -18,13 +18,13 @@ go_library( deps = [ "//cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1:go_default_library", "//cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1:go_default_library", - "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/testing", ], ) diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/fake_apiregistration_client.go b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/fake_apiregistration_client.go index 48040a273dc..d8d73d00a6d 100644 --- a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/fake_apiregistration_client.go +++ b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/fake_apiregistration_client.go @@ -18,12 +18,12 @@ package fake import ( rest "k8s.io/client-go/rest" + testing "k8s.io/client-go/testing" v1alpha1 "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1" - core "k8s.io/kubernetes/pkg/client/testing/core" ) type FakeApiregistrationV1alpha1 struct { - *core.Fake + *testing.Fake } func (c *FakeApiregistrationV1alpha1) APIServices() v1alpha1.APIServiceInterface { diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/fake_apiservice.go b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/fake_apiservice.go index 308fb1cda9d..9dada75dd60 100644 --- a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/fake_apiservice.go +++ b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/fake_apiservice.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" v1alpha1 "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeAPIServices implements APIServiceInterface @@ -35,7 +35,7 @@ var apiservicesResource = schema.GroupVersionResource{Group: "apiregistration.k8 func (c *FakeAPIServices) Create(aPIService *v1alpha1.APIService) (result *v1alpha1.APIService, err error) { obj, err := c.Fake. - Invokes(core.NewRootCreateAction(apiservicesResource, aPIService), &v1alpha1.APIService{}) + Invokes(testing.NewRootCreateAction(apiservicesResource, aPIService), &v1alpha1.APIService{}) if obj == nil { return nil, err } @@ -44,7 +44,7 @@ func (c *FakeAPIServices) Create(aPIService *v1alpha1.APIService) (result *v1alp func (c *FakeAPIServices) Update(aPIService *v1alpha1.APIService) (result *v1alpha1.APIService, err error) { obj, err := c.Fake. - Invokes(core.NewRootUpdateAction(apiservicesResource, aPIService), &v1alpha1.APIService{}) + Invokes(testing.NewRootUpdateAction(apiservicesResource, aPIService), &v1alpha1.APIService{}) if obj == nil { return nil, err } @@ -53,7 +53,7 @@ func (c *FakeAPIServices) Update(aPIService *v1alpha1.APIService) (result *v1alp func (c *FakeAPIServices) UpdateStatus(aPIService *v1alpha1.APIService) (*v1alpha1.APIService, error) { obj, err := c.Fake. - Invokes(core.NewRootUpdateSubresourceAction(apiservicesResource, "status", aPIService), &v1alpha1.APIService{}) + Invokes(testing.NewRootUpdateSubresourceAction(apiservicesResource, "status", aPIService), &v1alpha1.APIService{}) if obj == nil { return nil, err } @@ -62,12 +62,12 @@ func (c *FakeAPIServices) UpdateStatus(aPIService *v1alpha1.APIService) (*v1alph func (c *FakeAPIServices) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewRootDeleteAction(apiservicesResource, name), &v1alpha1.APIService{}) + Invokes(testing.NewRootDeleteAction(apiservicesResource, name), &v1alpha1.APIService{}) return err } func (c *FakeAPIServices) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := core.NewRootDeleteCollectionAction(apiservicesResource, listOptions) + action := testing.NewRootDeleteCollectionAction(apiservicesResource, listOptions) _, err := c.Fake.Invokes(action, &v1alpha1.APIServiceList{}) return err @@ -75,7 +75,7 @@ func (c *FakeAPIServices) DeleteCollection(options *v1.DeleteOptions, listOption func (c *FakeAPIServices) Get(name string, options v1.GetOptions) (result *v1alpha1.APIService, err error) { obj, err := c.Fake. - Invokes(core.NewRootGetAction(apiservicesResource, name), &v1alpha1.APIService{}) + Invokes(testing.NewRootGetAction(apiservicesResource, name), &v1alpha1.APIService{}) if obj == nil { return nil, err } @@ -84,12 +84,12 @@ func (c *FakeAPIServices) Get(name string, options v1.GetOptions) (result *v1alp func (c *FakeAPIServices) List(opts v1.ListOptions) (result *v1alpha1.APIServiceList, err error) { obj, err := c.Fake. - Invokes(core.NewRootListAction(apiservicesResource, opts), &v1alpha1.APIServiceList{}) + Invokes(testing.NewRootListAction(apiservicesResource, opts), &v1alpha1.APIServiceList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -105,13 +105,13 @@ func (c *FakeAPIServices) List(opts v1.ListOptions) (result *v1alpha1.APIService // Watch returns a watch.Interface that watches the requested aPIServices. func (c *FakeAPIServices) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewRootWatchAction(apiservicesResource, opts)) + InvokesWatch(testing.NewRootWatchAction(apiservicesResource, opts)) } // Patch applies the patch and returns the patched aPIService. func (c *FakeAPIServices) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1alpha1.APIService, err error) { obj, err := c.Fake. - Invokes(core.NewRootPatchSubresourceAction(apiservicesResource, name, data, subresources...), &v1alpha1.APIService{}) + Invokes(testing.NewRootPatchSubresourceAction(apiservicesResource, name, data, subresources...), &v1alpha1.APIService{}) if obj == nil { return nil, err } diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/fake/BUILD b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/fake/BUILD index a06d5fe66de..8d790a28b60 100644 --- a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/fake/BUILD +++ b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/fake/BUILD @@ -19,11 +19,11 @@ go_library( "//cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion:go_default_library", "//cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake:go_default_library", "//pkg/api:go_default_library", - "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/client-go/discovery", "//vendor:k8s.io/client-go/discovery/fake", + "//vendor:k8s.io/client-go/testing", ], ) diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/fake/clientset_generated.go b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/fake/clientset_generated.go index 4b13c4f4ab4..a049eb99ce3 100644 --- a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/fake/clientset_generated.go +++ b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/fake/clientset_generated.go @@ -21,11 +21,11 @@ import ( "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/discovery" fakediscovery "k8s.io/client-go/discovery/fake" + "k8s.io/client-go/testing" clientset "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset" internalversionapiregistration "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion" fakeinternalversionapiregistration "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client/testing/core" ) // NewSimpleClientset returns a clientset that will respond with the provided objects. @@ -33,17 +33,17 @@ import ( // without applying any validations and/or defaults. It shouldn't be considered a replacement // for a real clientset and is mostly useful in simple unit tests. func NewSimpleClientset(objects ...runtime.Object) *Clientset { - o := core.NewObjectTracker(api.Scheme, api.Codecs.UniversalDecoder()) + o := testing.NewObjectTracker(api.Registry, api.Scheme, api.Codecs.UniversalDecoder()) for _, obj := range objects { if err := o.Add(obj); err != nil { panic(err) } } - fakePtr := core.Fake{} - fakePtr.AddReactor("*", "*", core.ObjectReaction(o, api.Registry.RESTMapper())) + fakePtr := testing.Fake{} + fakePtr.AddReactor("*", "*", testing.ObjectReaction(o, api.Registry.RESTMapper())) - fakePtr.AddWatchReactor("*", core.DefaultWatchReactor(watch.NewFake(), nil)) + fakePtr.AddWatchReactor("*", testing.DefaultWatchReactor(watch.NewFake(), nil)) return &Clientset{fakePtr} } @@ -52,7 +52,7 @@ func NewSimpleClientset(objects ...runtime.Object) *Clientset { // struct to get a default implementation. This makes faking out just the method // you want to test easier. type Clientset struct { - core.Fake + testing.Fake } func (c *Clientset) Discovery() discovery.DiscoveryInterface { diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/BUILD b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/BUILD index 906a253c1e5..8e1e7a69156 100644 --- a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/BUILD +++ b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/BUILD @@ -18,13 +18,13 @@ go_library( deps = [ "//cmd/kube-aggregator/pkg/apis/apiregistration:go_default_library", "//cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion:go_default_library", - "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/testing", ], ) diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/fake_apiregistration_client.go b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/fake_apiregistration_client.go index 4d9020e8beb..460f3303ce9 100644 --- a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/fake_apiregistration_client.go +++ b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/fake_apiregistration_client.go @@ -18,12 +18,12 @@ package fake import ( rest "k8s.io/client-go/rest" + testing "k8s.io/client-go/testing" internalversion "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion" - core "k8s.io/kubernetes/pkg/client/testing/core" ) type FakeApiregistration struct { - *core.Fake + *testing.Fake } func (c *FakeApiregistration) APIServices() internalversion.APIServiceInterface { diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/fake_apiservice.go b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/fake_apiservice.go index dc4773974e2..33e94a8b918 100644 --- a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/fake_apiservice.go +++ b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/fake_apiservice.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" apiregistration "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeAPIServices implements APIServiceInterface @@ -35,7 +35,7 @@ var apiservicesResource = schema.GroupVersionResource{Group: "apiregistration.k8 func (c *FakeAPIServices) Create(aPIService *apiregistration.APIService) (result *apiregistration.APIService, err error) { obj, err := c.Fake. - Invokes(core.NewRootCreateAction(apiservicesResource, aPIService), &apiregistration.APIService{}) + Invokes(testing.NewRootCreateAction(apiservicesResource, aPIService), &apiregistration.APIService{}) if obj == nil { return nil, err } @@ -44,7 +44,7 @@ func (c *FakeAPIServices) Create(aPIService *apiregistration.APIService) (result func (c *FakeAPIServices) Update(aPIService *apiregistration.APIService) (result *apiregistration.APIService, err error) { obj, err := c.Fake. - Invokes(core.NewRootUpdateAction(apiservicesResource, aPIService), &apiregistration.APIService{}) + Invokes(testing.NewRootUpdateAction(apiservicesResource, aPIService), &apiregistration.APIService{}) if obj == nil { return nil, err } @@ -53,7 +53,7 @@ func (c *FakeAPIServices) Update(aPIService *apiregistration.APIService) (result func (c *FakeAPIServices) UpdateStatus(aPIService *apiregistration.APIService) (*apiregistration.APIService, error) { obj, err := c.Fake. - Invokes(core.NewRootUpdateSubresourceAction(apiservicesResource, "status", aPIService), &apiregistration.APIService{}) + Invokes(testing.NewRootUpdateSubresourceAction(apiservicesResource, "status", aPIService), &apiregistration.APIService{}) if obj == nil { return nil, err } @@ -62,12 +62,12 @@ func (c *FakeAPIServices) UpdateStatus(aPIService *apiregistration.APIService) ( func (c *FakeAPIServices) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewRootDeleteAction(apiservicesResource, name), &apiregistration.APIService{}) + Invokes(testing.NewRootDeleteAction(apiservicesResource, name), &apiregistration.APIService{}) return err } func (c *FakeAPIServices) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := core.NewRootDeleteCollectionAction(apiservicesResource, listOptions) + action := testing.NewRootDeleteCollectionAction(apiservicesResource, listOptions) _, err := c.Fake.Invokes(action, &apiregistration.APIServiceList{}) return err @@ -75,7 +75,7 @@ func (c *FakeAPIServices) DeleteCollection(options *v1.DeleteOptions, listOption func (c *FakeAPIServices) Get(name string, options v1.GetOptions) (result *apiregistration.APIService, err error) { obj, err := c.Fake. - Invokes(core.NewRootGetAction(apiservicesResource, name), &apiregistration.APIService{}) + Invokes(testing.NewRootGetAction(apiservicesResource, name), &apiregistration.APIService{}) if obj == nil { return nil, err } @@ -84,12 +84,12 @@ func (c *FakeAPIServices) Get(name string, options v1.GetOptions) (result *apire func (c *FakeAPIServices) List(opts v1.ListOptions) (result *apiregistration.APIServiceList, err error) { obj, err := c.Fake. - Invokes(core.NewRootListAction(apiservicesResource, opts), &apiregistration.APIServiceList{}) + Invokes(testing.NewRootListAction(apiservicesResource, opts), &apiregistration.APIServiceList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -105,13 +105,13 @@ func (c *FakeAPIServices) List(opts v1.ListOptions) (result *apiregistration.API // Watch returns a watch.Interface that watches the requested aPIServices. func (c *FakeAPIServices) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewRootWatchAction(apiservicesResource, opts)) + InvokesWatch(testing.NewRootWatchAction(apiservicesResource, opts)) } // Patch applies the patch and returns the patched aPIService. func (c *FakeAPIServices) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *apiregistration.APIService, err error) { obj, err := c.Fake. - Invokes(core.NewRootPatchSubresourceAction(apiservicesResource, name, data, subresources...), &apiregistration.APIService{}) + Invokes(testing.NewRootPatchSubresourceAction(apiservicesResource, name, data, subresources...), &apiregistration.APIService{}) if obj == nil { return nil, err } diff --git a/cmd/libs/go2idl/client-gen/generators/fake/generator_fake_for_clientset.go b/cmd/libs/go2idl/client-gen/generators/fake/generator_fake_for_clientset.go index 26a1afca854..a9420b712d6 100644 --- a/cmd/libs/go2idl/client-gen/generators/fake/generator_fake_for_clientset.go +++ b/cmd/libs/go2idl/client-gen/generators/fake/generator_fake_for_clientset.go @@ -70,7 +70,7 @@ func (g *genClientset) Imports(c *generator.Context) (imports []string) { // imports for the code in commonTemplate imports = append(imports, "k8s.io/kubernetes/pkg/api", - "k8s.io/kubernetes/pkg/client/testing/core", + "k8s.io/client-go/testing", "k8s.io/client-go/discovery", "fakediscovery \"k8s.io/client-go/discovery/fake\"", "k8s.io/apimachinery/pkg/runtime", @@ -109,17 +109,17 @@ var common = ` // without applying any validations and/or defaults. It shouldn't be considered a replacement // for a real clientset and is mostly useful in simple unit tests. func NewSimpleClientset(objects ...runtime.Object) *Clientset { - o := core.NewObjectTracker(api.Scheme, api.Codecs.UniversalDecoder()) + o := testing.NewObjectTracker(api.Registry, api.Scheme, api.Codecs.UniversalDecoder()) for _, obj := range objects { if err := o.Add(obj); err != nil { panic(err) } } - fakePtr := core.Fake{} - fakePtr.AddReactor("*", "*", core.ObjectReaction(o, api.Registry.RESTMapper())) + fakePtr := testing.Fake{} + fakePtr.AddReactor("*", "*", testing.ObjectReaction(o, api.Registry.RESTMapper())) - fakePtr.AddWatchReactor("*", core.DefaultWatchReactor(watch.NewFake(), nil)) + fakePtr.AddWatchReactor("*", testing.DefaultWatchReactor(watch.NewFake(), nil)) return &Clientset{fakePtr} } @@ -128,7 +128,7 @@ func NewSimpleClientset(objects ...runtime.Object) *Clientset { // struct to get a default implementation. This makes faking out just the method // you want to test easier. type Clientset struct { - core.Fake + testing.Fake } func (c *Clientset) Discovery() discovery.DiscoveryInterface { diff --git a/cmd/libs/go2idl/client-gen/generators/fake/generator_fake_for_group.go b/cmd/libs/go2idl/client-gen/generators/fake/generator_fake_for_group.go index e39137141db..42d1f4ee2ee 100644 --- a/cmd/libs/go2idl/client-gen/generators/fake/generator_fake_for_group.go +++ b/cmd/libs/go2idl/client-gen/generators/fake/generator_fake_for_group.go @@ -59,7 +59,7 @@ func (g *genFakeForGroup) Imports(c *generator.Context) (imports []string) { func (g *genFakeForGroup) GenerateType(c *generator.Context, t *types.Type, w io.Writer) error { sw := generator.NewSnippetWriter(w, c, "$", "$") - const pkgTestingCore = "k8s.io/kubernetes/pkg/client/testing/core" + const pkgTestingCore = "k8s.io/client-go/testing" const pkgRESTClient = "k8s.io/client-go/rest" m := map[string]interface{}{ "group": g.group, diff --git a/cmd/libs/go2idl/client-gen/generators/fake/generator_fake_for_type.go b/cmd/libs/go2idl/client-gen/generators/fake/generator_fake_for_type.go index cd93f395ffd..cdb50a0f4bc 100644 --- a/cmd/libs/go2idl/client-gen/generators/fake/generator_fake_for_type.go +++ b/cmd/libs/go2idl/client-gen/generators/fake/generator_fake_for_type.go @@ -87,7 +87,7 @@ func hasObjectMeta(t *types.Type) bool { func (g *genFakeForType) GenerateType(c *generator.Context, t *types.Type, w io.Writer) error { sw := generator.NewSnippetWriter(w, c, "$", "$") pkg := filepath.Base(t.Name.Package) - const pkgTestingCore = "k8s.io/kubernetes/pkg/client/testing/core" + const pkgTestingCore = "k8s.io/client-go/testing" namespaced := !extractBoolTagOrDie("nonNamespaced", t.SecondClosestCommentLines) canonicalGroup := g.group if canonicalGroup == "core" { diff --git a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/fake/BUILD b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/fake/BUILD index 8faa4abebed..37e503add50 100644 --- a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/fake/BUILD +++ b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/fake/BUILD @@ -19,11 +19,11 @@ go_library( "//cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion:go_default_library", "//cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake:go_default_library", "//pkg/api:go_default_library", - "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/client-go/discovery", "//vendor:k8s.io/client-go/discovery/fake", + "//vendor:k8s.io/client-go/testing", ], ) diff --git a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/fake/clientset_generated.go b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/fake/clientset_generated.go index 6df0e2f63b0..41f924336d6 100644 --- a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/fake/clientset_generated.go +++ b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/fake/clientset_generated.go @@ -21,11 +21,11 @@ import ( "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/discovery" fakediscovery "k8s.io/client-go/discovery/fake" + "k8s.io/client-go/testing" clientset "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset" internalversiontestgroup "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion" fakeinternalversiontestgroup "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client/testing/core" ) // NewSimpleClientset returns a clientset that will respond with the provided objects. @@ -33,17 +33,17 @@ import ( // without applying any validations and/or defaults. It shouldn't be considered a replacement // for a real clientset and is mostly useful in simple unit tests. func NewSimpleClientset(objects ...runtime.Object) *Clientset { - o := core.NewObjectTracker(api.Scheme, api.Codecs.UniversalDecoder()) + o := testing.NewObjectTracker(api.Registry, api.Scheme, api.Codecs.UniversalDecoder()) for _, obj := range objects { if err := o.Add(obj); err != nil { panic(err) } } - fakePtr := core.Fake{} - fakePtr.AddReactor("*", "*", core.ObjectReaction(o, api.Registry.RESTMapper())) + fakePtr := testing.Fake{} + fakePtr.AddReactor("*", "*", testing.ObjectReaction(o, api.Registry.RESTMapper())) - fakePtr.AddWatchReactor("*", core.DefaultWatchReactor(watch.NewFake(), nil)) + fakePtr.AddWatchReactor("*", testing.DefaultWatchReactor(watch.NewFake(), nil)) return &Clientset{fakePtr} } @@ -52,7 +52,7 @@ func NewSimpleClientset(objects ...runtime.Object) *Clientset { // struct to get a default implementation. This makes faking out just the method // you want to test easier. type Clientset struct { - core.Fake + testing.Fake } func (c *Clientset) Discovery() discovery.DiscoveryInterface { diff --git a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake/BUILD b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake/BUILD index b5b8992d81c..379d0bbd73b 100644 --- a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake/BUILD +++ b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake/BUILD @@ -18,13 +18,13 @@ go_library( deps = [ "//cmd/libs/go2idl/client-gen/test_apis/testgroup:go_default_library", "//cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion:go_default_library", - "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/testing", ], ) diff --git a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake/fake_testgroup_client.go b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake/fake_testgroup_client.go index 63669d98d37..f8ed8e9aba2 100644 --- a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake/fake_testgroup_client.go +++ b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake/fake_testgroup_client.go @@ -18,12 +18,12 @@ package fake import ( rest "k8s.io/client-go/rest" + testing "k8s.io/client-go/testing" internalversion "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion" - core "k8s.io/kubernetes/pkg/client/testing/core" ) type FakeTestgroup struct { - *core.Fake + *testing.Fake } func (c *FakeTestgroup) TestTypes(namespace string) internalversion.TestTypeInterface { diff --git a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake/fake_testtype.go b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake/fake_testtype.go index 284e065d1f8..b3617ecbc01 100644 --- a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake/fake_testtype.go +++ b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake/fake_testtype.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" testgroup "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeTestTypes implements TestTypeInterface @@ -36,7 +36,7 @@ var testtypesResource = schema.GroupVersionResource{Group: "testgroup.k8s.io", V func (c *FakeTestTypes) Create(testType *testgroup.TestType) (result *testgroup.TestType, err error) { obj, err := c.Fake. - Invokes(core.NewCreateAction(testtypesResource, c.ns, testType), &testgroup.TestType{}) + Invokes(testing.NewCreateAction(testtypesResource, c.ns, testType), &testgroup.TestType{}) if obj == nil { return nil, err @@ -46,7 +46,7 @@ func (c *FakeTestTypes) Create(testType *testgroup.TestType) (result *testgroup. func (c *FakeTestTypes) Update(testType *testgroup.TestType) (result *testgroup.TestType, err error) { obj, err := c.Fake. - Invokes(core.NewUpdateAction(testtypesResource, c.ns, testType), &testgroup.TestType{}) + Invokes(testing.NewUpdateAction(testtypesResource, c.ns, testType), &testgroup.TestType{}) if obj == nil { return nil, err @@ -56,7 +56,7 @@ func (c *FakeTestTypes) Update(testType *testgroup.TestType) (result *testgroup. func (c *FakeTestTypes) UpdateStatus(testType *testgroup.TestType) (*testgroup.TestType, error) { obj, err := c.Fake. - Invokes(core.NewUpdateSubresourceAction(testtypesResource, "status", c.ns, testType), &testgroup.TestType{}) + Invokes(testing.NewUpdateSubresourceAction(testtypesResource, "status", c.ns, testType), &testgroup.TestType{}) if obj == nil { return nil, err @@ -66,13 +66,13 @@ func (c *FakeTestTypes) UpdateStatus(testType *testgroup.TestType) (*testgroup.T func (c *FakeTestTypes) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewDeleteAction(testtypesResource, c.ns, name), &testgroup.TestType{}) + Invokes(testing.NewDeleteAction(testtypesResource, c.ns, name), &testgroup.TestType{}) return err } func (c *FakeTestTypes) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := core.NewDeleteCollectionAction(testtypesResource, c.ns, listOptions) + action := testing.NewDeleteCollectionAction(testtypesResource, c.ns, listOptions) _, err := c.Fake.Invokes(action, &testgroup.TestTypeList{}) return err @@ -80,7 +80,7 @@ func (c *FakeTestTypes) DeleteCollection(options *v1.DeleteOptions, listOptions func (c *FakeTestTypes) Get(name string, options v1.GetOptions) (result *testgroup.TestType, err error) { obj, err := c.Fake. - Invokes(core.NewGetAction(testtypesResource, c.ns, name), &testgroup.TestType{}) + Invokes(testing.NewGetAction(testtypesResource, c.ns, name), &testgroup.TestType{}) if obj == nil { return nil, err @@ -90,13 +90,13 @@ func (c *FakeTestTypes) Get(name string, options v1.GetOptions) (result *testgro func (c *FakeTestTypes) List(opts v1.ListOptions) (result *testgroup.TestTypeList, err error) { obj, err := c.Fake. - Invokes(core.NewListAction(testtypesResource, c.ns, opts), &testgroup.TestTypeList{}) + Invokes(testing.NewListAction(testtypesResource, c.ns, opts), &testgroup.TestTypeList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -112,14 +112,14 @@ func (c *FakeTestTypes) List(opts v1.ListOptions) (result *testgroup.TestTypeLis // Watch returns a watch.Interface that watches the requested testTypes. func (c *FakeTestTypes) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewWatchAction(testtypesResource, c.ns, opts)) + InvokesWatch(testing.NewWatchAction(testtypesResource, c.ns, opts)) } // Patch applies the patch and returns the patched testType. func (c *FakeTestTypes) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *testgroup.TestType, err error) { obj, err := c.Fake. - Invokes(core.NewPatchSubresourceAction(testtypesResource, c.ns, name, data, subresources...), &testgroup.TestType{}) + Invokes(testing.NewPatchSubresourceAction(testtypesResource, c.ns, name, data, subresources...), &testgroup.TestType{}) if obj == nil { return nil, err diff --git a/federation/client/clientset_generated/federation_clientset/fake/BUILD b/federation/client/clientset_generated/federation_clientset/fake/BUILD index 1d416772182..2f186251124 100644 --- a/federation/client/clientset_generated/federation_clientset/fake/BUILD +++ b/federation/client/clientset_generated/federation_clientset/fake/BUILD @@ -27,11 +27,11 @@ go_library( "//federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1:go_default_library", "//federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/fake:go_default_library", "//pkg/api:go_default_library", - "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/client-go/discovery", "//vendor:k8s.io/client-go/discovery/fake", + "//vendor:k8s.io/client-go/testing", ], ) diff --git a/federation/client/clientset_generated/federation_clientset/fake/clientset_generated.go b/federation/client/clientset_generated/federation_clientset/fake/clientset_generated.go index 6dca6fed7fc..17e670b748b 100644 --- a/federation/client/clientset_generated/federation_clientset/fake/clientset_generated.go +++ b/federation/client/clientset_generated/federation_clientset/fake/clientset_generated.go @@ -21,6 +21,7 @@ import ( "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/discovery" fakediscovery "k8s.io/client-go/discovery/fake" + "k8s.io/client-go/testing" clientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset" v1autoscaling "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/typed/autoscaling/v1" fakev1autoscaling "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/typed/autoscaling/v1/fake" @@ -33,7 +34,6 @@ import ( v1beta1federation "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1" fakev1beta1federation "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/fake" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client/testing/core" ) // NewSimpleClientset returns a clientset that will respond with the provided objects. @@ -41,17 +41,17 @@ import ( // without applying any validations and/or defaults. It shouldn't be considered a replacement // for a real clientset and is mostly useful in simple unit tests. func NewSimpleClientset(objects ...runtime.Object) *Clientset { - o := core.NewObjectTracker(api.Scheme, api.Codecs.UniversalDecoder()) + o := testing.NewObjectTracker(api.Registry, api.Scheme, api.Codecs.UniversalDecoder()) for _, obj := range objects { if err := o.Add(obj); err != nil { panic(err) } } - fakePtr := core.Fake{} - fakePtr.AddReactor("*", "*", core.ObjectReaction(o, api.Registry.RESTMapper())) + fakePtr := testing.Fake{} + fakePtr.AddReactor("*", "*", testing.ObjectReaction(o, api.Registry.RESTMapper())) - fakePtr.AddWatchReactor("*", core.DefaultWatchReactor(watch.NewFake(), nil)) + fakePtr.AddWatchReactor("*", testing.DefaultWatchReactor(watch.NewFake(), nil)) return &Clientset{fakePtr} } @@ -60,7 +60,7 @@ func NewSimpleClientset(objects ...runtime.Object) *Clientset { // struct to get a default implementation. This makes faking out just the method // you want to test easier. type Clientset struct { - core.Fake + testing.Fake } func (c *Clientset) Discovery() discovery.DiscoveryInterface { diff --git a/federation/client/clientset_generated/federation_clientset/typed/autoscaling/v1/fake/BUILD b/federation/client/clientset_generated/federation_clientset/typed/autoscaling/v1/fake/BUILD index 4838d9189ac..907aa8cf443 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/autoscaling/v1/fake/BUILD +++ b/federation/client/clientset_generated/federation_clientset/typed/autoscaling/v1/fake/BUILD @@ -18,13 +18,13 @@ go_library( deps = [ "//federation/client/clientset_generated/federation_clientset/typed/autoscaling/v1:go_default_library", "//pkg/apis/autoscaling/v1:go_default_library", - "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/testing", ], ) diff --git a/federation/client/clientset_generated/federation_clientset/typed/autoscaling/v1/fake/fake_autoscaling_client.go b/federation/client/clientset_generated/federation_clientset/typed/autoscaling/v1/fake/fake_autoscaling_client.go index 8d005c87309..f6ec657c445 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/autoscaling/v1/fake/fake_autoscaling_client.go +++ b/federation/client/clientset_generated/federation_clientset/typed/autoscaling/v1/fake/fake_autoscaling_client.go @@ -18,12 +18,12 @@ package fake import ( rest "k8s.io/client-go/rest" + testing "k8s.io/client-go/testing" v1 "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/typed/autoscaling/v1" - core "k8s.io/kubernetes/pkg/client/testing/core" ) type FakeAutoscalingV1 struct { - *core.Fake + *testing.Fake } func (c *FakeAutoscalingV1) HorizontalPodAutoscalers(namespace string) v1.HorizontalPodAutoscalerInterface { diff --git a/federation/client/clientset_generated/federation_clientset/typed/autoscaling/v1/fake/fake_horizontalpodautoscaler.go b/federation/client/clientset_generated/federation_clientset/typed/autoscaling/v1/fake/fake_horizontalpodautoscaler.go index 5a97833e3bf..df3436867cc 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/autoscaling/v1/fake/fake_horizontalpodautoscaler.go +++ b/federation/client/clientset_generated/federation_clientset/typed/autoscaling/v1/fake/fake_horizontalpodautoscaler.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" v1 "k8s.io/kubernetes/pkg/apis/autoscaling/v1" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeHorizontalPodAutoscalers implements HorizontalPodAutoscalerInterface @@ -36,7 +36,7 @@ var horizontalpodautoscalersResource = schema.GroupVersionResource{Group: "autos func (c *FakeHorizontalPodAutoscalers) Create(horizontalPodAutoscaler *v1.HorizontalPodAutoscaler) (result *v1.HorizontalPodAutoscaler, err error) { obj, err := c.Fake. - Invokes(core.NewCreateAction(horizontalpodautoscalersResource, c.ns, horizontalPodAutoscaler), &v1.HorizontalPodAutoscaler{}) + Invokes(testing.NewCreateAction(horizontalpodautoscalersResource, c.ns, horizontalPodAutoscaler), &v1.HorizontalPodAutoscaler{}) if obj == nil { return nil, err @@ -46,7 +46,7 @@ func (c *FakeHorizontalPodAutoscalers) Create(horizontalPodAutoscaler *v1.Horizo func (c *FakeHorizontalPodAutoscalers) Update(horizontalPodAutoscaler *v1.HorizontalPodAutoscaler) (result *v1.HorizontalPodAutoscaler, err error) { obj, err := c.Fake. - Invokes(core.NewUpdateAction(horizontalpodautoscalersResource, c.ns, horizontalPodAutoscaler), &v1.HorizontalPodAutoscaler{}) + Invokes(testing.NewUpdateAction(horizontalpodautoscalersResource, c.ns, horizontalPodAutoscaler), &v1.HorizontalPodAutoscaler{}) if obj == nil { return nil, err @@ -56,7 +56,7 @@ func (c *FakeHorizontalPodAutoscalers) Update(horizontalPodAutoscaler *v1.Horizo func (c *FakeHorizontalPodAutoscalers) UpdateStatus(horizontalPodAutoscaler *v1.HorizontalPodAutoscaler) (*v1.HorizontalPodAutoscaler, error) { obj, err := c.Fake. - Invokes(core.NewUpdateSubresourceAction(horizontalpodautoscalersResource, "status", c.ns, horizontalPodAutoscaler), &v1.HorizontalPodAutoscaler{}) + Invokes(testing.NewUpdateSubresourceAction(horizontalpodautoscalersResource, "status", c.ns, horizontalPodAutoscaler), &v1.HorizontalPodAutoscaler{}) if obj == nil { return nil, err @@ -66,13 +66,13 @@ func (c *FakeHorizontalPodAutoscalers) UpdateStatus(horizontalPodAutoscaler *v1. func (c *FakeHorizontalPodAutoscalers) Delete(name string, options *meta_v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewDeleteAction(horizontalpodautoscalersResource, c.ns, name), &v1.HorizontalPodAutoscaler{}) + Invokes(testing.NewDeleteAction(horizontalpodautoscalersResource, c.ns, name), &v1.HorizontalPodAutoscaler{}) return err } func (c *FakeHorizontalPodAutoscalers) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error { - action := core.NewDeleteCollectionAction(horizontalpodautoscalersResource, c.ns, listOptions) + action := testing.NewDeleteCollectionAction(horizontalpodautoscalersResource, c.ns, listOptions) _, err := c.Fake.Invokes(action, &v1.HorizontalPodAutoscalerList{}) return err @@ -80,7 +80,7 @@ func (c *FakeHorizontalPodAutoscalers) DeleteCollection(options *meta_v1.DeleteO func (c *FakeHorizontalPodAutoscalers) Get(name string, options meta_v1.GetOptions) (result *v1.HorizontalPodAutoscaler, err error) { obj, err := c.Fake. - Invokes(core.NewGetAction(horizontalpodautoscalersResource, c.ns, name), &v1.HorizontalPodAutoscaler{}) + Invokes(testing.NewGetAction(horizontalpodautoscalersResource, c.ns, name), &v1.HorizontalPodAutoscaler{}) if obj == nil { return nil, err @@ -90,13 +90,13 @@ func (c *FakeHorizontalPodAutoscalers) Get(name string, options meta_v1.GetOptio func (c *FakeHorizontalPodAutoscalers) List(opts meta_v1.ListOptions) (result *v1.HorizontalPodAutoscalerList, err error) { obj, err := c.Fake. - Invokes(core.NewListAction(horizontalpodautoscalersResource, c.ns, opts), &v1.HorizontalPodAutoscalerList{}) + Invokes(testing.NewListAction(horizontalpodautoscalersResource, c.ns, opts), &v1.HorizontalPodAutoscalerList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -112,14 +112,14 @@ func (c *FakeHorizontalPodAutoscalers) List(opts meta_v1.ListOptions) (result *v // Watch returns a watch.Interface that watches the requested horizontalPodAutoscalers. func (c *FakeHorizontalPodAutoscalers) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewWatchAction(horizontalpodautoscalersResource, c.ns, opts)) + InvokesWatch(testing.NewWatchAction(horizontalpodautoscalersResource, c.ns, opts)) } // Patch applies the patch and returns the patched horizontalPodAutoscaler. func (c *FakeHorizontalPodAutoscalers) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.HorizontalPodAutoscaler, err error) { obj, err := c.Fake. - Invokes(core.NewPatchSubresourceAction(horizontalpodautoscalersResource, c.ns, name, data, subresources...), &v1.HorizontalPodAutoscaler{}) + Invokes(testing.NewPatchSubresourceAction(horizontalpodautoscalersResource, c.ns, name, data, subresources...), &v1.HorizontalPodAutoscaler{}) if obj == nil { return nil, err diff --git a/federation/client/clientset_generated/federation_clientset/typed/batch/v1/fake/BUILD b/federation/client/clientset_generated/federation_clientset/typed/batch/v1/fake/BUILD index b43c984a40f..2f0ce3a4ec2 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/batch/v1/fake/BUILD +++ b/federation/client/clientset_generated/federation_clientset/typed/batch/v1/fake/BUILD @@ -18,13 +18,13 @@ go_library( deps = [ "//federation/client/clientset_generated/federation_clientset/typed/batch/v1:go_default_library", "//pkg/apis/batch/v1:go_default_library", - "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/testing", ], ) diff --git a/federation/client/clientset_generated/federation_clientset/typed/batch/v1/fake/fake_batch_client.go b/federation/client/clientset_generated/federation_clientset/typed/batch/v1/fake/fake_batch_client.go index 6cdcb989e4d..332d5d8f4e3 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/batch/v1/fake/fake_batch_client.go +++ b/federation/client/clientset_generated/federation_clientset/typed/batch/v1/fake/fake_batch_client.go @@ -18,12 +18,12 @@ package fake import ( rest "k8s.io/client-go/rest" + testing "k8s.io/client-go/testing" v1 "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/typed/batch/v1" - core "k8s.io/kubernetes/pkg/client/testing/core" ) type FakeBatchV1 struct { - *core.Fake + *testing.Fake } func (c *FakeBatchV1) Jobs(namespace string) v1.JobInterface { diff --git a/federation/client/clientset_generated/federation_clientset/typed/batch/v1/fake/fake_job.go b/federation/client/clientset_generated/federation_clientset/typed/batch/v1/fake/fake_job.go index 5537b124dd5..4e682ee1e5f 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/batch/v1/fake/fake_job.go +++ b/federation/client/clientset_generated/federation_clientset/typed/batch/v1/fake/fake_job.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" v1 "k8s.io/kubernetes/pkg/apis/batch/v1" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeJobs implements JobInterface @@ -36,7 +36,7 @@ var jobsResource = schema.GroupVersionResource{Group: "batch", Version: "v1", Re func (c *FakeJobs) Create(job *v1.Job) (result *v1.Job, err error) { obj, err := c.Fake. - Invokes(core.NewCreateAction(jobsResource, c.ns, job), &v1.Job{}) + Invokes(testing.NewCreateAction(jobsResource, c.ns, job), &v1.Job{}) if obj == nil { return nil, err @@ -46,7 +46,7 @@ func (c *FakeJobs) Create(job *v1.Job) (result *v1.Job, err error) { func (c *FakeJobs) Update(job *v1.Job) (result *v1.Job, err error) { obj, err := c.Fake. - Invokes(core.NewUpdateAction(jobsResource, c.ns, job), &v1.Job{}) + Invokes(testing.NewUpdateAction(jobsResource, c.ns, job), &v1.Job{}) if obj == nil { return nil, err @@ -56,7 +56,7 @@ func (c *FakeJobs) Update(job *v1.Job) (result *v1.Job, err error) { func (c *FakeJobs) UpdateStatus(job *v1.Job) (*v1.Job, error) { obj, err := c.Fake. - Invokes(core.NewUpdateSubresourceAction(jobsResource, "status", c.ns, job), &v1.Job{}) + Invokes(testing.NewUpdateSubresourceAction(jobsResource, "status", c.ns, job), &v1.Job{}) if obj == nil { return nil, err @@ -66,13 +66,13 @@ func (c *FakeJobs) UpdateStatus(job *v1.Job) (*v1.Job, error) { func (c *FakeJobs) Delete(name string, options *meta_v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewDeleteAction(jobsResource, c.ns, name), &v1.Job{}) + Invokes(testing.NewDeleteAction(jobsResource, c.ns, name), &v1.Job{}) return err } func (c *FakeJobs) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error { - action := core.NewDeleteCollectionAction(jobsResource, c.ns, listOptions) + action := testing.NewDeleteCollectionAction(jobsResource, c.ns, listOptions) _, err := c.Fake.Invokes(action, &v1.JobList{}) return err @@ -80,7 +80,7 @@ func (c *FakeJobs) DeleteCollection(options *meta_v1.DeleteOptions, listOptions func (c *FakeJobs) Get(name string, options meta_v1.GetOptions) (result *v1.Job, err error) { obj, err := c.Fake. - Invokes(core.NewGetAction(jobsResource, c.ns, name), &v1.Job{}) + Invokes(testing.NewGetAction(jobsResource, c.ns, name), &v1.Job{}) if obj == nil { return nil, err @@ -90,13 +90,13 @@ func (c *FakeJobs) Get(name string, options meta_v1.GetOptions) (result *v1.Job, func (c *FakeJobs) List(opts meta_v1.ListOptions) (result *v1.JobList, err error) { obj, err := c.Fake. - Invokes(core.NewListAction(jobsResource, c.ns, opts), &v1.JobList{}) + Invokes(testing.NewListAction(jobsResource, c.ns, opts), &v1.JobList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -112,14 +112,14 @@ func (c *FakeJobs) List(opts meta_v1.ListOptions) (result *v1.JobList, err error // Watch returns a watch.Interface that watches the requested jobs. func (c *FakeJobs) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewWatchAction(jobsResource, c.ns, opts)) + InvokesWatch(testing.NewWatchAction(jobsResource, c.ns, opts)) } // Patch applies the patch and returns the patched job. func (c *FakeJobs) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.Job, err error) { obj, err := c.Fake. - Invokes(core.NewPatchSubresourceAction(jobsResource, c.ns, name, data, subresources...), &v1.Job{}) + Invokes(testing.NewPatchSubresourceAction(jobsResource, c.ns, name, data, subresources...), &v1.Job{}) if obj == nil { return nil, err diff --git a/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/BUILD b/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/BUILD index 5b30c920062..d37d0f4ee5e 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/BUILD +++ b/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/BUILD @@ -23,13 +23,13 @@ go_library( deps = [ "//federation/client/clientset_generated/federation_clientset/typed/core/v1:go_default_library", "//pkg/api/v1:go_default_library", - "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/testing", ], ) diff --git a/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_configmap.go b/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_configmap.go index a320a45227f..4cdc6fb33a3 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_configmap.go +++ b/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_configmap.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" v1 "k8s.io/kubernetes/pkg/api/v1" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeConfigMaps implements ConfigMapInterface @@ -36,7 +36,7 @@ var configmapsResource = schema.GroupVersionResource{Group: "", Version: "v1", R func (c *FakeConfigMaps) Create(configMap *v1.ConfigMap) (result *v1.ConfigMap, err error) { obj, err := c.Fake. - Invokes(core.NewCreateAction(configmapsResource, c.ns, configMap), &v1.ConfigMap{}) + Invokes(testing.NewCreateAction(configmapsResource, c.ns, configMap), &v1.ConfigMap{}) if obj == nil { return nil, err @@ -46,7 +46,7 @@ func (c *FakeConfigMaps) Create(configMap *v1.ConfigMap) (result *v1.ConfigMap, func (c *FakeConfigMaps) Update(configMap *v1.ConfigMap) (result *v1.ConfigMap, err error) { obj, err := c.Fake. - Invokes(core.NewUpdateAction(configmapsResource, c.ns, configMap), &v1.ConfigMap{}) + Invokes(testing.NewUpdateAction(configmapsResource, c.ns, configMap), &v1.ConfigMap{}) if obj == nil { return nil, err @@ -56,13 +56,13 @@ func (c *FakeConfigMaps) Update(configMap *v1.ConfigMap) (result *v1.ConfigMap, func (c *FakeConfigMaps) Delete(name string, options *meta_v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewDeleteAction(configmapsResource, c.ns, name), &v1.ConfigMap{}) + Invokes(testing.NewDeleteAction(configmapsResource, c.ns, name), &v1.ConfigMap{}) return err } func (c *FakeConfigMaps) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error { - action := core.NewDeleteCollectionAction(configmapsResource, c.ns, listOptions) + action := testing.NewDeleteCollectionAction(configmapsResource, c.ns, listOptions) _, err := c.Fake.Invokes(action, &v1.ConfigMapList{}) return err @@ -70,7 +70,7 @@ func (c *FakeConfigMaps) DeleteCollection(options *meta_v1.DeleteOptions, listOp func (c *FakeConfigMaps) Get(name string, options meta_v1.GetOptions) (result *v1.ConfigMap, err error) { obj, err := c.Fake. - Invokes(core.NewGetAction(configmapsResource, c.ns, name), &v1.ConfigMap{}) + Invokes(testing.NewGetAction(configmapsResource, c.ns, name), &v1.ConfigMap{}) if obj == nil { return nil, err @@ -80,13 +80,13 @@ func (c *FakeConfigMaps) Get(name string, options meta_v1.GetOptions) (result *v func (c *FakeConfigMaps) List(opts meta_v1.ListOptions) (result *v1.ConfigMapList, err error) { obj, err := c.Fake. - Invokes(core.NewListAction(configmapsResource, c.ns, opts), &v1.ConfigMapList{}) + Invokes(testing.NewListAction(configmapsResource, c.ns, opts), &v1.ConfigMapList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -102,14 +102,14 @@ func (c *FakeConfigMaps) List(opts meta_v1.ListOptions) (result *v1.ConfigMapLis // Watch returns a watch.Interface that watches the requested configMaps. func (c *FakeConfigMaps) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewWatchAction(configmapsResource, c.ns, opts)) + InvokesWatch(testing.NewWatchAction(configmapsResource, c.ns, opts)) } // Patch applies the patch and returns the patched configMap. func (c *FakeConfigMaps) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.ConfigMap, err error) { obj, err := c.Fake. - Invokes(core.NewPatchSubresourceAction(configmapsResource, c.ns, name, data, subresources...), &v1.ConfigMap{}) + Invokes(testing.NewPatchSubresourceAction(configmapsResource, c.ns, name, data, subresources...), &v1.ConfigMap{}) if obj == nil { return nil, err diff --git a/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_core_client.go b/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_core_client.go index a95b91b69df..6e6b30cfe14 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_core_client.go +++ b/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_core_client.go @@ -18,12 +18,12 @@ package fake import ( rest "k8s.io/client-go/rest" + testing "k8s.io/client-go/testing" v1 "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/typed/core/v1" - core "k8s.io/kubernetes/pkg/client/testing/core" ) type FakeCoreV1 struct { - *core.Fake + *testing.Fake } func (c *FakeCoreV1) ConfigMaps(namespace string) v1.ConfigMapInterface { diff --git a/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_event.go b/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_event.go index 611300ee34a..dbdc3d30489 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_event.go +++ b/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_event.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" v1 "k8s.io/kubernetes/pkg/api/v1" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeEvents implements EventInterface @@ -36,7 +36,7 @@ var eventsResource = schema.GroupVersionResource{Group: "", Version: "v1", Resou func (c *FakeEvents) Create(event *v1.Event) (result *v1.Event, err error) { obj, err := c.Fake. - Invokes(core.NewCreateAction(eventsResource, c.ns, event), &v1.Event{}) + Invokes(testing.NewCreateAction(eventsResource, c.ns, event), &v1.Event{}) if obj == nil { return nil, err @@ -46,7 +46,7 @@ func (c *FakeEvents) Create(event *v1.Event) (result *v1.Event, err error) { func (c *FakeEvents) Update(event *v1.Event) (result *v1.Event, err error) { obj, err := c.Fake. - Invokes(core.NewUpdateAction(eventsResource, c.ns, event), &v1.Event{}) + Invokes(testing.NewUpdateAction(eventsResource, c.ns, event), &v1.Event{}) if obj == nil { return nil, err @@ -56,13 +56,13 @@ func (c *FakeEvents) Update(event *v1.Event) (result *v1.Event, err error) { func (c *FakeEvents) Delete(name string, options *meta_v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewDeleteAction(eventsResource, c.ns, name), &v1.Event{}) + Invokes(testing.NewDeleteAction(eventsResource, c.ns, name), &v1.Event{}) return err } func (c *FakeEvents) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error { - action := core.NewDeleteCollectionAction(eventsResource, c.ns, listOptions) + action := testing.NewDeleteCollectionAction(eventsResource, c.ns, listOptions) _, err := c.Fake.Invokes(action, &v1.EventList{}) return err @@ -70,7 +70,7 @@ func (c *FakeEvents) DeleteCollection(options *meta_v1.DeleteOptions, listOption func (c *FakeEvents) Get(name string, options meta_v1.GetOptions) (result *v1.Event, err error) { obj, err := c.Fake. - Invokes(core.NewGetAction(eventsResource, c.ns, name), &v1.Event{}) + Invokes(testing.NewGetAction(eventsResource, c.ns, name), &v1.Event{}) if obj == nil { return nil, err @@ -80,13 +80,13 @@ func (c *FakeEvents) Get(name string, options meta_v1.GetOptions) (result *v1.Ev func (c *FakeEvents) List(opts meta_v1.ListOptions) (result *v1.EventList, err error) { obj, err := c.Fake. - Invokes(core.NewListAction(eventsResource, c.ns, opts), &v1.EventList{}) + Invokes(testing.NewListAction(eventsResource, c.ns, opts), &v1.EventList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -102,14 +102,14 @@ func (c *FakeEvents) List(opts meta_v1.ListOptions) (result *v1.EventList, err e // Watch returns a watch.Interface that watches the requested events. func (c *FakeEvents) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewWatchAction(eventsResource, c.ns, opts)) + InvokesWatch(testing.NewWatchAction(eventsResource, c.ns, opts)) } // Patch applies the patch and returns the patched event. func (c *FakeEvents) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.Event, err error) { obj, err := c.Fake. - Invokes(core.NewPatchSubresourceAction(eventsResource, c.ns, name, data, subresources...), &v1.Event{}) + Invokes(testing.NewPatchSubresourceAction(eventsResource, c.ns, name, data, subresources...), &v1.Event{}) if obj == nil { return nil, err diff --git a/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_namespace.go b/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_namespace.go index 90c6bbd6686..0c6f55fce71 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_namespace.go +++ b/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_namespace.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" v1 "k8s.io/kubernetes/pkg/api/v1" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeNamespaces implements NamespaceInterface @@ -35,7 +35,7 @@ var namespacesResource = schema.GroupVersionResource{Group: "", Version: "v1", R func (c *FakeNamespaces) Create(namespace *v1.Namespace) (result *v1.Namespace, err error) { obj, err := c.Fake. - Invokes(core.NewRootCreateAction(namespacesResource, namespace), &v1.Namespace{}) + Invokes(testing.NewRootCreateAction(namespacesResource, namespace), &v1.Namespace{}) if obj == nil { return nil, err } @@ -44,7 +44,7 @@ func (c *FakeNamespaces) Create(namespace *v1.Namespace) (result *v1.Namespace, func (c *FakeNamespaces) Update(namespace *v1.Namespace) (result *v1.Namespace, err error) { obj, err := c.Fake. - Invokes(core.NewRootUpdateAction(namespacesResource, namespace), &v1.Namespace{}) + Invokes(testing.NewRootUpdateAction(namespacesResource, namespace), &v1.Namespace{}) if obj == nil { return nil, err } @@ -53,7 +53,7 @@ func (c *FakeNamespaces) Update(namespace *v1.Namespace) (result *v1.Namespace, func (c *FakeNamespaces) UpdateStatus(namespace *v1.Namespace) (*v1.Namespace, error) { obj, err := c.Fake. - Invokes(core.NewRootUpdateSubresourceAction(namespacesResource, "status", namespace), &v1.Namespace{}) + Invokes(testing.NewRootUpdateSubresourceAction(namespacesResource, "status", namespace), &v1.Namespace{}) if obj == nil { return nil, err } @@ -62,12 +62,12 @@ func (c *FakeNamespaces) UpdateStatus(namespace *v1.Namespace) (*v1.Namespace, e func (c *FakeNamespaces) Delete(name string, options *meta_v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewRootDeleteAction(namespacesResource, name), &v1.Namespace{}) + Invokes(testing.NewRootDeleteAction(namespacesResource, name), &v1.Namespace{}) return err } func (c *FakeNamespaces) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error { - action := core.NewRootDeleteCollectionAction(namespacesResource, listOptions) + action := testing.NewRootDeleteCollectionAction(namespacesResource, listOptions) _, err := c.Fake.Invokes(action, &v1.NamespaceList{}) return err @@ -75,7 +75,7 @@ func (c *FakeNamespaces) DeleteCollection(options *meta_v1.DeleteOptions, listOp func (c *FakeNamespaces) Get(name string, options meta_v1.GetOptions) (result *v1.Namespace, err error) { obj, err := c.Fake. - Invokes(core.NewRootGetAction(namespacesResource, name), &v1.Namespace{}) + Invokes(testing.NewRootGetAction(namespacesResource, name), &v1.Namespace{}) if obj == nil { return nil, err } @@ -84,12 +84,12 @@ func (c *FakeNamespaces) Get(name string, options meta_v1.GetOptions) (result *v func (c *FakeNamespaces) List(opts meta_v1.ListOptions) (result *v1.NamespaceList, err error) { obj, err := c.Fake. - Invokes(core.NewRootListAction(namespacesResource, opts), &v1.NamespaceList{}) + Invokes(testing.NewRootListAction(namespacesResource, opts), &v1.NamespaceList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -105,13 +105,13 @@ func (c *FakeNamespaces) List(opts meta_v1.ListOptions) (result *v1.NamespaceLis // Watch returns a watch.Interface that watches the requested namespaces. func (c *FakeNamespaces) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewRootWatchAction(namespacesResource, opts)) + InvokesWatch(testing.NewRootWatchAction(namespacesResource, opts)) } // Patch applies the patch and returns the patched namespace. func (c *FakeNamespaces) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.Namespace, err error) { obj, err := c.Fake. - Invokes(core.NewRootPatchSubresourceAction(namespacesResource, name, data, subresources...), &v1.Namespace{}) + Invokes(testing.NewRootPatchSubresourceAction(namespacesResource, name, data, subresources...), &v1.Namespace{}) if obj == nil { return nil, err } diff --git a/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_namespace_expansion.go b/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_namespace_expansion.go index a9e98f50aea..c0799e7b44f 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_namespace_expansion.go +++ b/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_namespace_expansion.go @@ -17,8 +17,8 @@ limitations under the License. package fake import ( + core "k8s.io/client-go/testing" "k8s.io/kubernetes/pkg/api/v1" - "k8s.io/kubernetes/pkg/client/testing/core" ) func (c *FakeNamespaces) Finalize(namespace *v1.Namespace) (*v1.Namespace, error) { diff --git a/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_secret.go b/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_secret.go index 9ed22038566..0d6537dbdbd 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_secret.go +++ b/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_secret.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" v1 "k8s.io/kubernetes/pkg/api/v1" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeSecrets implements SecretInterface @@ -36,7 +36,7 @@ var secretsResource = schema.GroupVersionResource{Group: "", Version: "v1", Reso func (c *FakeSecrets) Create(secret *v1.Secret) (result *v1.Secret, err error) { obj, err := c.Fake. - Invokes(core.NewCreateAction(secretsResource, c.ns, secret), &v1.Secret{}) + Invokes(testing.NewCreateAction(secretsResource, c.ns, secret), &v1.Secret{}) if obj == nil { return nil, err @@ -46,7 +46,7 @@ func (c *FakeSecrets) Create(secret *v1.Secret) (result *v1.Secret, err error) { func (c *FakeSecrets) Update(secret *v1.Secret) (result *v1.Secret, err error) { obj, err := c.Fake. - Invokes(core.NewUpdateAction(secretsResource, c.ns, secret), &v1.Secret{}) + Invokes(testing.NewUpdateAction(secretsResource, c.ns, secret), &v1.Secret{}) if obj == nil { return nil, err @@ -56,13 +56,13 @@ func (c *FakeSecrets) Update(secret *v1.Secret) (result *v1.Secret, err error) { func (c *FakeSecrets) Delete(name string, options *meta_v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewDeleteAction(secretsResource, c.ns, name), &v1.Secret{}) + Invokes(testing.NewDeleteAction(secretsResource, c.ns, name), &v1.Secret{}) return err } func (c *FakeSecrets) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error { - action := core.NewDeleteCollectionAction(secretsResource, c.ns, listOptions) + action := testing.NewDeleteCollectionAction(secretsResource, c.ns, listOptions) _, err := c.Fake.Invokes(action, &v1.SecretList{}) return err @@ -70,7 +70,7 @@ func (c *FakeSecrets) DeleteCollection(options *meta_v1.DeleteOptions, listOptio func (c *FakeSecrets) Get(name string, options meta_v1.GetOptions) (result *v1.Secret, err error) { obj, err := c.Fake. - Invokes(core.NewGetAction(secretsResource, c.ns, name), &v1.Secret{}) + Invokes(testing.NewGetAction(secretsResource, c.ns, name), &v1.Secret{}) if obj == nil { return nil, err @@ -80,13 +80,13 @@ func (c *FakeSecrets) Get(name string, options meta_v1.GetOptions) (result *v1.S func (c *FakeSecrets) List(opts meta_v1.ListOptions) (result *v1.SecretList, err error) { obj, err := c.Fake. - Invokes(core.NewListAction(secretsResource, c.ns, opts), &v1.SecretList{}) + Invokes(testing.NewListAction(secretsResource, c.ns, opts), &v1.SecretList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -102,14 +102,14 @@ func (c *FakeSecrets) List(opts meta_v1.ListOptions) (result *v1.SecretList, err // Watch returns a watch.Interface that watches the requested secrets. func (c *FakeSecrets) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewWatchAction(secretsResource, c.ns, opts)) + InvokesWatch(testing.NewWatchAction(secretsResource, c.ns, opts)) } // Patch applies the patch and returns the patched secret. func (c *FakeSecrets) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.Secret, err error) { obj, err := c.Fake. - Invokes(core.NewPatchSubresourceAction(secretsResource, c.ns, name, data, subresources...), &v1.Secret{}) + Invokes(testing.NewPatchSubresourceAction(secretsResource, c.ns, name, data, subresources...), &v1.Secret{}) if obj == nil { return nil, err diff --git a/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_service.go b/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_service.go index ba891a36f89..d106086d483 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_service.go +++ b/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_service.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" v1 "k8s.io/kubernetes/pkg/api/v1" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeServices implements ServiceInterface @@ -36,7 +36,7 @@ var servicesResource = schema.GroupVersionResource{Group: "", Version: "v1", Res func (c *FakeServices) Create(service *v1.Service) (result *v1.Service, err error) { obj, err := c.Fake. - Invokes(core.NewCreateAction(servicesResource, c.ns, service), &v1.Service{}) + Invokes(testing.NewCreateAction(servicesResource, c.ns, service), &v1.Service{}) if obj == nil { return nil, err @@ -46,7 +46,7 @@ func (c *FakeServices) Create(service *v1.Service) (result *v1.Service, err erro func (c *FakeServices) Update(service *v1.Service) (result *v1.Service, err error) { obj, err := c.Fake. - Invokes(core.NewUpdateAction(servicesResource, c.ns, service), &v1.Service{}) + Invokes(testing.NewUpdateAction(servicesResource, c.ns, service), &v1.Service{}) if obj == nil { return nil, err @@ -56,7 +56,7 @@ func (c *FakeServices) Update(service *v1.Service) (result *v1.Service, err erro func (c *FakeServices) UpdateStatus(service *v1.Service) (*v1.Service, error) { obj, err := c.Fake. - Invokes(core.NewUpdateSubresourceAction(servicesResource, "status", c.ns, service), &v1.Service{}) + Invokes(testing.NewUpdateSubresourceAction(servicesResource, "status", c.ns, service), &v1.Service{}) if obj == nil { return nil, err @@ -66,13 +66,13 @@ func (c *FakeServices) UpdateStatus(service *v1.Service) (*v1.Service, error) { func (c *FakeServices) Delete(name string, options *meta_v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewDeleteAction(servicesResource, c.ns, name), &v1.Service{}) + Invokes(testing.NewDeleteAction(servicesResource, c.ns, name), &v1.Service{}) return err } func (c *FakeServices) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error { - action := core.NewDeleteCollectionAction(servicesResource, c.ns, listOptions) + action := testing.NewDeleteCollectionAction(servicesResource, c.ns, listOptions) _, err := c.Fake.Invokes(action, &v1.ServiceList{}) return err @@ -80,7 +80,7 @@ func (c *FakeServices) DeleteCollection(options *meta_v1.DeleteOptions, listOpti func (c *FakeServices) Get(name string, options meta_v1.GetOptions) (result *v1.Service, err error) { obj, err := c.Fake. - Invokes(core.NewGetAction(servicesResource, c.ns, name), &v1.Service{}) + Invokes(testing.NewGetAction(servicesResource, c.ns, name), &v1.Service{}) if obj == nil { return nil, err @@ -90,13 +90,13 @@ func (c *FakeServices) Get(name string, options meta_v1.GetOptions) (result *v1. func (c *FakeServices) List(opts meta_v1.ListOptions) (result *v1.ServiceList, err error) { obj, err := c.Fake. - Invokes(core.NewListAction(servicesResource, c.ns, opts), &v1.ServiceList{}) + Invokes(testing.NewListAction(servicesResource, c.ns, opts), &v1.ServiceList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -112,14 +112,14 @@ func (c *FakeServices) List(opts meta_v1.ListOptions) (result *v1.ServiceList, e // Watch returns a watch.Interface that watches the requested services. func (c *FakeServices) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewWatchAction(servicesResource, c.ns, opts)) + InvokesWatch(testing.NewWatchAction(servicesResource, c.ns, opts)) } // Patch applies the patch and returns the patched service. func (c *FakeServices) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.Service, err error) { obj, err := c.Fake. - Invokes(core.NewPatchSubresourceAction(servicesResource, c.ns, name, data, subresources...), &v1.Service{}) + Invokes(testing.NewPatchSubresourceAction(servicesResource, c.ns, name, data, subresources...), &v1.Service{}) if obj == nil { return nil, err diff --git a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/BUILD b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/BUILD index 847c6d7ddcc..01688a3adc7 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/BUILD +++ b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/BUILD @@ -22,13 +22,13 @@ go_library( deps = [ "//federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", - "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/testing", ], ) diff --git a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_daemonset.go b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_daemonset.go index 1af9a446876..5bbdb729210 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_daemonset.go +++ b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_daemonset.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeDaemonSets implements DaemonSetInterface @@ -36,7 +36,7 @@ var daemonsetsResource = schema.GroupVersionResource{Group: "extensions", Versio func (c *FakeDaemonSets) Create(daemonSet *v1beta1.DaemonSet) (result *v1beta1.DaemonSet, err error) { obj, err := c.Fake. - Invokes(core.NewCreateAction(daemonsetsResource, c.ns, daemonSet), &v1beta1.DaemonSet{}) + Invokes(testing.NewCreateAction(daemonsetsResource, c.ns, daemonSet), &v1beta1.DaemonSet{}) if obj == nil { return nil, err @@ -46,7 +46,7 @@ func (c *FakeDaemonSets) Create(daemonSet *v1beta1.DaemonSet) (result *v1beta1.D func (c *FakeDaemonSets) Update(daemonSet *v1beta1.DaemonSet) (result *v1beta1.DaemonSet, err error) { obj, err := c.Fake. - Invokes(core.NewUpdateAction(daemonsetsResource, c.ns, daemonSet), &v1beta1.DaemonSet{}) + Invokes(testing.NewUpdateAction(daemonsetsResource, c.ns, daemonSet), &v1beta1.DaemonSet{}) if obj == nil { return nil, err @@ -56,7 +56,7 @@ func (c *FakeDaemonSets) Update(daemonSet *v1beta1.DaemonSet) (result *v1beta1.D func (c *FakeDaemonSets) UpdateStatus(daemonSet *v1beta1.DaemonSet) (*v1beta1.DaemonSet, error) { obj, err := c.Fake. - Invokes(core.NewUpdateSubresourceAction(daemonsetsResource, "status", c.ns, daemonSet), &v1beta1.DaemonSet{}) + Invokes(testing.NewUpdateSubresourceAction(daemonsetsResource, "status", c.ns, daemonSet), &v1beta1.DaemonSet{}) if obj == nil { return nil, err @@ -66,13 +66,13 @@ func (c *FakeDaemonSets) UpdateStatus(daemonSet *v1beta1.DaemonSet) (*v1beta1.Da func (c *FakeDaemonSets) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewDeleteAction(daemonsetsResource, c.ns, name), &v1beta1.DaemonSet{}) + Invokes(testing.NewDeleteAction(daemonsetsResource, c.ns, name), &v1beta1.DaemonSet{}) return err } func (c *FakeDaemonSets) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := core.NewDeleteCollectionAction(daemonsetsResource, c.ns, listOptions) + action := testing.NewDeleteCollectionAction(daemonsetsResource, c.ns, listOptions) _, err := c.Fake.Invokes(action, &v1beta1.DaemonSetList{}) return err @@ -80,7 +80,7 @@ func (c *FakeDaemonSets) DeleteCollection(options *v1.DeleteOptions, listOptions func (c *FakeDaemonSets) Get(name string, options v1.GetOptions) (result *v1beta1.DaemonSet, err error) { obj, err := c.Fake. - Invokes(core.NewGetAction(daemonsetsResource, c.ns, name), &v1beta1.DaemonSet{}) + Invokes(testing.NewGetAction(daemonsetsResource, c.ns, name), &v1beta1.DaemonSet{}) if obj == nil { return nil, err @@ -90,13 +90,13 @@ func (c *FakeDaemonSets) Get(name string, options v1.GetOptions) (result *v1beta func (c *FakeDaemonSets) List(opts v1.ListOptions) (result *v1beta1.DaemonSetList, err error) { obj, err := c.Fake. - Invokes(core.NewListAction(daemonsetsResource, c.ns, opts), &v1beta1.DaemonSetList{}) + Invokes(testing.NewListAction(daemonsetsResource, c.ns, opts), &v1beta1.DaemonSetList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -112,14 +112,14 @@ func (c *FakeDaemonSets) List(opts v1.ListOptions) (result *v1beta1.DaemonSetLis // Watch returns a watch.Interface that watches the requested daemonSets. func (c *FakeDaemonSets) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewWatchAction(daemonsetsResource, c.ns, opts)) + InvokesWatch(testing.NewWatchAction(daemonsetsResource, c.ns, opts)) } // Patch applies the patch and returns the patched daemonSet. func (c *FakeDaemonSets) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.DaemonSet, err error) { obj, err := c.Fake. - Invokes(core.NewPatchSubresourceAction(daemonsetsResource, c.ns, name, data, subresources...), &v1beta1.DaemonSet{}) + Invokes(testing.NewPatchSubresourceAction(daemonsetsResource, c.ns, name, data, subresources...), &v1beta1.DaemonSet{}) if obj == nil { return nil, err diff --git a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_deployment.go b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_deployment.go index f49ab7e7897..78b0e56c58d 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_deployment.go +++ b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_deployment.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeDeployments implements DeploymentInterface @@ -36,7 +36,7 @@ var deploymentsResource = schema.GroupVersionResource{Group: "extensions", Versi func (c *FakeDeployments) Create(deployment *v1beta1.Deployment) (result *v1beta1.Deployment, err error) { obj, err := c.Fake. - Invokes(core.NewCreateAction(deploymentsResource, c.ns, deployment), &v1beta1.Deployment{}) + Invokes(testing.NewCreateAction(deploymentsResource, c.ns, deployment), &v1beta1.Deployment{}) if obj == nil { return nil, err @@ -46,7 +46,7 @@ func (c *FakeDeployments) Create(deployment *v1beta1.Deployment) (result *v1beta func (c *FakeDeployments) Update(deployment *v1beta1.Deployment) (result *v1beta1.Deployment, err error) { obj, err := c.Fake. - Invokes(core.NewUpdateAction(deploymentsResource, c.ns, deployment), &v1beta1.Deployment{}) + Invokes(testing.NewUpdateAction(deploymentsResource, c.ns, deployment), &v1beta1.Deployment{}) if obj == nil { return nil, err @@ -56,7 +56,7 @@ func (c *FakeDeployments) Update(deployment *v1beta1.Deployment) (result *v1beta func (c *FakeDeployments) UpdateStatus(deployment *v1beta1.Deployment) (*v1beta1.Deployment, error) { obj, err := c.Fake. - Invokes(core.NewUpdateSubresourceAction(deploymentsResource, "status", c.ns, deployment), &v1beta1.Deployment{}) + Invokes(testing.NewUpdateSubresourceAction(deploymentsResource, "status", c.ns, deployment), &v1beta1.Deployment{}) if obj == nil { return nil, err @@ -66,13 +66,13 @@ func (c *FakeDeployments) UpdateStatus(deployment *v1beta1.Deployment) (*v1beta1 func (c *FakeDeployments) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewDeleteAction(deploymentsResource, c.ns, name), &v1beta1.Deployment{}) + Invokes(testing.NewDeleteAction(deploymentsResource, c.ns, name), &v1beta1.Deployment{}) return err } func (c *FakeDeployments) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := core.NewDeleteCollectionAction(deploymentsResource, c.ns, listOptions) + action := testing.NewDeleteCollectionAction(deploymentsResource, c.ns, listOptions) _, err := c.Fake.Invokes(action, &v1beta1.DeploymentList{}) return err @@ -80,7 +80,7 @@ func (c *FakeDeployments) DeleteCollection(options *v1.DeleteOptions, listOption func (c *FakeDeployments) Get(name string, options v1.GetOptions) (result *v1beta1.Deployment, err error) { obj, err := c.Fake. - Invokes(core.NewGetAction(deploymentsResource, c.ns, name), &v1beta1.Deployment{}) + Invokes(testing.NewGetAction(deploymentsResource, c.ns, name), &v1beta1.Deployment{}) if obj == nil { return nil, err @@ -90,13 +90,13 @@ func (c *FakeDeployments) Get(name string, options v1.GetOptions) (result *v1bet func (c *FakeDeployments) List(opts v1.ListOptions) (result *v1beta1.DeploymentList, err error) { obj, err := c.Fake. - Invokes(core.NewListAction(deploymentsResource, c.ns, opts), &v1beta1.DeploymentList{}) + Invokes(testing.NewListAction(deploymentsResource, c.ns, opts), &v1beta1.DeploymentList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -112,14 +112,14 @@ func (c *FakeDeployments) List(opts v1.ListOptions) (result *v1beta1.DeploymentL // Watch returns a watch.Interface that watches the requested deployments. func (c *FakeDeployments) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewWatchAction(deploymentsResource, c.ns, opts)) + InvokesWatch(testing.NewWatchAction(deploymentsResource, c.ns, opts)) } // Patch applies the patch and returns the patched deployment. func (c *FakeDeployments) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.Deployment, err error) { obj, err := c.Fake. - Invokes(core.NewPatchSubresourceAction(deploymentsResource, c.ns, name, data, subresources...), &v1beta1.Deployment{}) + Invokes(testing.NewPatchSubresourceAction(deploymentsResource, c.ns, name, data, subresources...), &v1beta1.Deployment{}) if obj == nil { return nil, err diff --git a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_deployment_expansion.go b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_deployment_expansion.go index 37836278aea..7fb5027eab4 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_deployment_expansion.go +++ b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_deployment_expansion.go @@ -17,8 +17,8 @@ limitations under the License. package fake import ( + core "k8s.io/client-go/testing" "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" - "k8s.io/kubernetes/pkg/client/testing/core" ) func (c *FakeDeployments) Rollback(deploymentRollback *v1beta1.DeploymentRollback) error { diff --git a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_extensions_client.go b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_extensions_client.go index 3442070b7b3..b6a4cd5b6fa 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_extensions_client.go +++ b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_extensions_client.go @@ -18,12 +18,12 @@ package fake import ( rest "k8s.io/client-go/rest" + testing "k8s.io/client-go/testing" v1beta1 "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1" - core "k8s.io/kubernetes/pkg/client/testing/core" ) type FakeExtensionsV1beta1 struct { - *core.Fake + *testing.Fake } func (c *FakeExtensionsV1beta1) DaemonSets(namespace string) v1beta1.DaemonSetInterface { diff --git a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_ingress.go b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_ingress.go index 277717bb60f..84d023dff2e 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_ingress.go +++ b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_ingress.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeIngresses implements IngressInterface @@ -36,7 +36,7 @@ var ingressesResource = schema.GroupVersionResource{Group: "extensions", Version func (c *FakeIngresses) Create(ingress *v1beta1.Ingress) (result *v1beta1.Ingress, err error) { obj, err := c.Fake. - Invokes(core.NewCreateAction(ingressesResource, c.ns, ingress), &v1beta1.Ingress{}) + Invokes(testing.NewCreateAction(ingressesResource, c.ns, ingress), &v1beta1.Ingress{}) if obj == nil { return nil, err @@ -46,7 +46,7 @@ func (c *FakeIngresses) Create(ingress *v1beta1.Ingress) (result *v1beta1.Ingres func (c *FakeIngresses) Update(ingress *v1beta1.Ingress) (result *v1beta1.Ingress, err error) { obj, err := c.Fake. - Invokes(core.NewUpdateAction(ingressesResource, c.ns, ingress), &v1beta1.Ingress{}) + Invokes(testing.NewUpdateAction(ingressesResource, c.ns, ingress), &v1beta1.Ingress{}) if obj == nil { return nil, err @@ -56,7 +56,7 @@ func (c *FakeIngresses) Update(ingress *v1beta1.Ingress) (result *v1beta1.Ingres func (c *FakeIngresses) UpdateStatus(ingress *v1beta1.Ingress) (*v1beta1.Ingress, error) { obj, err := c.Fake. - Invokes(core.NewUpdateSubresourceAction(ingressesResource, "status", c.ns, ingress), &v1beta1.Ingress{}) + Invokes(testing.NewUpdateSubresourceAction(ingressesResource, "status", c.ns, ingress), &v1beta1.Ingress{}) if obj == nil { return nil, err @@ -66,13 +66,13 @@ func (c *FakeIngresses) UpdateStatus(ingress *v1beta1.Ingress) (*v1beta1.Ingress func (c *FakeIngresses) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewDeleteAction(ingressesResource, c.ns, name), &v1beta1.Ingress{}) + Invokes(testing.NewDeleteAction(ingressesResource, c.ns, name), &v1beta1.Ingress{}) return err } func (c *FakeIngresses) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := core.NewDeleteCollectionAction(ingressesResource, c.ns, listOptions) + action := testing.NewDeleteCollectionAction(ingressesResource, c.ns, listOptions) _, err := c.Fake.Invokes(action, &v1beta1.IngressList{}) return err @@ -80,7 +80,7 @@ func (c *FakeIngresses) DeleteCollection(options *v1.DeleteOptions, listOptions func (c *FakeIngresses) Get(name string, options v1.GetOptions) (result *v1beta1.Ingress, err error) { obj, err := c.Fake. - Invokes(core.NewGetAction(ingressesResource, c.ns, name), &v1beta1.Ingress{}) + Invokes(testing.NewGetAction(ingressesResource, c.ns, name), &v1beta1.Ingress{}) if obj == nil { return nil, err @@ -90,13 +90,13 @@ func (c *FakeIngresses) Get(name string, options v1.GetOptions) (result *v1beta1 func (c *FakeIngresses) List(opts v1.ListOptions) (result *v1beta1.IngressList, err error) { obj, err := c.Fake. - Invokes(core.NewListAction(ingressesResource, c.ns, opts), &v1beta1.IngressList{}) + Invokes(testing.NewListAction(ingressesResource, c.ns, opts), &v1beta1.IngressList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -112,14 +112,14 @@ func (c *FakeIngresses) List(opts v1.ListOptions) (result *v1beta1.IngressList, // Watch returns a watch.Interface that watches the requested ingresses. func (c *FakeIngresses) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewWatchAction(ingressesResource, c.ns, opts)) + InvokesWatch(testing.NewWatchAction(ingressesResource, c.ns, opts)) } // Patch applies the patch and returns the patched ingress. func (c *FakeIngresses) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.Ingress, err error) { obj, err := c.Fake. - Invokes(core.NewPatchSubresourceAction(ingressesResource, c.ns, name, data, subresources...), &v1beta1.Ingress{}) + Invokes(testing.NewPatchSubresourceAction(ingressesResource, c.ns, name, data, subresources...), &v1beta1.Ingress{}) if obj == nil { return nil, err diff --git a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_replicaset.go b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_replicaset.go index 3835577b529..58281306cdb 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_replicaset.go +++ b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_replicaset.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeReplicaSets implements ReplicaSetInterface @@ -36,7 +36,7 @@ var replicasetsResource = schema.GroupVersionResource{Group: "extensions", Versi func (c *FakeReplicaSets) Create(replicaSet *v1beta1.ReplicaSet) (result *v1beta1.ReplicaSet, err error) { obj, err := c.Fake. - Invokes(core.NewCreateAction(replicasetsResource, c.ns, replicaSet), &v1beta1.ReplicaSet{}) + Invokes(testing.NewCreateAction(replicasetsResource, c.ns, replicaSet), &v1beta1.ReplicaSet{}) if obj == nil { return nil, err @@ -46,7 +46,7 @@ func (c *FakeReplicaSets) Create(replicaSet *v1beta1.ReplicaSet) (result *v1beta func (c *FakeReplicaSets) Update(replicaSet *v1beta1.ReplicaSet) (result *v1beta1.ReplicaSet, err error) { obj, err := c.Fake. - Invokes(core.NewUpdateAction(replicasetsResource, c.ns, replicaSet), &v1beta1.ReplicaSet{}) + Invokes(testing.NewUpdateAction(replicasetsResource, c.ns, replicaSet), &v1beta1.ReplicaSet{}) if obj == nil { return nil, err @@ -56,7 +56,7 @@ func (c *FakeReplicaSets) Update(replicaSet *v1beta1.ReplicaSet) (result *v1beta func (c *FakeReplicaSets) UpdateStatus(replicaSet *v1beta1.ReplicaSet) (*v1beta1.ReplicaSet, error) { obj, err := c.Fake. - Invokes(core.NewUpdateSubresourceAction(replicasetsResource, "status", c.ns, replicaSet), &v1beta1.ReplicaSet{}) + Invokes(testing.NewUpdateSubresourceAction(replicasetsResource, "status", c.ns, replicaSet), &v1beta1.ReplicaSet{}) if obj == nil { return nil, err @@ -66,13 +66,13 @@ func (c *FakeReplicaSets) UpdateStatus(replicaSet *v1beta1.ReplicaSet) (*v1beta1 func (c *FakeReplicaSets) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewDeleteAction(replicasetsResource, c.ns, name), &v1beta1.ReplicaSet{}) + Invokes(testing.NewDeleteAction(replicasetsResource, c.ns, name), &v1beta1.ReplicaSet{}) return err } func (c *FakeReplicaSets) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := core.NewDeleteCollectionAction(replicasetsResource, c.ns, listOptions) + action := testing.NewDeleteCollectionAction(replicasetsResource, c.ns, listOptions) _, err := c.Fake.Invokes(action, &v1beta1.ReplicaSetList{}) return err @@ -80,7 +80,7 @@ func (c *FakeReplicaSets) DeleteCollection(options *v1.DeleteOptions, listOption func (c *FakeReplicaSets) Get(name string, options v1.GetOptions) (result *v1beta1.ReplicaSet, err error) { obj, err := c.Fake. - Invokes(core.NewGetAction(replicasetsResource, c.ns, name), &v1beta1.ReplicaSet{}) + Invokes(testing.NewGetAction(replicasetsResource, c.ns, name), &v1beta1.ReplicaSet{}) if obj == nil { return nil, err @@ -90,13 +90,13 @@ func (c *FakeReplicaSets) Get(name string, options v1.GetOptions) (result *v1bet func (c *FakeReplicaSets) List(opts v1.ListOptions) (result *v1beta1.ReplicaSetList, err error) { obj, err := c.Fake. - Invokes(core.NewListAction(replicasetsResource, c.ns, opts), &v1beta1.ReplicaSetList{}) + Invokes(testing.NewListAction(replicasetsResource, c.ns, opts), &v1beta1.ReplicaSetList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -112,14 +112,14 @@ func (c *FakeReplicaSets) List(opts v1.ListOptions) (result *v1beta1.ReplicaSetL // Watch returns a watch.Interface that watches the requested replicaSets. func (c *FakeReplicaSets) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewWatchAction(replicasetsResource, c.ns, opts)) + InvokesWatch(testing.NewWatchAction(replicasetsResource, c.ns, opts)) } // Patch applies the patch and returns the patched replicaSet. func (c *FakeReplicaSets) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.ReplicaSet, err error) { obj, err := c.Fake. - Invokes(core.NewPatchSubresourceAction(replicasetsResource, c.ns, name, data, subresources...), &v1beta1.ReplicaSet{}) + Invokes(testing.NewPatchSubresourceAction(replicasetsResource, c.ns, name, data, subresources...), &v1beta1.ReplicaSet{}) if obj == nil { return nil, err diff --git a/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/fake/BUILD b/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/fake/BUILD index d282e077938..ece30431c72 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/fake/BUILD +++ b/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/fake/BUILD @@ -18,13 +18,13 @@ go_library( deps = [ "//federation/apis/federation/v1beta1:go_default_library", "//federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1:go_default_library", - "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/testing", ], ) diff --git a/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/fake/fake_cluster.go b/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/fake/fake_cluster.go index e0a67927192..6a8c1f92969 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/fake/fake_cluster.go +++ b/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/fake/fake_cluster.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" v1beta1 "k8s.io/kubernetes/federation/apis/federation/v1beta1" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeClusters implements ClusterInterface @@ -35,7 +35,7 @@ var clustersResource = schema.GroupVersionResource{Group: "federation", Version: func (c *FakeClusters) Create(cluster *v1beta1.Cluster) (result *v1beta1.Cluster, err error) { obj, err := c.Fake. - Invokes(core.NewRootCreateAction(clustersResource, cluster), &v1beta1.Cluster{}) + Invokes(testing.NewRootCreateAction(clustersResource, cluster), &v1beta1.Cluster{}) if obj == nil { return nil, err } @@ -44,7 +44,7 @@ func (c *FakeClusters) Create(cluster *v1beta1.Cluster) (result *v1beta1.Cluster func (c *FakeClusters) Update(cluster *v1beta1.Cluster) (result *v1beta1.Cluster, err error) { obj, err := c.Fake. - Invokes(core.NewRootUpdateAction(clustersResource, cluster), &v1beta1.Cluster{}) + Invokes(testing.NewRootUpdateAction(clustersResource, cluster), &v1beta1.Cluster{}) if obj == nil { return nil, err } @@ -53,7 +53,7 @@ func (c *FakeClusters) Update(cluster *v1beta1.Cluster) (result *v1beta1.Cluster func (c *FakeClusters) UpdateStatus(cluster *v1beta1.Cluster) (*v1beta1.Cluster, error) { obj, err := c.Fake. - Invokes(core.NewRootUpdateSubresourceAction(clustersResource, "status", cluster), &v1beta1.Cluster{}) + Invokes(testing.NewRootUpdateSubresourceAction(clustersResource, "status", cluster), &v1beta1.Cluster{}) if obj == nil { return nil, err } @@ -62,12 +62,12 @@ func (c *FakeClusters) UpdateStatus(cluster *v1beta1.Cluster) (*v1beta1.Cluster, func (c *FakeClusters) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewRootDeleteAction(clustersResource, name), &v1beta1.Cluster{}) + Invokes(testing.NewRootDeleteAction(clustersResource, name), &v1beta1.Cluster{}) return err } func (c *FakeClusters) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := core.NewRootDeleteCollectionAction(clustersResource, listOptions) + action := testing.NewRootDeleteCollectionAction(clustersResource, listOptions) _, err := c.Fake.Invokes(action, &v1beta1.ClusterList{}) return err @@ -75,7 +75,7 @@ func (c *FakeClusters) DeleteCollection(options *v1.DeleteOptions, listOptions v func (c *FakeClusters) Get(name string, options v1.GetOptions) (result *v1beta1.Cluster, err error) { obj, err := c.Fake. - Invokes(core.NewRootGetAction(clustersResource, name), &v1beta1.Cluster{}) + Invokes(testing.NewRootGetAction(clustersResource, name), &v1beta1.Cluster{}) if obj == nil { return nil, err } @@ -84,12 +84,12 @@ func (c *FakeClusters) Get(name string, options v1.GetOptions) (result *v1beta1. func (c *FakeClusters) List(opts v1.ListOptions) (result *v1beta1.ClusterList, err error) { obj, err := c.Fake. - Invokes(core.NewRootListAction(clustersResource, opts), &v1beta1.ClusterList{}) + Invokes(testing.NewRootListAction(clustersResource, opts), &v1beta1.ClusterList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -105,13 +105,13 @@ func (c *FakeClusters) List(opts v1.ListOptions) (result *v1beta1.ClusterList, e // Watch returns a watch.Interface that watches the requested clusters. func (c *FakeClusters) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewRootWatchAction(clustersResource, opts)) + InvokesWatch(testing.NewRootWatchAction(clustersResource, opts)) } // Patch applies the patch and returns the patched cluster. func (c *FakeClusters) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.Cluster, err error) { obj, err := c.Fake. - Invokes(core.NewRootPatchSubresourceAction(clustersResource, name, data, subresources...), &v1beta1.Cluster{}) + Invokes(testing.NewRootPatchSubresourceAction(clustersResource, name, data, subresources...), &v1beta1.Cluster{}) if obj == nil { return nil, err } diff --git a/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/fake/fake_federation_client.go b/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/fake/fake_federation_client.go index 1128a199ba5..73edbff85a3 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/fake/fake_federation_client.go +++ b/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/fake/fake_federation_client.go @@ -18,12 +18,12 @@ package fake import ( rest "k8s.io/client-go/rest" + testing "k8s.io/client-go/testing" v1beta1 "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1" - core "k8s.io/kubernetes/pkg/client/testing/core" ) type FakeFederationV1beta1 struct { - *core.Fake + *testing.Fake } func (c *FakeFederationV1beta1) Clusters() v1beta1.ClusterInterface { diff --git a/federation/client/clientset_generated/federation_internalclientset/fake/BUILD b/federation/client/clientset_generated/federation_internalclientset/fake/BUILD index a7193576b20..98926afac8a 100644 --- a/federation/client/clientset_generated/federation_internalclientset/fake/BUILD +++ b/federation/client/clientset_generated/federation_internalclientset/fake/BUILD @@ -27,11 +27,11 @@ go_library( "//federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion:go_default_library", "//federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/fake:go_default_library", "//pkg/api:go_default_library", - "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/client-go/discovery", "//vendor:k8s.io/client-go/discovery/fake", + "//vendor:k8s.io/client-go/testing", ], ) diff --git a/federation/client/clientset_generated/federation_internalclientset/fake/clientset_generated.go b/federation/client/clientset_generated/federation_internalclientset/fake/clientset_generated.go index 88d543d0b69..f3b19f0c1ea 100644 --- a/federation/client/clientset_generated/federation_internalclientset/fake/clientset_generated.go +++ b/federation/client/clientset_generated/federation_internalclientset/fake/clientset_generated.go @@ -21,6 +21,7 @@ import ( "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/discovery" fakediscovery "k8s.io/client-go/discovery/fake" + "k8s.io/client-go/testing" clientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset" internalversionautoscaling "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/typed/autoscaling/internalversion" fakeinternalversionautoscaling "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/typed/autoscaling/internalversion/fake" @@ -33,7 +34,6 @@ import ( internalversionfederation "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion" fakeinternalversionfederation "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/fake" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client/testing/core" ) // NewSimpleClientset returns a clientset that will respond with the provided objects. @@ -41,17 +41,17 @@ import ( // without applying any validations and/or defaults. It shouldn't be considered a replacement // for a real clientset and is mostly useful in simple unit tests. func NewSimpleClientset(objects ...runtime.Object) *Clientset { - o := core.NewObjectTracker(api.Scheme, api.Codecs.UniversalDecoder()) + o := testing.NewObjectTracker(api.Registry, api.Scheme, api.Codecs.UniversalDecoder()) for _, obj := range objects { if err := o.Add(obj); err != nil { panic(err) } } - fakePtr := core.Fake{} - fakePtr.AddReactor("*", "*", core.ObjectReaction(o, api.Registry.RESTMapper())) + fakePtr := testing.Fake{} + fakePtr.AddReactor("*", "*", testing.ObjectReaction(o, api.Registry.RESTMapper())) - fakePtr.AddWatchReactor("*", core.DefaultWatchReactor(watch.NewFake(), nil)) + fakePtr.AddWatchReactor("*", testing.DefaultWatchReactor(watch.NewFake(), nil)) return &Clientset{fakePtr} } @@ -60,7 +60,7 @@ func NewSimpleClientset(objects ...runtime.Object) *Clientset { // struct to get a default implementation. This makes faking out just the method // you want to test easier. type Clientset struct { - core.Fake + testing.Fake } func (c *Clientset) Discovery() discovery.DiscoveryInterface { diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/autoscaling/internalversion/fake/BUILD b/federation/client/clientset_generated/federation_internalclientset/typed/autoscaling/internalversion/fake/BUILD index d0ebba60324..7a1ecb527a2 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/autoscaling/internalversion/fake/BUILD +++ b/federation/client/clientset_generated/federation_internalclientset/typed/autoscaling/internalversion/fake/BUILD @@ -18,13 +18,13 @@ go_library( deps = [ "//federation/client/clientset_generated/federation_internalclientset/typed/autoscaling/internalversion:go_default_library", "//pkg/apis/autoscaling:go_default_library", - "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/testing", ], ) diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/autoscaling/internalversion/fake/fake_autoscaling_client.go b/federation/client/clientset_generated/federation_internalclientset/typed/autoscaling/internalversion/fake/fake_autoscaling_client.go index a2f8bcb93e0..8bec0c6d462 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/autoscaling/internalversion/fake/fake_autoscaling_client.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/autoscaling/internalversion/fake/fake_autoscaling_client.go @@ -18,12 +18,12 @@ package fake import ( rest "k8s.io/client-go/rest" + testing "k8s.io/client-go/testing" internalversion "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/typed/autoscaling/internalversion" - core "k8s.io/kubernetes/pkg/client/testing/core" ) type FakeAutoscaling struct { - *core.Fake + *testing.Fake } func (c *FakeAutoscaling) HorizontalPodAutoscalers(namespace string) internalversion.HorizontalPodAutoscalerInterface { diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/autoscaling/internalversion/fake/fake_horizontalpodautoscaler.go b/federation/client/clientset_generated/federation_internalclientset/typed/autoscaling/internalversion/fake/fake_horizontalpodautoscaler.go index e0db5c0b160..86cf91ec04a 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/autoscaling/internalversion/fake/fake_horizontalpodautoscaler.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/autoscaling/internalversion/fake/fake_horizontalpodautoscaler.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" autoscaling "k8s.io/kubernetes/pkg/apis/autoscaling" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeHorizontalPodAutoscalers implements HorizontalPodAutoscalerInterface @@ -36,7 +36,7 @@ var horizontalpodautoscalersResource = schema.GroupVersionResource{Group: "autos func (c *FakeHorizontalPodAutoscalers) Create(horizontalPodAutoscaler *autoscaling.HorizontalPodAutoscaler) (result *autoscaling.HorizontalPodAutoscaler, err error) { obj, err := c.Fake. - Invokes(core.NewCreateAction(horizontalpodautoscalersResource, c.ns, horizontalPodAutoscaler), &autoscaling.HorizontalPodAutoscaler{}) + Invokes(testing.NewCreateAction(horizontalpodautoscalersResource, c.ns, horizontalPodAutoscaler), &autoscaling.HorizontalPodAutoscaler{}) if obj == nil { return nil, err @@ -46,7 +46,7 @@ func (c *FakeHorizontalPodAutoscalers) Create(horizontalPodAutoscaler *autoscali func (c *FakeHorizontalPodAutoscalers) Update(horizontalPodAutoscaler *autoscaling.HorizontalPodAutoscaler) (result *autoscaling.HorizontalPodAutoscaler, err error) { obj, err := c.Fake. - Invokes(core.NewUpdateAction(horizontalpodautoscalersResource, c.ns, horizontalPodAutoscaler), &autoscaling.HorizontalPodAutoscaler{}) + Invokes(testing.NewUpdateAction(horizontalpodautoscalersResource, c.ns, horizontalPodAutoscaler), &autoscaling.HorizontalPodAutoscaler{}) if obj == nil { return nil, err @@ -56,7 +56,7 @@ func (c *FakeHorizontalPodAutoscalers) Update(horizontalPodAutoscaler *autoscali func (c *FakeHorizontalPodAutoscalers) UpdateStatus(horizontalPodAutoscaler *autoscaling.HorizontalPodAutoscaler) (*autoscaling.HorizontalPodAutoscaler, error) { obj, err := c.Fake. - Invokes(core.NewUpdateSubresourceAction(horizontalpodautoscalersResource, "status", c.ns, horizontalPodAutoscaler), &autoscaling.HorizontalPodAutoscaler{}) + Invokes(testing.NewUpdateSubresourceAction(horizontalpodautoscalersResource, "status", c.ns, horizontalPodAutoscaler), &autoscaling.HorizontalPodAutoscaler{}) if obj == nil { return nil, err @@ -66,13 +66,13 @@ func (c *FakeHorizontalPodAutoscalers) UpdateStatus(horizontalPodAutoscaler *aut func (c *FakeHorizontalPodAutoscalers) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewDeleteAction(horizontalpodautoscalersResource, c.ns, name), &autoscaling.HorizontalPodAutoscaler{}) + Invokes(testing.NewDeleteAction(horizontalpodautoscalersResource, c.ns, name), &autoscaling.HorizontalPodAutoscaler{}) return err } func (c *FakeHorizontalPodAutoscalers) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := core.NewDeleteCollectionAction(horizontalpodautoscalersResource, c.ns, listOptions) + action := testing.NewDeleteCollectionAction(horizontalpodautoscalersResource, c.ns, listOptions) _, err := c.Fake.Invokes(action, &autoscaling.HorizontalPodAutoscalerList{}) return err @@ -80,7 +80,7 @@ func (c *FakeHorizontalPodAutoscalers) DeleteCollection(options *v1.DeleteOption func (c *FakeHorizontalPodAutoscalers) Get(name string, options v1.GetOptions) (result *autoscaling.HorizontalPodAutoscaler, err error) { obj, err := c.Fake. - Invokes(core.NewGetAction(horizontalpodautoscalersResource, c.ns, name), &autoscaling.HorizontalPodAutoscaler{}) + Invokes(testing.NewGetAction(horizontalpodautoscalersResource, c.ns, name), &autoscaling.HorizontalPodAutoscaler{}) if obj == nil { return nil, err @@ -90,13 +90,13 @@ func (c *FakeHorizontalPodAutoscalers) Get(name string, options v1.GetOptions) ( func (c *FakeHorizontalPodAutoscalers) List(opts v1.ListOptions) (result *autoscaling.HorizontalPodAutoscalerList, err error) { obj, err := c.Fake. - Invokes(core.NewListAction(horizontalpodautoscalersResource, c.ns, opts), &autoscaling.HorizontalPodAutoscalerList{}) + Invokes(testing.NewListAction(horizontalpodautoscalersResource, c.ns, opts), &autoscaling.HorizontalPodAutoscalerList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -112,14 +112,14 @@ func (c *FakeHorizontalPodAutoscalers) List(opts v1.ListOptions) (result *autosc // Watch returns a watch.Interface that watches the requested horizontalPodAutoscalers. func (c *FakeHorizontalPodAutoscalers) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewWatchAction(horizontalpodautoscalersResource, c.ns, opts)) + InvokesWatch(testing.NewWatchAction(horizontalpodautoscalersResource, c.ns, opts)) } // Patch applies the patch and returns the patched horizontalPodAutoscaler. func (c *FakeHorizontalPodAutoscalers) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *autoscaling.HorizontalPodAutoscaler, err error) { obj, err := c.Fake. - Invokes(core.NewPatchSubresourceAction(horizontalpodautoscalersResource, c.ns, name, data, subresources...), &autoscaling.HorizontalPodAutoscaler{}) + Invokes(testing.NewPatchSubresourceAction(horizontalpodautoscalersResource, c.ns, name, data, subresources...), &autoscaling.HorizontalPodAutoscaler{}) if obj == nil { return nil, err diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion/fake/BUILD b/federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion/fake/BUILD index fd7d2766946..b5dfd322dd9 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion/fake/BUILD +++ b/federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion/fake/BUILD @@ -18,13 +18,13 @@ go_library( deps = [ "//federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion:go_default_library", "//pkg/apis/batch:go_default_library", - "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/testing", ], ) diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion/fake/fake_batch_client.go b/federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion/fake/fake_batch_client.go index a5d989d3ed4..8b29bff8d03 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion/fake/fake_batch_client.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion/fake/fake_batch_client.go @@ -18,12 +18,12 @@ package fake import ( rest "k8s.io/client-go/rest" + testing "k8s.io/client-go/testing" internalversion "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion" - core "k8s.io/kubernetes/pkg/client/testing/core" ) type FakeBatch struct { - *core.Fake + *testing.Fake } func (c *FakeBatch) Jobs(namespace string) internalversion.JobInterface { diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion/fake/fake_job.go b/federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion/fake/fake_job.go index db3f9027a26..faad5459a03 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion/fake/fake_job.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion/fake/fake_job.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" batch "k8s.io/kubernetes/pkg/apis/batch" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeJobs implements JobInterface @@ -36,7 +36,7 @@ var jobsResource = schema.GroupVersionResource{Group: "batch", Version: "", Reso func (c *FakeJobs) Create(job *batch.Job) (result *batch.Job, err error) { obj, err := c.Fake. - Invokes(core.NewCreateAction(jobsResource, c.ns, job), &batch.Job{}) + Invokes(testing.NewCreateAction(jobsResource, c.ns, job), &batch.Job{}) if obj == nil { return nil, err @@ -46,7 +46,7 @@ func (c *FakeJobs) Create(job *batch.Job) (result *batch.Job, err error) { func (c *FakeJobs) Update(job *batch.Job) (result *batch.Job, err error) { obj, err := c.Fake. - Invokes(core.NewUpdateAction(jobsResource, c.ns, job), &batch.Job{}) + Invokes(testing.NewUpdateAction(jobsResource, c.ns, job), &batch.Job{}) if obj == nil { return nil, err @@ -56,7 +56,7 @@ func (c *FakeJobs) Update(job *batch.Job) (result *batch.Job, err error) { func (c *FakeJobs) UpdateStatus(job *batch.Job) (*batch.Job, error) { obj, err := c.Fake. - Invokes(core.NewUpdateSubresourceAction(jobsResource, "status", c.ns, job), &batch.Job{}) + Invokes(testing.NewUpdateSubresourceAction(jobsResource, "status", c.ns, job), &batch.Job{}) if obj == nil { return nil, err @@ -66,13 +66,13 @@ func (c *FakeJobs) UpdateStatus(job *batch.Job) (*batch.Job, error) { func (c *FakeJobs) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewDeleteAction(jobsResource, c.ns, name), &batch.Job{}) + Invokes(testing.NewDeleteAction(jobsResource, c.ns, name), &batch.Job{}) return err } func (c *FakeJobs) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := core.NewDeleteCollectionAction(jobsResource, c.ns, listOptions) + action := testing.NewDeleteCollectionAction(jobsResource, c.ns, listOptions) _, err := c.Fake.Invokes(action, &batch.JobList{}) return err @@ -80,7 +80,7 @@ func (c *FakeJobs) DeleteCollection(options *v1.DeleteOptions, listOptions v1.Li func (c *FakeJobs) Get(name string, options v1.GetOptions) (result *batch.Job, err error) { obj, err := c.Fake. - Invokes(core.NewGetAction(jobsResource, c.ns, name), &batch.Job{}) + Invokes(testing.NewGetAction(jobsResource, c.ns, name), &batch.Job{}) if obj == nil { return nil, err @@ -90,13 +90,13 @@ func (c *FakeJobs) Get(name string, options v1.GetOptions) (result *batch.Job, e func (c *FakeJobs) List(opts v1.ListOptions) (result *batch.JobList, err error) { obj, err := c.Fake. - Invokes(core.NewListAction(jobsResource, c.ns, opts), &batch.JobList{}) + Invokes(testing.NewListAction(jobsResource, c.ns, opts), &batch.JobList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -112,14 +112,14 @@ func (c *FakeJobs) List(opts v1.ListOptions) (result *batch.JobList, err error) // Watch returns a watch.Interface that watches the requested jobs. func (c *FakeJobs) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewWatchAction(jobsResource, c.ns, opts)) + InvokesWatch(testing.NewWatchAction(jobsResource, c.ns, opts)) } // Patch applies the patch and returns the patched job. func (c *FakeJobs) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *batch.Job, err error) { obj, err := c.Fake. - Invokes(core.NewPatchSubresourceAction(jobsResource, c.ns, name, data, subresources...), &batch.Job{}) + Invokes(testing.NewPatchSubresourceAction(jobsResource, c.ns, name, data, subresources...), &batch.Job{}) if obj == nil { return nil, err diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/BUILD b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/BUILD index 78547efd511..622faa680c9 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/BUILD +++ b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/BUILD @@ -23,13 +23,13 @@ go_library( deps = [ "//federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion:go_default_library", "//pkg/api:go_default_library", - "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/testing", ], ) diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/fake_configmap.go b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/fake_configmap.go index f4bf6710da3..ded63cc3ddb 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/fake_configmap.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/fake_configmap.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" api "k8s.io/kubernetes/pkg/api" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeConfigMaps implements ConfigMapInterface @@ -36,7 +36,7 @@ var configmapsResource = schema.GroupVersionResource{Group: "", Version: "", Res func (c *FakeConfigMaps) Create(configMap *api.ConfigMap) (result *api.ConfigMap, err error) { obj, err := c.Fake. - Invokes(core.NewCreateAction(configmapsResource, c.ns, configMap), &api.ConfigMap{}) + Invokes(testing.NewCreateAction(configmapsResource, c.ns, configMap), &api.ConfigMap{}) if obj == nil { return nil, err @@ -46,7 +46,7 @@ func (c *FakeConfigMaps) Create(configMap *api.ConfigMap) (result *api.ConfigMap func (c *FakeConfigMaps) Update(configMap *api.ConfigMap) (result *api.ConfigMap, err error) { obj, err := c.Fake. - Invokes(core.NewUpdateAction(configmapsResource, c.ns, configMap), &api.ConfigMap{}) + Invokes(testing.NewUpdateAction(configmapsResource, c.ns, configMap), &api.ConfigMap{}) if obj == nil { return nil, err @@ -56,13 +56,13 @@ func (c *FakeConfigMaps) Update(configMap *api.ConfigMap) (result *api.ConfigMap func (c *FakeConfigMaps) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewDeleteAction(configmapsResource, c.ns, name), &api.ConfigMap{}) + Invokes(testing.NewDeleteAction(configmapsResource, c.ns, name), &api.ConfigMap{}) return err } func (c *FakeConfigMaps) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := core.NewDeleteCollectionAction(configmapsResource, c.ns, listOptions) + action := testing.NewDeleteCollectionAction(configmapsResource, c.ns, listOptions) _, err := c.Fake.Invokes(action, &api.ConfigMapList{}) return err @@ -70,7 +70,7 @@ func (c *FakeConfigMaps) DeleteCollection(options *v1.DeleteOptions, listOptions func (c *FakeConfigMaps) Get(name string, options v1.GetOptions) (result *api.ConfigMap, err error) { obj, err := c.Fake. - Invokes(core.NewGetAction(configmapsResource, c.ns, name), &api.ConfigMap{}) + Invokes(testing.NewGetAction(configmapsResource, c.ns, name), &api.ConfigMap{}) if obj == nil { return nil, err @@ -80,13 +80,13 @@ func (c *FakeConfigMaps) Get(name string, options v1.GetOptions) (result *api.Co func (c *FakeConfigMaps) List(opts v1.ListOptions) (result *api.ConfigMapList, err error) { obj, err := c.Fake. - Invokes(core.NewListAction(configmapsResource, c.ns, opts), &api.ConfigMapList{}) + Invokes(testing.NewListAction(configmapsResource, c.ns, opts), &api.ConfigMapList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -102,14 +102,14 @@ func (c *FakeConfigMaps) List(opts v1.ListOptions) (result *api.ConfigMapList, e // Watch returns a watch.Interface that watches the requested configMaps. func (c *FakeConfigMaps) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewWatchAction(configmapsResource, c.ns, opts)) + InvokesWatch(testing.NewWatchAction(configmapsResource, c.ns, opts)) } // Patch applies the patch and returns the patched configMap. func (c *FakeConfigMaps) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *api.ConfigMap, err error) { obj, err := c.Fake. - Invokes(core.NewPatchSubresourceAction(configmapsResource, c.ns, name, data, subresources...), &api.ConfigMap{}) + Invokes(testing.NewPatchSubresourceAction(configmapsResource, c.ns, name, data, subresources...), &api.ConfigMap{}) if obj == nil { return nil, err diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/fake_core_client.go b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/fake_core_client.go index a19f8d86d2d..f344b805778 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/fake_core_client.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/fake_core_client.go @@ -18,12 +18,12 @@ package fake import ( rest "k8s.io/client-go/rest" + testing "k8s.io/client-go/testing" internalversion "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion" - core "k8s.io/kubernetes/pkg/client/testing/core" ) type FakeCore struct { - *core.Fake + *testing.Fake } func (c *FakeCore) ConfigMaps(namespace string) internalversion.ConfigMapInterface { diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/fake_event.go b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/fake_event.go index 78f526f8791..f551ba46dfd 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/fake_event.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/fake_event.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" api "k8s.io/kubernetes/pkg/api" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeEvents implements EventInterface @@ -36,7 +36,7 @@ var eventsResource = schema.GroupVersionResource{Group: "", Version: "", Resourc func (c *FakeEvents) Create(event *api.Event) (result *api.Event, err error) { obj, err := c.Fake. - Invokes(core.NewCreateAction(eventsResource, c.ns, event), &api.Event{}) + Invokes(testing.NewCreateAction(eventsResource, c.ns, event), &api.Event{}) if obj == nil { return nil, err @@ -46,7 +46,7 @@ func (c *FakeEvents) Create(event *api.Event) (result *api.Event, err error) { func (c *FakeEvents) Update(event *api.Event) (result *api.Event, err error) { obj, err := c.Fake. - Invokes(core.NewUpdateAction(eventsResource, c.ns, event), &api.Event{}) + Invokes(testing.NewUpdateAction(eventsResource, c.ns, event), &api.Event{}) if obj == nil { return nil, err @@ -56,13 +56,13 @@ func (c *FakeEvents) Update(event *api.Event) (result *api.Event, err error) { func (c *FakeEvents) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewDeleteAction(eventsResource, c.ns, name), &api.Event{}) + Invokes(testing.NewDeleteAction(eventsResource, c.ns, name), &api.Event{}) return err } func (c *FakeEvents) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := core.NewDeleteCollectionAction(eventsResource, c.ns, listOptions) + action := testing.NewDeleteCollectionAction(eventsResource, c.ns, listOptions) _, err := c.Fake.Invokes(action, &api.EventList{}) return err @@ -70,7 +70,7 @@ func (c *FakeEvents) DeleteCollection(options *v1.DeleteOptions, listOptions v1. func (c *FakeEvents) Get(name string, options v1.GetOptions) (result *api.Event, err error) { obj, err := c.Fake. - Invokes(core.NewGetAction(eventsResource, c.ns, name), &api.Event{}) + Invokes(testing.NewGetAction(eventsResource, c.ns, name), &api.Event{}) if obj == nil { return nil, err @@ -80,13 +80,13 @@ func (c *FakeEvents) Get(name string, options v1.GetOptions) (result *api.Event, func (c *FakeEvents) List(opts v1.ListOptions) (result *api.EventList, err error) { obj, err := c.Fake. - Invokes(core.NewListAction(eventsResource, c.ns, opts), &api.EventList{}) + Invokes(testing.NewListAction(eventsResource, c.ns, opts), &api.EventList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -102,14 +102,14 @@ func (c *FakeEvents) List(opts v1.ListOptions) (result *api.EventList, err error // Watch returns a watch.Interface that watches the requested events. func (c *FakeEvents) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewWatchAction(eventsResource, c.ns, opts)) + InvokesWatch(testing.NewWatchAction(eventsResource, c.ns, opts)) } // Patch applies the patch and returns the patched event. func (c *FakeEvents) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *api.Event, err error) { obj, err := c.Fake. - Invokes(core.NewPatchSubresourceAction(eventsResource, c.ns, name, data, subresources...), &api.Event{}) + Invokes(testing.NewPatchSubresourceAction(eventsResource, c.ns, name, data, subresources...), &api.Event{}) if obj == nil { return nil, err diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/fake_namespace.go b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/fake_namespace.go index d56a744ad03..d93b73ac161 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/fake_namespace.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/fake_namespace.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" api "k8s.io/kubernetes/pkg/api" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeNamespaces implements NamespaceInterface @@ -35,7 +35,7 @@ var namespacesResource = schema.GroupVersionResource{Group: "", Version: "", Res func (c *FakeNamespaces) Create(namespace *api.Namespace) (result *api.Namespace, err error) { obj, err := c.Fake. - Invokes(core.NewRootCreateAction(namespacesResource, namespace), &api.Namespace{}) + Invokes(testing.NewRootCreateAction(namespacesResource, namespace), &api.Namespace{}) if obj == nil { return nil, err } @@ -44,7 +44,7 @@ func (c *FakeNamespaces) Create(namespace *api.Namespace) (result *api.Namespace func (c *FakeNamespaces) Update(namespace *api.Namespace) (result *api.Namespace, err error) { obj, err := c.Fake. - Invokes(core.NewRootUpdateAction(namespacesResource, namespace), &api.Namespace{}) + Invokes(testing.NewRootUpdateAction(namespacesResource, namespace), &api.Namespace{}) if obj == nil { return nil, err } @@ -53,7 +53,7 @@ func (c *FakeNamespaces) Update(namespace *api.Namespace) (result *api.Namespace func (c *FakeNamespaces) UpdateStatus(namespace *api.Namespace) (*api.Namespace, error) { obj, err := c.Fake. - Invokes(core.NewRootUpdateSubresourceAction(namespacesResource, "status", namespace), &api.Namespace{}) + Invokes(testing.NewRootUpdateSubresourceAction(namespacesResource, "status", namespace), &api.Namespace{}) if obj == nil { return nil, err } @@ -62,12 +62,12 @@ func (c *FakeNamespaces) UpdateStatus(namespace *api.Namespace) (*api.Namespace, func (c *FakeNamespaces) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewRootDeleteAction(namespacesResource, name), &api.Namespace{}) + Invokes(testing.NewRootDeleteAction(namespacesResource, name), &api.Namespace{}) return err } func (c *FakeNamespaces) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := core.NewRootDeleteCollectionAction(namespacesResource, listOptions) + action := testing.NewRootDeleteCollectionAction(namespacesResource, listOptions) _, err := c.Fake.Invokes(action, &api.NamespaceList{}) return err @@ -75,7 +75,7 @@ func (c *FakeNamespaces) DeleteCollection(options *v1.DeleteOptions, listOptions func (c *FakeNamespaces) Get(name string, options v1.GetOptions) (result *api.Namespace, err error) { obj, err := c.Fake. - Invokes(core.NewRootGetAction(namespacesResource, name), &api.Namespace{}) + Invokes(testing.NewRootGetAction(namespacesResource, name), &api.Namespace{}) if obj == nil { return nil, err } @@ -84,12 +84,12 @@ func (c *FakeNamespaces) Get(name string, options v1.GetOptions) (result *api.Na func (c *FakeNamespaces) List(opts v1.ListOptions) (result *api.NamespaceList, err error) { obj, err := c.Fake. - Invokes(core.NewRootListAction(namespacesResource, opts), &api.NamespaceList{}) + Invokes(testing.NewRootListAction(namespacesResource, opts), &api.NamespaceList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -105,13 +105,13 @@ func (c *FakeNamespaces) List(opts v1.ListOptions) (result *api.NamespaceList, e // Watch returns a watch.Interface that watches the requested namespaces. func (c *FakeNamespaces) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewRootWatchAction(namespacesResource, opts)) + InvokesWatch(testing.NewRootWatchAction(namespacesResource, opts)) } // Patch applies the patch and returns the patched namespace. func (c *FakeNamespaces) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *api.Namespace, err error) { obj, err := c.Fake. - Invokes(core.NewRootPatchSubresourceAction(namespacesResource, name, data, subresources...), &api.Namespace{}) + Invokes(testing.NewRootPatchSubresourceAction(namespacesResource, name, data, subresources...), &api.Namespace{}) if obj == nil { return nil, err } diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/fake_namespace_expansion.go b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/fake_namespace_expansion.go index 619021772f4..6e8ee636494 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/fake_namespace_expansion.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/fake_namespace_expansion.go @@ -17,8 +17,8 @@ limitations under the License. package fake import ( + core "k8s.io/client-go/testing" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client/testing/core" ) func (c *FakeNamespaces) Finalize(namespace *api.Namespace) (*api.Namespace, error) { diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/fake_secret.go b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/fake_secret.go index 76600c49c56..da86133226f 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/fake_secret.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/fake_secret.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" api "k8s.io/kubernetes/pkg/api" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeSecrets implements SecretInterface @@ -36,7 +36,7 @@ var secretsResource = schema.GroupVersionResource{Group: "", Version: "", Resour func (c *FakeSecrets) Create(secret *api.Secret) (result *api.Secret, err error) { obj, err := c.Fake. - Invokes(core.NewCreateAction(secretsResource, c.ns, secret), &api.Secret{}) + Invokes(testing.NewCreateAction(secretsResource, c.ns, secret), &api.Secret{}) if obj == nil { return nil, err @@ -46,7 +46,7 @@ func (c *FakeSecrets) Create(secret *api.Secret) (result *api.Secret, err error) func (c *FakeSecrets) Update(secret *api.Secret) (result *api.Secret, err error) { obj, err := c.Fake. - Invokes(core.NewUpdateAction(secretsResource, c.ns, secret), &api.Secret{}) + Invokes(testing.NewUpdateAction(secretsResource, c.ns, secret), &api.Secret{}) if obj == nil { return nil, err @@ -56,13 +56,13 @@ func (c *FakeSecrets) Update(secret *api.Secret) (result *api.Secret, err error) func (c *FakeSecrets) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewDeleteAction(secretsResource, c.ns, name), &api.Secret{}) + Invokes(testing.NewDeleteAction(secretsResource, c.ns, name), &api.Secret{}) return err } func (c *FakeSecrets) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := core.NewDeleteCollectionAction(secretsResource, c.ns, listOptions) + action := testing.NewDeleteCollectionAction(secretsResource, c.ns, listOptions) _, err := c.Fake.Invokes(action, &api.SecretList{}) return err @@ -70,7 +70,7 @@ func (c *FakeSecrets) DeleteCollection(options *v1.DeleteOptions, listOptions v1 func (c *FakeSecrets) Get(name string, options v1.GetOptions) (result *api.Secret, err error) { obj, err := c.Fake. - Invokes(core.NewGetAction(secretsResource, c.ns, name), &api.Secret{}) + Invokes(testing.NewGetAction(secretsResource, c.ns, name), &api.Secret{}) if obj == nil { return nil, err @@ -80,13 +80,13 @@ func (c *FakeSecrets) Get(name string, options v1.GetOptions) (result *api.Secre func (c *FakeSecrets) List(opts v1.ListOptions) (result *api.SecretList, err error) { obj, err := c.Fake. - Invokes(core.NewListAction(secretsResource, c.ns, opts), &api.SecretList{}) + Invokes(testing.NewListAction(secretsResource, c.ns, opts), &api.SecretList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -102,14 +102,14 @@ func (c *FakeSecrets) List(opts v1.ListOptions) (result *api.SecretList, err err // Watch returns a watch.Interface that watches the requested secrets. func (c *FakeSecrets) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewWatchAction(secretsResource, c.ns, opts)) + InvokesWatch(testing.NewWatchAction(secretsResource, c.ns, opts)) } // Patch applies the patch and returns the patched secret. func (c *FakeSecrets) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *api.Secret, err error) { obj, err := c.Fake. - Invokes(core.NewPatchSubresourceAction(secretsResource, c.ns, name, data, subresources...), &api.Secret{}) + Invokes(testing.NewPatchSubresourceAction(secretsResource, c.ns, name, data, subresources...), &api.Secret{}) if obj == nil { return nil, err diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/fake_service.go b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/fake_service.go index 8e98d16bd41..e9ccf3b463e 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/fake_service.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/fake_service.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" api "k8s.io/kubernetes/pkg/api" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeServices implements ServiceInterface @@ -36,7 +36,7 @@ var servicesResource = schema.GroupVersionResource{Group: "", Version: "", Resou func (c *FakeServices) Create(service *api.Service) (result *api.Service, err error) { obj, err := c.Fake. - Invokes(core.NewCreateAction(servicesResource, c.ns, service), &api.Service{}) + Invokes(testing.NewCreateAction(servicesResource, c.ns, service), &api.Service{}) if obj == nil { return nil, err @@ -46,7 +46,7 @@ func (c *FakeServices) Create(service *api.Service) (result *api.Service, err er func (c *FakeServices) Update(service *api.Service) (result *api.Service, err error) { obj, err := c.Fake. - Invokes(core.NewUpdateAction(servicesResource, c.ns, service), &api.Service{}) + Invokes(testing.NewUpdateAction(servicesResource, c.ns, service), &api.Service{}) if obj == nil { return nil, err @@ -56,7 +56,7 @@ func (c *FakeServices) Update(service *api.Service) (result *api.Service, err er func (c *FakeServices) UpdateStatus(service *api.Service) (*api.Service, error) { obj, err := c.Fake. - Invokes(core.NewUpdateSubresourceAction(servicesResource, "status", c.ns, service), &api.Service{}) + Invokes(testing.NewUpdateSubresourceAction(servicesResource, "status", c.ns, service), &api.Service{}) if obj == nil { return nil, err @@ -66,13 +66,13 @@ func (c *FakeServices) UpdateStatus(service *api.Service) (*api.Service, error) func (c *FakeServices) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewDeleteAction(servicesResource, c.ns, name), &api.Service{}) + Invokes(testing.NewDeleteAction(servicesResource, c.ns, name), &api.Service{}) return err } func (c *FakeServices) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := core.NewDeleteCollectionAction(servicesResource, c.ns, listOptions) + action := testing.NewDeleteCollectionAction(servicesResource, c.ns, listOptions) _, err := c.Fake.Invokes(action, &api.ServiceList{}) return err @@ -80,7 +80,7 @@ func (c *FakeServices) DeleteCollection(options *v1.DeleteOptions, listOptions v func (c *FakeServices) Get(name string, options v1.GetOptions) (result *api.Service, err error) { obj, err := c.Fake. - Invokes(core.NewGetAction(servicesResource, c.ns, name), &api.Service{}) + Invokes(testing.NewGetAction(servicesResource, c.ns, name), &api.Service{}) if obj == nil { return nil, err @@ -90,13 +90,13 @@ func (c *FakeServices) Get(name string, options v1.GetOptions) (result *api.Serv func (c *FakeServices) List(opts v1.ListOptions) (result *api.ServiceList, err error) { obj, err := c.Fake. - Invokes(core.NewListAction(servicesResource, c.ns, opts), &api.ServiceList{}) + Invokes(testing.NewListAction(servicesResource, c.ns, opts), &api.ServiceList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -112,14 +112,14 @@ func (c *FakeServices) List(opts v1.ListOptions) (result *api.ServiceList, err e // Watch returns a watch.Interface that watches the requested services. func (c *FakeServices) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewWatchAction(servicesResource, c.ns, opts)) + InvokesWatch(testing.NewWatchAction(servicesResource, c.ns, opts)) } // Patch applies the patch and returns the patched service. func (c *FakeServices) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *api.Service, err error) { obj, err := c.Fake. - Invokes(core.NewPatchSubresourceAction(servicesResource, c.ns, name, data, subresources...), &api.Service{}) + Invokes(testing.NewPatchSubresourceAction(servicesResource, c.ns, name, data, subresources...), &api.Service{}) if obj == nil { return nil, err diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/fake/BUILD b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/fake/BUILD index 5b9acf1237c..ab7f8b10793 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/fake/BUILD +++ b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/fake/BUILD @@ -21,13 +21,13 @@ go_library( deps = [ "//federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion:go_default_library", "//pkg/apis/extensions:go_default_library", - "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/testing", ], ) diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/fake/fake_daemonset.go b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/fake/fake_daemonset.go index 9235189848a..54abeb4ed99 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/fake/fake_daemonset.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/fake/fake_daemonset.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" extensions "k8s.io/kubernetes/pkg/apis/extensions" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeDaemonSets implements DaemonSetInterface @@ -36,7 +36,7 @@ var daemonsetsResource = schema.GroupVersionResource{Group: "extensions", Versio func (c *FakeDaemonSets) Create(daemonSet *extensions.DaemonSet) (result *extensions.DaemonSet, err error) { obj, err := c.Fake. - Invokes(core.NewCreateAction(daemonsetsResource, c.ns, daemonSet), &extensions.DaemonSet{}) + Invokes(testing.NewCreateAction(daemonsetsResource, c.ns, daemonSet), &extensions.DaemonSet{}) if obj == nil { return nil, err @@ -46,7 +46,7 @@ func (c *FakeDaemonSets) Create(daemonSet *extensions.DaemonSet) (result *extens func (c *FakeDaemonSets) Update(daemonSet *extensions.DaemonSet) (result *extensions.DaemonSet, err error) { obj, err := c.Fake. - Invokes(core.NewUpdateAction(daemonsetsResource, c.ns, daemonSet), &extensions.DaemonSet{}) + Invokes(testing.NewUpdateAction(daemonsetsResource, c.ns, daemonSet), &extensions.DaemonSet{}) if obj == nil { return nil, err @@ -56,7 +56,7 @@ func (c *FakeDaemonSets) Update(daemonSet *extensions.DaemonSet) (result *extens func (c *FakeDaemonSets) UpdateStatus(daemonSet *extensions.DaemonSet) (*extensions.DaemonSet, error) { obj, err := c.Fake. - Invokes(core.NewUpdateSubresourceAction(daemonsetsResource, "status", c.ns, daemonSet), &extensions.DaemonSet{}) + Invokes(testing.NewUpdateSubresourceAction(daemonsetsResource, "status", c.ns, daemonSet), &extensions.DaemonSet{}) if obj == nil { return nil, err @@ -66,13 +66,13 @@ func (c *FakeDaemonSets) UpdateStatus(daemonSet *extensions.DaemonSet) (*extensi func (c *FakeDaemonSets) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewDeleteAction(daemonsetsResource, c.ns, name), &extensions.DaemonSet{}) + Invokes(testing.NewDeleteAction(daemonsetsResource, c.ns, name), &extensions.DaemonSet{}) return err } func (c *FakeDaemonSets) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := core.NewDeleteCollectionAction(daemonsetsResource, c.ns, listOptions) + action := testing.NewDeleteCollectionAction(daemonsetsResource, c.ns, listOptions) _, err := c.Fake.Invokes(action, &extensions.DaemonSetList{}) return err @@ -80,7 +80,7 @@ func (c *FakeDaemonSets) DeleteCollection(options *v1.DeleteOptions, listOptions func (c *FakeDaemonSets) Get(name string, options v1.GetOptions) (result *extensions.DaemonSet, err error) { obj, err := c.Fake. - Invokes(core.NewGetAction(daemonsetsResource, c.ns, name), &extensions.DaemonSet{}) + Invokes(testing.NewGetAction(daemonsetsResource, c.ns, name), &extensions.DaemonSet{}) if obj == nil { return nil, err @@ -90,13 +90,13 @@ func (c *FakeDaemonSets) Get(name string, options v1.GetOptions) (result *extens func (c *FakeDaemonSets) List(opts v1.ListOptions) (result *extensions.DaemonSetList, err error) { obj, err := c.Fake. - Invokes(core.NewListAction(daemonsetsResource, c.ns, opts), &extensions.DaemonSetList{}) + Invokes(testing.NewListAction(daemonsetsResource, c.ns, opts), &extensions.DaemonSetList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -112,14 +112,14 @@ func (c *FakeDaemonSets) List(opts v1.ListOptions) (result *extensions.DaemonSet // Watch returns a watch.Interface that watches the requested daemonSets. func (c *FakeDaemonSets) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewWatchAction(daemonsetsResource, c.ns, opts)) + InvokesWatch(testing.NewWatchAction(daemonsetsResource, c.ns, opts)) } // Patch applies the patch and returns the patched daemonSet. func (c *FakeDaemonSets) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *extensions.DaemonSet, err error) { obj, err := c.Fake. - Invokes(core.NewPatchSubresourceAction(daemonsetsResource, c.ns, name, data, subresources...), &extensions.DaemonSet{}) + Invokes(testing.NewPatchSubresourceAction(daemonsetsResource, c.ns, name, data, subresources...), &extensions.DaemonSet{}) if obj == nil { return nil, err diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/fake/fake_deployment.go b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/fake/fake_deployment.go index 0155cff36b3..32de2c1f934 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/fake/fake_deployment.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/fake/fake_deployment.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" extensions "k8s.io/kubernetes/pkg/apis/extensions" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeDeployments implements DeploymentInterface @@ -36,7 +36,7 @@ var deploymentsResource = schema.GroupVersionResource{Group: "extensions", Versi func (c *FakeDeployments) Create(deployment *extensions.Deployment) (result *extensions.Deployment, err error) { obj, err := c.Fake. - Invokes(core.NewCreateAction(deploymentsResource, c.ns, deployment), &extensions.Deployment{}) + Invokes(testing.NewCreateAction(deploymentsResource, c.ns, deployment), &extensions.Deployment{}) if obj == nil { return nil, err @@ -46,7 +46,7 @@ func (c *FakeDeployments) Create(deployment *extensions.Deployment) (result *ext func (c *FakeDeployments) Update(deployment *extensions.Deployment) (result *extensions.Deployment, err error) { obj, err := c.Fake. - Invokes(core.NewUpdateAction(deploymentsResource, c.ns, deployment), &extensions.Deployment{}) + Invokes(testing.NewUpdateAction(deploymentsResource, c.ns, deployment), &extensions.Deployment{}) if obj == nil { return nil, err @@ -56,7 +56,7 @@ func (c *FakeDeployments) Update(deployment *extensions.Deployment) (result *ext func (c *FakeDeployments) UpdateStatus(deployment *extensions.Deployment) (*extensions.Deployment, error) { obj, err := c.Fake. - Invokes(core.NewUpdateSubresourceAction(deploymentsResource, "status", c.ns, deployment), &extensions.Deployment{}) + Invokes(testing.NewUpdateSubresourceAction(deploymentsResource, "status", c.ns, deployment), &extensions.Deployment{}) if obj == nil { return nil, err @@ -66,13 +66,13 @@ func (c *FakeDeployments) UpdateStatus(deployment *extensions.Deployment) (*exte func (c *FakeDeployments) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewDeleteAction(deploymentsResource, c.ns, name), &extensions.Deployment{}) + Invokes(testing.NewDeleteAction(deploymentsResource, c.ns, name), &extensions.Deployment{}) return err } func (c *FakeDeployments) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := core.NewDeleteCollectionAction(deploymentsResource, c.ns, listOptions) + action := testing.NewDeleteCollectionAction(deploymentsResource, c.ns, listOptions) _, err := c.Fake.Invokes(action, &extensions.DeploymentList{}) return err @@ -80,7 +80,7 @@ func (c *FakeDeployments) DeleteCollection(options *v1.DeleteOptions, listOption func (c *FakeDeployments) Get(name string, options v1.GetOptions) (result *extensions.Deployment, err error) { obj, err := c.Fake. - Invokes(core.NewGetAction(deploymentsResource, c.ns, name), &extensions.Deployment{}) + Invokes(testing.NewGetAction(deploymentsResource, c.ns, name), &extensions.Deployment{}) if obj == nil { return nil, err @@ -90,13 +90,13 @@ func (c *FakeDeployments) Get(name string, options v1.GetOptions) (result *exten func (c *FakeDeployments) List(opts v1.ListOptions) (result *extensions.DeploymentList, err error) { obj, err := c.Fake. - Invokes(core.NewListAction(deploymentsResource, c.ns, opts), &extensions.DeploymentList{}) + Invokes(testing.NewListAction(deploymentsResource, c.ns, opts), &extensions.DeploymentList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -112,14 +112,14 @@ func (c *FakeDeployments) List(opts v1.ListOptions) (result *extensions.Deployme // Watch returns a watch.Interface that watches the requested deployments. func (c *FakeDeployments) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewWatchAction(deploymentsResource, c.ns, opts)) + InvokesWatch(testing.NewWatchAction(deploymentsResource, c.ns, opts)) } // Patch applies the patch and returns the patched deployment. func (c *FakeDeployments) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *extensions.Deployment, err error) { obj, err := c.Fake. - Invokes(core.NewPatchSubresourceAction(deploymentsResource, c.ns, name, data, subresources...), &extensions.Deployment{}) + Invokes(testing.NewPatchSubresourceAction(deploymentsResource, c.ns, name, data, subresources...), &extensions.Deployment{}) if obj == nil { return nil, err diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/fake/fake_extensions_client.go b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/fake/fake_extensions_client.go index 23ac7065c35..cabb5f6446b 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/fake/fake_extensions_client.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/fake/fake_extensions_client.go @@ -18,12 +18,12 @@ package fake import ( rest "k8s.io/client-go/rest" + testing "k8s.io/client-go/testing" internalversion "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion" - core "k8s.io/kubernetes/pkg/client/testing/core" ) type FakeExtensions struct { - *core.Fake + *testing.Fake } func (c *FakeExtensions) DaemonSets(namespace string) internalversion.DaemonSetInterface { diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/fake/fake_ingress.go b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/fake/fake_ingress.go index 7521342ecd4..5d475f15dd0 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/fake/fake_ingress.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/fake/fake_ingress.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" extensions "k8s.io/kubernetes/pkg/apis/extensions" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeIngresses implements IngressInterface @@ -36,7 +36,7 @@ var ingressesResource = schema.GroupVersionResource{Group: "extensions", Version func (c *FakeIngresses) Create(ingress *extensions.Ingress) (result *extensions.Ingress, err error) { obj, err := c.Fake. - Invokes(core.NewCreateAction(ingressesResource, c.ns, ingress), &extensions.Ingress{}) + Invokes(testing.NewCreateAction(ingressesResource, c.ns, ingress), &extensions.Ingress{}) if obj == nil { return nil, err @@ -46,7 +46,7 @@ func (c *FakeIngresses) Create(ingress *extensions.Ingress) (result *extensions. func (c *FakeIngresses) Update(ingress *extensions.Ingress) (result *extensions.Ingress, err error) { obj, err := c.Fake. - Invokes(core.NewUpdateAction(ingressesResource, c.ns, ingress), &extensions.Ingress{}) + Invokes(testing.NewUpdateAction(ingressesResource, c.ns, ingress), &extensions.Ingress{}) if obj == nil { return nil, err @@ -56,7 +56,7 @@ func (c *FakeIngresses) Update(ingress *extensions.Ingress) (result *extensions. func (c *FakeIngresses) UpdateStatus(ingress *extensions.Ingress) (*extensions.Ingress, error) { obj, err := c.Fake. - Invokes(core.NewUpdateSubresourceAction(ingressesResource, "status", c.ns, ingress), &extensions.Ingress{}) + Invokes(testing.NewUpdateSubresourceAction(ingressesResource, "status", c.ns, ingress), &extensions.Ingress{}) if obj == nil { return nil, err @@ -66,13 +66,13 @@ func (c *FakeIngresses) UpdateStatus(ingress *extensions.Ingress) (*extensions.I func (c *FakeIngresses) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewDeleteAction(ingressesResource, c.ns, name), &extensions.Ingress{}) + Invokes(testing.NewDeleteAction(ingressesResource, c.ns, name), &extensions.Ingress{}) return err } func (c *FakeIngresses) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := core.NewDeleteCollectionAction(ingressesResource, c.ns, listOptions) + action := testing.NewDeleteCollectionAction(ingressesResource, c.ns, listOptions) _, err := c.Fake.Invokes(action, &extensions.IngressList{}) return err @@ -80,7 +80,7 @@ func (c *FakeIngresses) DeleteCollection(options *v1.DeleteOptions, listOptions func (c *FakeIngresses) Get(name string, options v1.GetOptions) (result *extensions.Ingress, err error) { obj, err := c.Fake. - Invokes(core.NewGetAction(ingressesResource, c.ns, name), &extensions.Ingress{}) + Invokes(testing.NewGetAction(ingressesResource, c.ns, name), &extensions.Ingress{}) if obj == nil { return nil, err @@ -90,13 +90,13 @@ func (c *FakeIngresses) Get(name string, options v1.GetOptions) (result *extensi func (c *FakeIngresses) List(opts v1.ListOptions) (result *extensions.IngressList, err error) { obj, err := c.Fake. - Invokes(core.NewListAction(ingressesResource, c.ns, opts), &extensions.IngressList{}) + Invokes(testing.NewListAction(ingressesResource, c.ns, opts), &extensions.IngressList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -112,14 +112,14 @@ func (c *FakeIngresses) List(opts v1.ListOptions) (result *extensions.IngressLis // Watch returns a watch.Interface that watches the requested ingresses. func (c *FakeIngresses) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewWatchAction(ingressesResource, c.ns, opts)) + InvokesWatch(testing.NewWatchAction(ingressesResource, c.ns, opts)) } // Patch applies the patch and returns the patched ingress. func (c *FakeIngresses) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *extensions.Ingress, err error) { obj, err := c.Fake. - Invokes(core.NewPatchSubresourceAction(ingressesResource, c.ns, name, data, subresources...), &extensions.Ingress{}) + Invokes(testing.NewPatchSubresourceAction(ingressesResource, c.ns, name, data, subresources...), &extensions.Ingress{}) if obj == nil { return nil, err diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/fake/fake_replicaset.go b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/fake/fake_replicaset.go index 3fe846e605e..d329869fc97 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/fake/fake_replicaset.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/fake/fake_replicaset.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" extensions "k8s.io/kubernetes/pkg/apis/extensions" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeReplicaSets implements ReplicaSetInterface @@ -36,7 +36,7 @@ var replicasetsResource = schema.GroupVersionResource{Group: "extensions", Versi func (c *FakeReplicaSets) Create(replicaSet *extensions.ReplicaSet) (result *extensions.ReplicaSet, err error) { obj, err := c.Fake. - Invokes(core.NewCreateAction(replicasetsResource, c.ns, replicaSet), &extensions.ReplicaSet{}) + Invokes(testing.NewCreateAction(replicasetsResource, c.ns, replicaSet), &extensions.ReplicaSet{}) if obj == nil { return nil, err @@ -46,7 +46,7 @@ func (c *FakeReplicaSets) Create(replicaSet *extensions.ReplicaSet) (result *ext func (c *FakeReplicaSets) Update(replicaSet *extensions.ReplicaSet) (result *extensions.ReplicaSet, err error) { obj, err := c.Fake. - Invokes(core.NewUpdateAction(replicasetsResource, c.ns, replicaSet), &extensions.ReplicaSet{}) + Invokes(testing.NewUpdateAction(replicasetsResource, c.ns, replicaSet), &extensions.ReplicaSet{}) if obj == nil { return nil, err @@ -56,7 +56,7 @@ func (c *FakeReplicaSets) Update(replicaSet *extensions.ReplicaSet) (result *ext func (c *FakeReplicaSets) UpdateStatus(replicaSet *extensions.ReplicaSet) (*extensions.ReplicaSet, error) { obj, err := c.Fake. - Invokes(core.NewUpdateSubresourceAction(replicasetsResource, "status", c.ns, replicaSet), &extensions.ReplicaSet{}) + Invokes(testing.NewUpdateSubresourceAction(replicasetsResource, "status", c.ns, replicaSet), &extensions.ReplicaSet{}) if obj == nil { return nil, err @@ -66,13 +66,13 @@ func (c *FakeReplicaSets) UpdateStatus(replicaSet *extensions.ReplicaSet) (*exte func (c *FakeReplicaSets) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewDeleteAction(replicasetsResource, c.ns, name), &extensions.ReplicaSet{}) + Invokes(testing.NewDeleteAction(replicasetsResource, c.ns, name), &extensions.ReplicaSet{}) return err } func (c *FakeReplicaSets) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := core.NewDeleteCollectionAction(replicasetsResource, c.ns, listOptions) + action := testing.NewDeleteCollectionAction(replicasetsResource, c.ns, listOptions) _, err := c.Fake.Invokes(action, &extensions.ReplicaSetList{}) return err @@ -80,7 +80,7 @@ func (c *FakeReplicaSets) DeleteCollection(options *v1.DeleteOptions, listOption func (c *FakeReplicaSets) Get(name string, options v1.GetOptions) (result *extensions.ReplicaSet, err error) { obj, err := c.Fake. - Invokes(core.NewGetAction(replicasetsResource, c.ns, name), &extensions.ReplicaSet{}) + Invokes(testing.NewGetAction(replicasetsResource, c.ns, name), &extensions.ReplicaSet{}) if obj == nil { return nil, err @@ -90,13 +90,13 @@ func (c *FakeReplicaSets) Get(name string, options v1.GetOptions) (result *exten func (c *FakeReplicaSets) List(opts v1.ListOptions) (result *extensions.ReplicaSetList, err error) { obj, err := c.Fake. - Invokes(core.NewListAction(replicasetsResource, c.ns, opts), &extensions.ReplicaSetList{}) + Invokes(testing.NewListAction(replicasetsResource, c.ns, opts), &extensions.ReplicaSetList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -112,14 +112,14 @@ func (c *FakeReplicaSets) List(opts v1.ListOptions) (result *extensions.ReplicaS // Watch returns a watch.Interface that watches the requested replicaSets. func (c *FakeReplicaSets) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewWatchAction(replicasetsResource, c.ns, opts)) + InvokesWatch(testing.NewWatchAction(replicasetsResource, c.ns, opts)) } // Patch applies the patch and returns the patched replicaSet. func (c *FakeReplicaSets) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *extensions.ReplicaSet, err error) { obj, err := c.Fake. - Invokes(core.NewPatchSubresourceAction(replicasetsResource, c.ns, name, data, subresources...), &extensions.ReplicaSet{}) + Invokes(testing.NewPatchSubresourceAction(replicasetsResource, c.ns, name, data, subresources...), &extensions.ReplicaSet{}) if obj == nil { return nil, err diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/fake/BUILD b/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/fake/BUILD index bba51fa6dab..ac3b79439f5 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/fake/BUILD +++ b/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/fake/BUILD @@ -18,13 +18,13 @@ go_library( deps = [ "//federation/apis/federation:go_default_library", "//federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion:go_default_library", - "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/testing", ], ) diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/fake/fake_cluster.go b/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/fake/fake_cluster.go index 7eea65f640c..50e65f1d278 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/fake/fake_cluster.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/fake/fake_cluster.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" federation "k8s.io/kubernetes/federation/apis/federation" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeClusters implements ClusterInterface @@ -35,7 +35,7 @@ var clustersResource = schema.GroupVersionResource{Group: "federation", Version: func (c *FakeClusters) Create(cluster *federation.Cluster) (result *federation.Cluster, err error) { obj, err := c.Fake. - Invokes(core.NewRootCreateAction(clustersResource, cluster), &federation.Cluster{}) + Invokes(testing.NewRootCreateAction(clustersResource, cluster), &federation.Cluster{}) if obj == nil { return nil, err } @@ -44,7 +44,7 @@ func (c *FakeClusters) Create(cluster *federation.Cluster) (result *federation.C func (c *FakeClusters) Update(cluster *federation.Cluster) (result *federation.Cluster, err error) { obj, err := c.Fake. - Invokes(core.NewRootUpdateAction(clustersResource, cluster), &federation.Cluster{}) + Invokes(testing.NewRootUpdateAction(clustersResource, cluster), &federation.Cluster{}) if obj == nil { return nil, err } @@ -53,7 +53,7 @@ func (c *FakeClusters) Update(cluster *federation.Cluster) (result *federation.C func (c *FakeClusters) UpdateStatus(cluster *federation.Cluster) (*federation.Cluster, error) { obj, err := c.Fake. - Invokes(core.NewRootUpdateSubresourceAction(clustersResource, "status", cluster), &federation.Cluster{}) + Invokes(testing.NewRootUpdateSubresourceAction(clustersResource, "status", cluster), &federation.Cluster{}) if obj == nil { return nil, err } @@ -62,12 +62,12 @@ func (c *FakeClusters) UpdateStatus(cluster *federation.Cluster) (*federation.Cl func (c *FakeClusters) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewRootDeleteAction(clustersResource, name), &federation.Cluster{}) + Invokes(testing.NewRootDeleteAction(clustersResource, name), &federation.Cluster{}) return err } func (c *FakeClusters) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := core.NewRootDeleteCollectionAction(clustersResource, listOptions) + action := testing.NewRootDeleteCollectionAction(clustersResource, listOptions) _, err := c.Fake.Invokes(action, &federation.ClusterList{}) return err @@ -75,7 +75,7 @@ func (c *FakeClusters) DeleteCollection(options *v1.DeleteOptions, listOptions v func (c *FakeClusters) Get(name string, options v1.GetOptions) (result *federation.Cluster, err error) { obj, err := c.Fake. - Invokes(core.NewRootGetAction(clustersResource, name), &federation.Cluster{}) + Invokes(testing.NewRootGetAction(clustersResource, name), &federation.Cluster{}) if obj == nil { return nil, err } @@ -84,12 +84,12 @@ func (c *FakeClusters) Get(name string, options v1.GetOptions) (result *federati func (c *FakeClusters) List(opts v1.ListOptions) (result *federation.ClusterList, err error) { obj, err := c.Fake. - Invokes(core.NewRootListAction(clustersResource, opts), &federation.ClusterList{}) + Invokes(testing.NewRootListAction(clustersResource, opts), &federation.ClusterList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -105,13 +105,13 @@ func (c *FakeClusters) List(opts v1.ListOptions) (result *federation.ClusterList // Watch returns a watch.Interface that watches the requested clusters. func (c *FakeClusters) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewRootWatchAction(clustersResource, opts)) + InvokesWatch(testing.NewRootWatchAction(clustersResource, opts)) } // Patch applies the patch and returns the patched cluster. func (c *FakeClusters) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *federation.Cluster, err error) { obj, err := c.Fake. - Invokes(core.NewRootPatchSubresourceAction(clustersResource, name, data, subresources...), &federation.Cluster{}) + Invokes(testing.NewRootPatchSubresourceAction(clustersResource, name, data, subresources...), &federation.Cluster{}) if obj == nil { return nil, err } diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/fake/fake_federation_client.go b/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/fake/fake_federation_client.go index 0bd29d43988..7f9b225bb57 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/fake/fake_federation_client.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/fake/fake_federation_client.go @@ -18,12 +18,12 @@ package fake import ( rest "k8s.io/client-go/rest" + testing "k8s.io/client-go/testing" internalversion "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion" - core "k8s.io/kubernetes/pkg/client/testing/core" ) type FakeFederation struct { - *core.Fake + *testing.Fake } func (c *FakeFederation) Clusters() internalversion.ClusterInterface { diff --git a/federation/pkg/federation-controller/namespace/BUILD b/federation/pkg/federation-controller/namespace/BUILD index 7641cf0619c..eea34a707ad 100644 --- a/federation/pkg/federation-controller/namespace/BUILD +++ b/federation/pkg/federation-controller/namespace/BUILD @@ -48,11 +48,11 @@ go_test( "//pkg/apis/extensions/v1beta1:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", "//pkg/client/clientset_generated/clientset/fake:go_default_library", - "//pkg/client/testing/core:go_default_library", "//vendor:github.com/stretchr/testify/assert", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/wait", + "//vendor:k8s.io/client-go/testing", ], ) diff --git a/federation/pkg/federation-controller/namespace/namespace_controller_test.go b/federation/pkg/federation-controller/namespace/namespace_controller_test.go index 08387bf6b66..bd4a32de7d1 100644 --- a/federation/pkg/federation-controller/namespace/namespace_controller_test.go +++ b/federation/pkg/federation-controller/namespace/namespace_controller_test.go @@ -24,6 +24,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/wait" + core "k8s.io/client-go/testing" federationapi "k8s.io/kubernetes/federation/apis/federation/v1beta1" fakefedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/fake" "k8s.io/kubernetes/federation/pkg/federation-controller/util" @@ -33,7 +34,6 @@ import ( extensionsv1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" kubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" fakekubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" - "k8s.io/kubernetes/pkg/client/testing/core" "github.com/stretchr/testify/assert" ) diff --git a/federation/pkg/federation-controller/replicaset/BUILD b/federation/pkg/federation-controller/replicaset/BUILD index e26cc63fc6c..84cd8b86524 100644 --- a/federation/pkg/federation-controller/replicaset/BUILD +++ b/federation/pkg/federation-controller/replicaset/BUILD @@ -53,11 +53,11 @@ go_test( "//pkg/apis/extensions/v1beta1:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", "//pkg/client/clientset_generated/clientset/fake:go_default_library", - "//pkg/client/testing/core:go_default_library", "//vendor:github.com/stretchr/testify/assert", "//vendor:k8s.io/apimachinery/pkg/api/meta", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/client-go/testing", ], ) diff --git a/federation/pkg/federation-controller/replicaset/replicasetcontroller_test.go b/federation/pkg/federation-controller/replicaset/replicasetcontroller_test.go index 3d94ae2aabd..a8539ccaa4b 100644 --- a/federation/pkg/federation-controller/replicaset/replicasetcontroller_test.go +++ b/federation/pkg/federation-controller/replicaset/replicasetcontroller_test.go @@ -25,6 +25,7 @@ import ( "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" + core "k8s.io/client-go/testing" fedv1 "k8s.io/kubernetes/federation/apis/federation/v1beta1" fedclientfake "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/fake" "k8s.io/kubernetes/federation/pkg/federation-controller/util/test" @@ -32,7 +33,6 @@ import ( extensionsv1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" kubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" kubeclientfake "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" - "k8s.io/kubernetes/pkg/client/testing/core" "github.com/stretchr/testify/assert" ) diff --git a/federation/pkg/federation-controller/util/BUILD b/federation/pkg/federation-controller/util/BUILD index d920ad3a990..bccc03a363f 100644 --- a/federation/pkg/federation-controller/util/BUILD +++ b/federation/pkg/federation-controller/util/BUILD @@ -65,12 +65,12 @@ go_test( "//pkg/apis/extensions/v1beta1:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", "//pkg/client/clientset_generated/clientset/fake:go_default_library", - "//pkg/client/testing/core:go_default_library", "//pkg/controller/deployment/util:go_default_library", "//vendor:github.com/stretchr/testify/assert", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/client-go/testing", "//vendor:k8s.io/client-go/tools/cache", ], ) diff --git a/federation/pkg/federation-controller/util/eventsink/BUILD b/federation/pkg/federation-controller/util/eventsink/BUILD index bdf0d7886f0..a34497d609f 100644 --- a/federation/pkg/federation-controller/util/eventsink/BUILD +++ b/federation/pkg/federation-controller/util/eventsink/BUILD @@ -29,10 +29,10 @@ go_test( "//federation/client/clientset_generated/federation_clientset/fake:go_default_library", "//federation/pkg/federation-controller/util/test:go_default_library", "//pkg/api/v1:go_default_library", - "//pkg/client/testing/core:go_default_library", "//vendor:github.com/stretchr/testify/assert", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/client-go/testing", ], ) diff --git a/federation/pkg/federation-controller/util/eventsink/eventsink_test.go b/federation/pkg/federation-controller/util/eventsink/eventsink_test.go index 3364d0cab2b..0d868bd2cb5 100644 --- a/federation/pkg/federation-controller/util/eventsink/eventsink_test.go +++ b/federation/pkg/federation-controller/util/eventsink/eventsink_test.go @@ -21,10 +21,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + core "k8s.io/client-go/testing" fakefedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/fake" . "k8s.io/kubernetes/federation/pkg/federation-controller/util/test" apiv1 "k8s.io/kubernetes/pkg/api/v1" - "k8s.io/kubernetes/pkg/client/testing/core" "github.com/stretchr/testify/assert" ) diff --git a/federation/pkg/federation-controller/util/federated_informer_test.go b/federation/pkg/federation-controller/util/federated_informer_test.go index a4ce066bf92..65585beffbe 100644 --- a/federation/pkg/federation-controller/util/federated_informer_test.go +++ b/federation/pkg/federation-controller/util/federated_informer_test.go @@ -23,13 +23,13 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" + core "k8s.io/client-go/testing" "k8s.io/client-go/tools/cache" federationapi "k8s.io/kubernetes/federation/apis/federation/v1beta1" fakefederationclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/fake" apiv1 "k8s.io/kubernetes/pkg/api/v1" kubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" fakekubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" - "k8s.io/kubernetes/pkg/client/testing/core" "github.com/stretchr/testify/assert" ) diff --git a/federation/pkg/federation-controller/util/test/BUILD b/federation/pkg/federation-controller/util/test/BUILD index 75895544713..39893f7e044 100644 --- a/federation/pkg/federation-controller/util/test/BUILD +++ b/federation/pkg/federation-controller/util/test/BUILD @@ -16,12 +16,12 @@ go_library( "//federation/pkg/federation-controller/util:go_default_library", "//pkg/api:go_default_library", "//pkg/api/v1:go_default_library", - "//pkg/client/testing/core:go_default_library", "//vendor:github.com/golang/glog", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/wait", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/client-go/testing", ], ) diff --git a/federation/pkg/federation-controller/util/test/test_helper.go b/federation/pkg/federation-controller/util/test/test_helper.go index ca1ed5966b1..409903f6b56 100644 --- a/federation/pkg/federation-controller/util/test/test_helper.go +++ b/federation/pkg/federation-controller/util/test/test_helper.go @@ -28,11 +28,11 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/watch" + core "k8s.io/client-go/testing" federationapi "k8s.io/kubernetes/federation/apis/federation/v1beta1" "k8s.io/kubernetes/federation/pkg/federation-controller/util" "k8s.io/kubernetes/pkg/api" apiv1 "k8s.io/kubernetes/pkg/api/v1" - "k8s.io/kubernetes/pkg/client/testing/core" "github.com/golang/glog" ) diff --git a/hack/.linted_packages b/hack/.linted_packages index 74ca271f01d..83b040c6941 100644 --- a/hack/.linted_packages +++ b/hack/.linted_packages @@ -145,8 +145,6 @@ pkg/client/listers/storage/internalversion pkg/client/listers/storage/v1beta1 pkg/client/metrics pkg/client/metrics/prometheus -pkg/client/testing/core -pkg/client/typed/discovery pkg/client/unversioned pkg/client/unversioned/remotecommand pkg/cloudprovider/providers @@ -296,7 +294,6 @@ staging/src/k8s.io/client-go/plugin/pkg/client/auth staging/src/k8s.io/client-go/plugin/pkg/client/auth/gcp staging/src/k8s.io/client-go/rest/watch staging/src/k8s.io/client-go/tools/auth -staging/src/k8s.io/client-go/tools/cache staging/src/k8s.io/client-go/tools/metrics staging/src/k8s.io/client-go/util/cert staging/src/k8s.io/client-go/util/homedir diff --git a/pkg/BUILD b/pkg/BUILD index b8371ed19ce..55fbd051282 100644 --- a/pkg/BUILD +++ b/pkg/BUILD @@ -70,8 +70,6 @@ filegroup( "//pkg/client/record:all-srcs", "//pkg/client/retry:all-srcs", "//pkg/client/testdata:all-srcs", - "//pkg/client/testing/cache:all-srcs", - "//pkg/client/testing/core:all-srcs", "//pkg/client/tests:all-srcs", "//pkg/client/unversioned:all-srcs", "//pkg/cloudprovider:all-srcs", diff --git a/pkg/client/clientset_generated/clientset/fake/BUILD b/pkg/client/clientset_generated/clientset/fake/BUILD index 61214fb5451..caeea12b47d 100644 --- a/pkg/client/clientset_generated/clientset/fake/BUILD +++ b/pkg/client/clientset_generated/clientset/fake/BUILD @@ -43,11 +43,11 @@ go_library( "//pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/fake:go_default_library", "//pkg/client/clientset_generated/clientset/typed/storage/v1beta1:go_default_library", "//pkg/client/clientset_generated/clientset/typed/storage/v1beta1/fake:go_default_library", - "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/client-go/discovery", "//vendor:k8s.io/client-go/discovery/fake", + "//vendor:k8s.io/client-go/testing", ], ) diff --git a/pkg/client/clientset_generated/clientset/fake/clientset_generated.go b/pkg/client/clientset_generated/clientset/fake/clientset_generated.go index 06a270deadb..c39562411eb 100644 --- a/pkg/client/clientset_generated/clientset/fake/clientset_generated.go +++ b/pkg/client/clientset_generated/clientset/fake/clientset_generated.go @@ -21,6 +21,7 @@ import ( "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/discovery" fakediscovery "k8s.io/client-go/discovery/fake" + "k8s.io/client-go/testing" "k8s.io/kubernetes/pkg/api" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" v1beta1apps "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/apps/v1beta1" @@ -49,7 +50,6 @@ import ( fakev1beta1rbac "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/fake" v1beta1storage "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/storage/v1beta1" fakev1beta1storage "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/fake" - "k8s.io/kubernetes/pkg/client/testing/core" ) // NewSimpleClientset returns a clientset that will respond with the provided objects. @@ -57,17 +57,17 @@ import ( // without applying any validations and/or defaults. It shouldn't be considered a replacement // for a real clientset and is mostly useful in simple unit tests. func NewSimpleClientset(objects ...runtime.Object) *Clientset { - o := core.NewObjectTracker(api.Scheme, api.Codecs.UniversalDecoder()) + o := testing.NewObjectTracker(api.Registry, api.Scheme, api.Codecs.UniversalDecoder()) for _, obj := range objects { if err := o.Add(obj); err != nil { panic(err) } } - fakePtr := core.Fake{} - fakePtr.AddReactor("*", "*", core.ObjectReaction(o, api.Registry.RESTMapper())) + fakePtr := testing.Fake{} + fakePtr.AddReactor("*", "*", testing.ObjectReaction(o, api.Registry.RESTMapper())) - fakePtr.AddWatchReactor("*", core.DefaultWatchReactor(watch.NewFake(), nil)) + fakePtr.AddWatchReactor("*", testing.DefaultWatchReactor(watch.NewFake(), nil)) return &Clientset{fakePtr} } @@ -76,7 +76,7 @@ func NewSimpleClientset(objects ...runtime.Object) *Clientset { // struct to get a default implementation. This makes faking out just the method // you want to test easier. type Clientset struct { - core.Fake + testing.Fake } func (c *Clientset) Discovery() discovery.DiscoveryInterface { diff --git a/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/fake/BUILD b/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/fake/BUILD index 630c0f208e3..58aaae1b9a3 100644 --- a/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/fake/BUILD +++ b/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/fake/BUILD @@ -18,13 +18,13 @@ go_library( deps = [ "//pkg/apis/apps/v1beta1:go_default_library", "//pkg/client/clientset_generated/clientset/typed/apps/v1beta1:go_default_library", - "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/testing", ], ) diff --git a/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/fake/fake_apps_client.go b/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/fake/fake_apps_client.go index ae22f079ba1..a9355056710 100644 --- a/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/fake/fake_apps_client.go +++ b/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/fake/fake_apps_client.go @@ -18,12 +18,12 @@ package fake import ( rest "k8s.io/client-go/rest" + testing "k8s.io/client-go/testing" v1beta1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/apps/v1beta1" - core "k8s.io/kubernetes/pkg/client/testing/core" ) type FakeAppsV1beta1 struct { - *core.Fake + *testing.Fake } func (c *FakeAppsV1beta1) StatefulSets(namespace string) v1beta1.StatefulSetInterface { diff --git a/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/fake/fake_statefulset.go b/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/fake/fake_statefulset.go index 187920314c3..fc117ba9353 100644 --- a/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/fake/fake_statefulset.go +++ b/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/fake/fake_statefulset.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" v1beta1 "k8s.io/kubernetes/pkg/apis/apps/v1beta1" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeStatefulSets implements StatefulSetInterface @@ -36,7 +36,7 @@ var statefulsetsResource = schema.GroupVersionResource{Group: "apps", Version: " func (c *FakeStatefulSets) Create(statefulSet *v1beta1.StatefulSet) (result *v1beta1.StatefulSet, err error) { obj, err := c.Fake. - Invokes(core.NewCreateAction(statefulsetsResource, c.ns, statefulSet), &v1beta1.StatefulSet{}) + Invokes(testing.NewCreateAction(statefulsetsResource, c.ns, statefulSet), &v1beta1.StatefulSet{}) if obj == nil { return nil, err @@ -46,7 +46,7 @@ func (c *FakeStatefulSets) Create(statefulSet *v1beta1.StatefulSet) (result *v1b func (c *FakeStatefulSets) Update(statefulSet *v1beta1.StatefulSet) (result *v1beta1.StatefulSet, err error) { obj, err := c.Fake. - Invokes(core.NewUpdateAction(statefulsetsResource, c.ns, statefulSet), &v1beta1.StatefulSet{}) + Invokes(testing.NewUpdateAction(statefulsetsResource, c.ns, statefulSet), &v1beta1.StatefulSet{}) if obj == nil { return nil, err @@ -56,7 +56,7 @@ func (c *FakeStatefulSets) Update(statefulSet *v1beta1.StatefulSet) (result *v1b func (c *FakeStatefulSets) UpdateStatus(statefulSet *v1beta1.StatefulSet) (*v1beta1.StatefulSet, error) { obj, err := c.Fake. - Invokes(core.NewUpdateSubresourceAction(statefulsetsResource, "status", c.ns, statefulSet), &v1beta1.StatefulSet{}) + Invokes(testing.NewUpdateSubresourceAction(statefulsetsResource, "status", c.ns, statefulSet), &v1beta1.StatefulSet{}) if obj == nil { return nil, err @@ -66,13 +66,13 @@ func (c *FakeStatefulSets) UpdateStatus(statefulSet *v1beta1.StatefulSet) (*v1be func (c *FakeStatefulSets) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewDeleteAction(statefulsetsResource, c.ns, name), &v1beta1.StatefulSet{}) + Invokes(testing.NewDeleteAction(statefulsetsResource, c.ns, name), &v1beta1.StatefulSet{}) return err } func (c *FakeStatefulSets) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := core.NewDeleteCollectionAction(statefulsetsResource, c.ns, listOptions) + action := testing.NewDeleteCollectionAction(statefulsetsResource, c.ns, listOptions) _, err := c.Fake.Invokes(action, &v1beta1.StatefulSetList{}) return err @@ -80,7 +80,7 @@ func (c *FakeStatefulSets) DeleteCollection(options *v1.DeleteOptions, listOptio func (c *FakeStatefulSets) Get(name string, options v1.GetOptions) (result *v1beta1.StatefulSet, err error) { obj, err := c.Fake. - Invokes(core.NewGetAction(statefulsetsResource, c.ns, name), &v1beta1.StatefulSet{}) + Invokes(testing.NewGetAction(statefulsetsResource, c.ns, name), &v1beta1.StatefulSet{}) if obj == nil { return nil, err @@ -90,13 +90,13 @@ func (c *FakeStatefulSets) Get(name string, options v1.GetOptions) (result *v1be func (c *FakeStatefulSets) List(opts v1.ListOptions) (result *v1beta1.StatefulSetList, err error) { obj, err := c.Fake. - Invokes(core.NewListAction(statefulsetsResource, c.ns, opts), &v1beta1.StatefulSetList{}) + Invokes(testing.NewListAction(statefulsetsResource, c.ns, opts), &v1beta1.StatefulSetList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -112,14 +112,14 @@ func (c *FakeStatefulSets) List(opts v1.ListOptions) (result *v1beta1.StatefulSe // Watch returns a watch.Interface that watches the requested statefulSets. func (c *FakeStatefulSets) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewWatchAction(statefulsetsResource, c.ns, opts)) + InvokesWatch(testing.NewWatchAction(statefulsetsResource, c.ns, opts)) } // Patch applies the patch and returns the patched statefulSet. func (c *FakeStatefulSets) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.StatefulSet, err error) { obj, err := c.Fake. - Invokes(core.NewPatchSubresourceAction(statefulsetsResource, c.ns, name, data, subresources...), &v1beta1.StatefulSet{}) + Invokes(testing.NewPatchSubresourceAction(statefulsetsResource, c.ns, name, data, subresources...), &v1beta1.StatefulSet{}) if obj == nil { return nil, err diff --git a/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1/fake/BUILD b/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1/fake/BUILD index 02d4e95b345..2eeae8d2c2e 100644 --- a/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1/fake/BUILD +++ b/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1/fake/BUILD @@ -19,8 +19,8 @@ go_library( deps = [ "//pkg/apis/authentication/v1beta1:go_default_library", "//pkg/client/clientset_generated/clientset/typed/authentication/v1beta1:go_default_library", - "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/testing", ], ) diff --git a/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1/fake/fake_authentication_client.go b/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1/fake/fake_authentication_client.go index 460d7dd8eb6..41d996bc981 100644 --- a/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1/fake/fake_authentication_client.go +++ b/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1/fake/fake_authentication_client.go @@ -18,12 +18,12 @@ package fake import ( rest "k8s.io/client-go/rest" + testing "k8s.io/client-go/testing" v1beta1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1" - core "k8s.io/kubernetes/pkg/client/testing/core" ) type FakeAuthenticationV1beta1 struct { - *core.Fake + *testing.Fake } func (c *FakeAuthenticationV1beta1) TokenReviews() v1beta1.TokenReviewInterface { diff --git a/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1/fake/fake_tokenreview_expansion.go b/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1/fake/fake_tokenreview_expansion.go index c6017a9c4b7..9503b295a25 100644 --- a/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1/fake/fake_tokenreview_expansion.go +++ b/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1/fake/fake_tokenreview_expansion.go @@ -17,8 +17,8 @@ limitations under the License. package fake import ( + core "k8s.io/client-go/testing" authenticationapi "k8s.io/kubernetes/pkg/apis/authentication/v1beta1" - "k8s.io/kubernetes/pkg/client/testing/core" ) func (c *FakeTokenReviews) Create(tokenReview *authenticationapi.TokenReview) (result *authenticationapi.TokenReview, err error) { diff --git a/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/fake/BUILD b/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/fake/BUILD index 7c92cf62d42..48677808ccd 100644 --- a/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/fake/BUILD +++ b/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/fake/BUILD @@ -24,8 +24,8 @@ go_library( deps = [ "//pkg/apis/authorization/v1beta1:go_default_library", "//pkg/client/clientset_generated/clientset/typed/authorization/v1beta1:go_default_library", - "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/testing", ], ) diff --git a/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/fake/fake_authorization_client.go b/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/fake/fake_authorization_client.go index b528ba04027..4c7637d4331 100644 --- a/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/fake/fake_authorization_client.go +++ b/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/fake/fake_authorization_client.go @@ -18,12 +18,12 @@ package fake import ( rest "k8s.io/client-go/rest" + testing "k8s.io/client-go/testing" v1beta1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1" - core "k8s.io/kubernetes/pkg/client/testing/core" ) type FakeAuthorizationV1beta1 struct { - *core.Fake + *testing.Fake } func (c *FakeAuthorizationV1beta1) LocalSubjectAccessReviews(namespace string) v1beta1.LocalSubjectAccessReviewInterface { diff --git a/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/fake/fake_localsubjectaccessreview_expansion.go b/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/fake/fake_localsubjectaccessreview_expansion.go index 18d1522f721..b65004a3535 100644 --- a/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/fake/fake_localsubjectaccessreview_expansion.go +++ b/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/fake/fake_localsubjectaccessreview_expansion.go @@ -17,8 +17,8 @@ limitations under the License. package fake import ( + core "k8s.io/client-go/testing" authorizationapi "k8s.io/kubernetes/pkg/apis/authorization/v1beta1" - "k8s.io/kubernetes/pkg/client/testing/core" ) func (c *FakeLocalSubjectAccessReviews) Create(sar *authorizationapi.LocalSubjectAccessReview) (result *authorizationapi.LocalSubjectAccessReview, err error) { diff --git a/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/fake/fake_selfsubjectaccessreview_expansion.go b/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/fake/fake_selfsubjectaccessreview_expansion.go index 663169b894e..c2e1e000929 100644 --- a/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/fake/fake_selfsubjectaccessreview_expansion.go +++ b/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/fake/fake_selfsubjectaccessreview_expansion.go @@ -17,8 +17,8 @@ limitations under the License. package fake import ( + core "k8s.io/client-go/testing" authorizationapi "k8s.io/kubernetes/pkg/apis/authorization/v1beta1" - "k8s.io/kubernetes/pkg/client/testing/core" ) func (c *FakeSelfSubjectAccessReviews) Create(sar *authorizationapi.SelfSubjectAccessReview) (result *authorizationapi.SelfSubjectAccessReview, err error) { diff --git a/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/fake/fake_subjectaccessreview_expansion.go b/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/fake/fake_subjectaccessreview_expansion.go index 815b846d62a..49232ed8ce9 100644 --- a/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/fake/fake_subjectaccessreview_expansion.go +++ b/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/fake/fake_subjectaccessreview_expansion.go @@ -17,8 +17,8 @@ limitations under the License. package fake import ( + core "k8s.io/client-go/testing" authorizationapi "k8s.io/kubernetes/pkg/apis/authorization/v1beta1" - "k8s.io/kubernetes/pkg/client/testing/core" ) func (c *FakeSubjectAccessReviews) Create(sar *authorizationapi.SubjectAccessReview) (result *authorizationapi.SubjectAccessReview, err error) { diff --git a/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/fake/BUILD b/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/fake/BUILD index d5105cdeaa6..81814cdd2dd 100644 --- a/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/fake/BUILD +++ b/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/fake/BUILD @@ -18,13 +18,13 @@ go_library( deps = [ "//pkg/apis/autoscaling/v1:go_default_library", "//pkg/client/clientset_generated/clientset/typed/autoscaling/v1:go_default_library", - "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/testing", ], ) diff --git a/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/fake/fake_autoscaling_client.go b/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/fake/fake_autoscaling_client.go index 13fef5bd898..6424facd08e 100644 --- a/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/fake/fake_autoscaling_client.go +++ b/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/fake/fake_autoscaling_client.go @@ -18,12 +18,12 @@ package fake import ( rest "k8s.io/client-go/rest" + testing "k8s.io/client-go/testing" v1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/autoscaling/v1" - core "k8s.io/kubernetes/pkg/client/testing/core" ) type FakeAutoscalingV1 struct { - *core.Fake + *testing.Fake } func (c *FakeAutoscalingV1) HorizontalPodAutoscalers(namespace string) v1.HorizontalPodAutoscalerInterface { diff --git a/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/fake/fake_horizontalpodautoscaler.go b/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/fake/fake_horizontalpodautoscaler.go index 5a97833e3bf..df3436867cc 100644 --- a/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/fake/fake_horizontalpodautoscaler.go +++ b/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/fake/fake_horizontalpodautoscaler.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" v1 "k8s.io/kubernetes/pkg/apis/autoscaling/v1" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeHorizontalPodAutoscalers implements HorizontalPodAutoscalerInterface @@ -36,7 +36,7 @@ var horizontalpodautoscalersResource = schema.GroupVersionResource{Group: "autos func (c *FakeHorizontalPodAutoscalers) Create(horizontalPodAutoscaler *v1.HorizontalPodAutoscaler) (result *v1.HorizontalPodAutoscaler, err error) { obj, err := c.Fake. - Invokes(core.NewCreateAction(horizontalpodautoscalersResource, c.ns, horizontalPodAutoscaler), &v1.HorizontalPodAutoscaler{}) + Invokes(testing.NewCreateAction(horizontalpodautoscalersResource, c.ns, horizontalPodAutoscaler), &v1.HorizontalPodAutoscaler{}) if obj == nil { return nil, err @@ -46,7 +46,7 @@ func (c *FakeHorizontalPodAutoscalers) Create(horizontalPodAutoscaler *v1.Horizo func (c *FakeHorizontalPodAutoscalers) Update(horizontalPodAutoscaler *v1.HorizontalPodAutoscaler) (result *v1.HorizontalPodAutoscaler, err error) { obj, err := c.Fake. - Invokes(core.NewUpdateAction(horizontalpodautoscalersResource, c.ns, horizontalPodAutoscaler), &v1.HorizontalPodAutoscaler{}) + Invokes(testing.NewUpdateAction(horizontalpodautoscalersResource, c.ns, horizontalPodAutoscaler), &v1.HorizontalPodAutoscaler{}) if obj == nil { return nil, err @@ -56,7 +56,7 @@ func (c *FakeHorizontalPodAutoscalers) Update(horizontalPodAutoscaler *v1.Horizo func (c *FakeHorizontalPodAutoscalers) UpdateStatus(horizontalPodAutoscaler *v1.HorizontalPodAutoscaler) (*v1.HorizontalPodAutoscaler, error) { obj, err := c.Fake. - Invokes(core.NewUpdateSubresourceAction(horizontalpodautoscalersResource, "status", c.ns, horizontalPodAutoscaler), &v1.HorizontalPodAutoscaler{}) + Invokes(testing.NewUpdateSubresourceAction(horizontalpodautoscalersResource, "status", c.ns, horizontalPodAutoscaler), &v1.HorizontalPodAutoscaler{}) if obj == nil { return nil, err @@ -66,13 +66,13 @@ func (c *FakeHorizontalPodAutoscalers) UpdateStatus(horizontalPodAutoscaler *v1. func (c *FakeHorizontalPodAutoscalers) Delete(name string, options *meta_v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewDeleteAction(horizontalpodautoscalersResource, c.ns, name), &v1.HorizontalPodAutoscaler{}) + Invokes(testing.NewDeleteAction(horizontalpodautoscalersResource, c.ns, name), &v1.HorizontalPodAutoscaler{}) return err } func (c *FakeHorizontalPodAutoscalers) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error { - action := core.NewDeleteCollectionAction(horizontalpodautoscalersResource, c.ns, listOptions) + action := testing.NewDeleteCollectionAction(horizontalpodautoscalersResource, c.ns, listOptions) _, err := c.Fake.Invokes(action, &v1.HorizontalPodAutoscalerList{}) return err @@ -80,7 +80,7 @@ func (c *FakeHorizontalPodAutoscalers) DeleteCollection(options *meta_v1.DeleteO func (c *FakeHorizontalPodAutoscalers) Get(name string, options meta_v1.GetOptions) (result *v1.HorizontalPodAutoscaler, err error) { obj, err := c.Fake. - Invokes(core.NewGetAction(horizontalpodautoscalersResource, c.ns, name), &v1.HorizontalPodAutoscaler{}) + Invokes(testing.NewGetAction(horizontalpodautoscalersResource, c.ns, name), &v1.HorizontalPodAutoscaler{}) if obj == nil { return nil, err @@ -90,13 +90,13 @@ func (c *FakeHorizontalPodAutoscalers) Get(name string, options meta_v1.GetOptio func (c *FakeHorizontalPodAutoscalers) List(opts meta_v1.ListOptions) (result *v1.HorizontalPodAutoscalerList, err error) { obj, err := c.Fake. - Invokes(core.NewListAction(horizontalpodautoscalersResource, c.ns, opts), &v1.HorizontalPodAutoscalerList{}) + Invokes(testing.NewListAction(horizontalpodautoscalersResource, c.ns, opts), &v1.HorizontalPodAutoscalerList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -112,14 +112,14 @@ func (c *FakeHorizontalPodAutoscalers) List(opts meta_v1.ListOptions) (result *v // Watch returns a watch.Interface that watches the requested horizontalPodAutoscalers. func (c *FakeHorizontalPodAutoscalers) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewWatchAction(horizontalpodautoscalersResource, c.ns, opts)) + InvokesWatch(testing.NewWatchAction(horizontalpodautoscalersResource, c.ns, opts)) } // Patch applies the patch and returns the patched horizontalPodAutoscaler. func (c *FakeHorizontalPodAutoscalers) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.HorizontalPodAutoscaler, err error) { obj, err := c.Fake. - Invokes(core.NewPatchSubresourceAction(horizontalpodautoscalersResource, c.ns, name, data, subresources...), &v1.HorizontalPodAutoscaler{}) + Invokes(testing.NewPatchSubresourceAction(horizontalpodautoscalersResource, c.ns, name, data, subresources...), &v1.HorizontalPodAutoscaler{}) if obj == nil { return nil, err diff --git a/pkg/client/clientset_generated/clientset/typed/batch/v1/fake/BUILD b/pkg/client/clientset_generated/clientset/typed/batch/v1/fake/BUILD index d31eaf5662e..621f6f8c3f5 100644 --- a/pkg/client/clientset_generated/clientset/typed/batch/v1/fake/BUILD +++ b/pkg/client/clientset_generated/clientset/typed/batch/v1/fake/BUILD @@ -18,13 +18,13 @@ go_library( deps = [ "//pkg/apis/batch/v1:go_default_library", "//pkg/client/clientset_generated/clientset/typed/batch/v1:go_default_library", - "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/testing", ], ) diff --git a/pkg/client/clientset_generated/clientset/typed/batch/v1/fake/fake_batch_client.go b/pkg/client/clientset_generated/clientset/typed/batch/v1/fake/fake_batch_client.go index ae9b99f4738..d17ba70cad3 100644 --- a/pkg/client/clientset_generated/clientset/typed/batch/v1/fake/fake_batch_client.go +++ b/pkg/client/clientset_generated/clientset/typed/batch/v1/fake/fake_batch_client.go @@ -18,12 +18,12 @@ package fake import ( rest "k8s.io/client-go/rest" + testing "k8s.io/client-go/testing" v1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/batch/v1" - core "k8s.io/kubernetes/pkg/client/testing/core" ) type FakeBatchV1 struct { - *core.Fake + *testing.Fake } func (c *FakeBatchV1) Jobs(namespace string) v1.JobInterface { diff --git a/pkg/client/clientset_generated/clientset/typed/batch/v1/fake/fake_job.go b/pkg/client/clientset_generated/clientset/typed/batch/v1/fake/fake_job.go index 5537b124dd5..4e682ee1e5f 100644 --- a/pkg/client/clientset_generated/clientset/typed/batch/v1/fake/fake_job.go +++ b/pkg/client/clientset_generated/clientset/typed/batch/v1/fake/fake_job.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" v1 "k8s.io/kubernetes/pkg/apis/batch/v1" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeJobs implements JobInterface @@ -36,7 +36,7 @@ var jobsResource = schema.GroupVersionResource{Group: "batch", Version: "v1", Re func (c *FakeJobs) Create(job *v1.Job) (result *v1.Job, err error) { obj, err := c.Fake. - Invokes(core.NewCreateAction(jobsResource, c.ns, job), &v1.Job{}) + Invokes(testing.NewCreateAction(jobsResource, c.ns, job), &v1.Job{}) if obj == nil { return nil, err @@ -46,7 +46,7 @@ func (c *FakeJobs) Create(job *v1.Job) (result *v1.Job, err error) { func (c *FakeJobs) Update(job *v1.Job) (result *v1.Job, err error) { obj, err := c.Fake. - Invokes(core.NewUpdateAction(jobsResource, c.ns, job), &v1.Job{}) + Invokes(testing.NewUpdateAction(jobsResource, c.ns, job), &v1.Job{}) if obj == nil { return nil, err @@ -56,7 +56,7 @@ func (c *FakeJobs) Update(job *v1.Job) (result *v1.Job, err error) { func (c *FakeJobs) UpdateStatus(job *v1.Job) (*v1.Job, error) { obj, err := c.Fake. - Invokes(core.NewUpdateSubresourceAction(jobsResource, "status", c.ns, job), &v1.Job{}) + Invokes(testing.NewUpdateSubresourceAction(jobsResource, "status", c.ns, job), &v1.Job{}) if obj == nil { return nil, err @@ -66,13 +66,13 @@ func (c *FakeJobs) UpdateStatus(job *v1.Job) (*v1.Job, error) { func (c *FakeJobs) Delete(name string, options *meta_v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewDeleteAction(jobsResource, c.ns, name), &v1.Job{}) + Invokes(testing.NewDeleteAction(jobsResource, c.ns, name), &v1.Job{}) return err } func (c *FakeJobs) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error { - action := core.NewDeleteCollectionAction(jobsResource, c.ns, listOptions) + action := testing.NewDeleteCollectionAction(jobsResource, c.ns, listOptions) _, err := c.Fake.Invokes(action, &v1.JobList{}) return err @@ -80,7 +80,7 @@ func (c *FakeJobs) DeleteCollection(options *meta_v1.DeleteOptions, listOptions func (c *FakeJobs) Get(name string, options meta_v1.GetOptions) (result *v1.Job, err error) { obj, err := c.Fake. - Invokes(core.NewGetAction(jobsResource, c.ns, name), &v1.Job{}) + Invokes(testing.NewGetAction(jobsResource, c.ns, name), &v1.Job{}) if obj == nil { return nil, err @@ -90,13 +90,13 @@ func (c *FakeJobs) Get(name string, options meta_v1.GetOptions) (result *v1.Job, func (c *FakeJobs) List(opts meta_v1.ListOptions) (result *v1.JobList, err error) { obj, err := c.Fake. - Invokes(core.NewListAction(jobsResource, c.ns, opts), &v1.JobList{}) + Invokes(testing.NewListAction(jobsResource, c.ns, opts), &v1.JobList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -112,14 +112,14 @@ func (c *FakeJobs) List(opts meta_v1.ListOptions) (result *v1.JobList, err error // Watch returns a watch.Interface that watches the requested jobs. func (c *FakeJobs) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewWatchAction(jobsResource, c.ns, opts)) + InvokesWatch(testing.NewWatchAction(jobsResource, c.ns, opts)) } // Patch applies the patch and returns the patched job. func (c *FakeJobs) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.Job, err error) { obj, err := c.Fake. - Invokes(core.NewPatchSubresourceAction(jobsResource, c.ns, name, data, subresources...), &v1.Job{}) + Invokes(testing.NewPatchSubresourceAction(jobsResource, c.ns, name, data, subresources...), &v1.Job{}) if obj == nil { return nil, err diff --git a/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/fake/BUILD b/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/fake/BUILD index ffcadd7f1bb..6ad094de5d7 100644 --- a/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/fake/BUILD +++ b/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/fake/BUILD @@ -19,13 +19,13 @@ go_library( deps = [ "//pkg/apis/batch/v2alpha1:go_default_library", "//pkg/client/clientset_generated/clientset/typed/batch/v2alpha1:go_default_library", - "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/testing", ], ) diff --git a/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/fake/fake_batch_client.go b/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/fake/fake_batch_client.go index aff53da59a7..107c88f7002 100644 --- a/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/fake/fake_batch_client.go +++ b/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/fake/fake_batch_client.go @@ -18,12 +18,12 @@ package fake import ( rest "k8s.io/client-go/rest" + testing "k8s.io/client-go/testing" v2alpha1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1" - core "k8s.io/kubernetes/pkg/client/testing/core" ) type FakeBatchV2alpha1 struct { - *core.Fake + *testing.Fake } func (c *FakeBatchV2alpha1) CronJobs(namespace string) v2alpha1.CronJobInterface { diff --git a/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/fake/fake_cronjob.go b/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/fake/fake_cronjob.go index 7d9fc98f416..b9973723da5 100644 --- a/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/fake/fake_cronjob.go +++ b/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/fake/fake_cronjob.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" v2alpha1 "k8s.io/kubernetes/pkg/apis/batch/v2alpha1" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeCronJobs implements CronJobInterface @@ -36,7 +36,7 @@ var cronjobsResource = schema.GroupVersionResource{Group: "batch", Version: "v2a func (c *FakeCronJobs) Create(cronJob *v2alpha1.CronJob) (result *v2alpha1.CronJob, err error) { obj, err := c.Fake. - Invokes(core.NewCreateAction(cronjobsResource, c.ns, cronJob), &v2alpha1.CronJob{}) + Invokes(testing.NewCreateAction(cronjobsResource, c.ns, cronJob), &v2alpha1.CronJob{}) if obj == nil { return nil, err @@ -46,7 +46,7 @@ func (c *FakeCronJobs) Create(cronJob *v2alpha1.CronJob) (result *v2alpha1.CronJ func (c *FakeCronJobs) Update(cronJob *v2alpha1.CronJob) (result *v2alpha1.CronJob, err error) { obj, err := c.Fake. - Invokes(core.NewUpdateAction(cronjobsResource, c.ns, cronJob), &v2alpha1.CronJob{}) + Invokes(testing.NewUpdateAction(cronjobsResource, c.ns, cronJob), &v2alpha1.CronJob{}) if obj == nil { return nil, err @@ -56,7 +56,7 @@ func (c *FakeCronJobs) Update(cronJob *v2alpha1.CronJob) (result *v2alpha1.CronJ func (c *FakeCronJobs) UpdateStatus(cronJob *v2alpha1.CronJob) (*v2alpha1.CronJob, error) { obj, err := c.Fake. - Invokes(core.NewUpdateSubresourceAction(cronjobsResource, "status", c.ns, cronJob), &v2alpha1.CronJob{}) + Invokes(testing.NewUpdateSubresourceAction(cronjobsResource, "status", c.ns, cronJob), &v2alpha1.CronJob{}) if obj == nil { return nil, err @@ -66,13 +66,13 @@ func (c *FakeCronJobs) UpdateStatus(cronJob *v2alpha1.CronJob) (*v2alpha1.CronJo func (c *FakeCronJobs) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewDeleteAction(cronjobsResource, c.ns, name), &v2alpha1.CronJob{}) + Invokes(testing.NewDeleteAction(cronjobsResource, c.ns, name), &v2alpha1.CronJob{}) return err } func (c *FakeCronJobs) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := core.NewDeleteCollectionAction(cronjobsResource, c.ns, listOptions) + action := testing.NewDeleteCollectionAction(cronjobsResource, c.ns, listOptions) _, err := c.Fake.Invokes(action, &v2alpha1.CronJobList{}) return err @@ -80,7 +80,7 @@ func (c *FakeCronJobs) DeleteCollection(options *v1.DeleteOptions, listOptions v func (c *FakeCronJobs) Get(name string, options v1.GetOptions) (result *v2alpha1.CronJob, err error) { obj, err := c.Fake. - Invokes(core.NewGetAction(cronjobsResource, c.ns, name), &v2alpha1.CronJob{}) + Invokes(testing.NewGetAction(cronjobsResource, c.ns, name), &v2alpha1.CronJob{}) if obj == nil { return nil, err @@ -90,13 +90,13 @@ func (c *FakeCronJobs) Get(name string, options v1.GetOptions) (result *v2alpha1 func (c *FakeCronJobs) List(opts v1.ListOptions) (result *v2alpha1.CronJobList, err error) { obj, err := c.Fake. - Invokes(core.NewListAction(cronjobsResource, c.ns, opts), &v2alpha1.CronJobList{}) + Invokes(testing.NewListAction(cronjobsResource, c.ns, opts), &v2alpha1.CronJobList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -112,14 +112,14 @@ func (c *FakeCronJobs) List(opts v1.ListOptions) (result *v2alpha1.CronJobList, // Watch returns a watch.Interface that watches the requested cronJobs. func (c *FakeCronJobs) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewWatchAction(cronjobsResource, c.ns, opts)) + InvokesWatch(testing.NewWatchAction(cronjobsResource, c.ns, opts)) } // Patch applies the patch and returns the patched cronJob. func (c *FakeCronJobs) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v2alpha1.CronJob, err error) { obj, err := c.Fake. - Invokes(core.NewPatchSubresourceAction(cronjobsResource, c.ns, name, data, subresources...), &v2alpha1.CronJob{}) + Invokes(testing.NewPatchSubresourceAction(cronjobsResource, c.ns, name, data, subresources...), &v2alpha1.CronJob{}) if obj == nil { return nil, err diff --git a/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/fake/fake_job.go b/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/fake/fake_job.go index d9088bbafc0..952ee388164 100644 --- a/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/fake/fake_job.go +++ b/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/fake/fake_job.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" v2alpha1 "k8s.io/kubernetes/pkg/apis/batch/v2alpha1" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeJobs implements JobInterface @@ -36,7 +36,7 @@ var jobsResource = schema.GroupVersionResource{Group: "batch", Version: "v2alpha func (c *FakeJobs) Create(job *v2alpha1.Job) (result *v2alpha1.Job, err error) { obj, err := c.Fake. - Invokes(core.NewCreateAction(jobsResource, c.ns, job), &v2alpha1.Job{}) + Invokes(testing.NewCreateAction(jobsResource, c.ns, job), &v2alpha1.Job{}) if obj == nil { return nil, err @@ -46,7 +46,7 @@ func (c *FakeJobs) Create(job *v2alpha1.Job) (result *v2alpha1.Job, err error) { func (c *FakeJobs) Update(job *v2alpha1.Job) (result *v2alpha1.Job, err error) { obj, err := c.Fake. - Invokes(core.NewUpdateAction(jobsResource, c.ns, job), &v2alpha1.Job{}) + Invokes(testing.NewUpdateAction(jobsResource, c.ns, job), &v2alpha1.Job{}) if obj == nil { return nil, err @@ -56,7 +56,7 @@ func (c *FakeJobs) Update(job *v2alpha1.Job) (result *v2alpha1.Job, err error) { func (c *FakeJobs) UpdateStatus(job *v2alpha1.Job) (*v2alpha1.Job, error) { obj, err := c.Fake. - Invokes(core.NewUpdateSubresourceAction(jobsResource, "status", c.ns, job), &v2alpha1.Job{}) + Invokes(testing.NewUpdateSubresourceAction(jobsResource, "status", c.ns, job), &v2alpha1.Job{}) if obj == nil { return nil, err @@ -66,13 +66,13 @@ func (c *FakeJobs) UpdateStatus(job *v2alpha1.Job) (*v2alpha1.Job, error) { func (c *FakeJobs) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewDeleteAction(jobsResource, c.ns, name), &v2alpha1.Job{}) + Invokes(testing.NewDeleteAction(jobsResource, c.ns, name), &v2alpha1.Job{}) return err } func (c *FakeJobs) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := core.NewDeleteCollectionAction(jobsResource, c.ns, listOptions) + action := testing.NewDeleteCollectionAction(jobsResource, c.ns, listOptions) _, err := c.Fake.Invokes(action, &v2alpha1.JobList{}) return err @@ -80,7 +80,7 @@ func (c *FakeJobs) DeleteCollection(options *v1.DeleteOptions, listOptions v1.Li func (c *FakeJobs) Get(name string, options v1.GetOptions) (result *v2alpha1.Job, err error) { obj, err := c.Fake. - Invokes(core.NewGetAction(jobsResource, c.ns, name), &v2alpha1.Job{}) + Invokes(testing.NewGetAction(jobsResource, c.ns, name), &v2alpha1.Job{}) if obj == nil { return nil, err @@ -90,13 +90,13 @@ func (c *FakeJobs) Get(name string, options v1.GetOptions) (result *v2alpha1.Job func (c *FakeJobs) List(opts v1.ListOptions) (result *v2alpha1.JobList, err error) { obj, err := c.Fake. - Invokes(core.NewListAction(jobsResource, c.ns, opts), &v2alpha1.JobList{}) + Invokes(testing.NewListAction(jobsResource, c.ns, opts), &v2alpha1.JobList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -112,14 +112,14 @@ func (c *FakeJobs) List(opts v1.ListOptions) (result *v2alpha1.JobList, err erro // Watch returns a watch.Interface that watches the requested jobs. func (c *FakeJobs) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewWatchAction(jobsResource, c.ns, opts)) + InvokesWatch(testing.NewWatchAction(jobsResource, c.ns, opts)) } // Patch applies the patch and returns the patched job. func (c *FakeJobs) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v2alpha1.Job, err error) { obj, err := c.Fake. - Invokes(core.NewPatchSubresourceAction(jobsResource, c.ns, name, data, subresources...), &v2alpha1.Job{}) + Invokes(testing.NewPatchSubresourceAction(jobsResource, c.ns, name, data, subresources...), &v2alpha1.Job{}) if obj == nil { return nil, err diff --git a/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/fake/BUILD b/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/fake/BUILD index 81fe17db92a..7cb390be33f 100644 --- a/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/fake/BUILD +++ b/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/fake/BUILD @@ -19,13 +19,13 @@ go_library( deps = [ "//pkg/apis/certificates/v1beta1:go_default_library", "//pkg/client/clientset_generated/clientset/typed/certificates/v1beta1:go_default_library", - "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/testing", ], ) diff --git a/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/fake/fake_certificates_client.go b/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/fake/fake_certificates_client.go index a8877370ab7..0a976d7ca03 100644 --- a/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/fake/fake_certificates_client.go +++ b/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/fake/fake_certificates_client.go @@ -18,12 +18,12 @@ package fake import ( rest "k8s.io/client-go/rest" + testing "k8s.io/client-go/testing" v1beta1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1" - core "k8s.io/kubernetes/pkg/client/testing/core" ) type FakeCertificatesV1beta1 struct { - *core.Fake + *testing.Fake } func (c *FakeCertificatesV1beta1) CertificateSigningRequests() v1beta1.CertificateSigningRequestInterface { diff --git a/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/fake/fake_certificatesigningrequest.go b/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/fake/fake_certificatesigningrequest.go index 5be9fb34215..f62a860add0 100644 --- a/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/fake/fake_certificatesigningrequest.go +++ b/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/fake/fake_certificatesigningrequest.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" v1beta1 "k8s.io/kubernetes/pkg/apis/certificates/v1beta1" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeCertificateSigningRequests implements CertificateSigningRequestInterface @@ -35,7 +35,7 @@ var certificatesigningrequestsResource = schema.GroupVersionResource{Group: "cer func (c *FakeCertificateSigningRequests) Create(certificateSigningRequest *v1beta1.CertificateSigningRequest) (result *v1beta1.CertificateSigningRequest, err error) { obj, err := c.Fake. - Invokes(core.NewRootCreateAction(certificatesigningrequestsResource, certificateSigningRequest), &v1beta1.CertificateSigningRequest{}) + Invokes(testing.NewRootCreateAction(certificatesigningrequestsResource, certificateSigningRequest), &v1beta1.CertificateSigningRequest{}) if obj == nil { return nil, err } @@ -44,7 +44,7 @@ func (c *FakeCertificateSigningRequests) Create(certificateSigningRequest *v1bet func (c *FakeCertificateSigningRequests) Update(certificateSigningRequest *v1beta1.CertificateSigningRequest) (result *v1beta1.CertificateSigningRequest, err error) { obj, err := c.Fake. - Invokes(core.NewRootUpdateAction(certificatesigningrequestsResource, certificateSigningRequest), &v1beta1.CertificateSigningRequest{}) + Invokes(testing.NewRootUpdateAction(certificatesigningrequestsResource, certificateSigningRequest), &v1beta1.CertificateSigningRequest{}) if obj == nil { return nil, err } @@ -53,7 +53,7 @@ func (c *FakeCertificateSigningRequests) Update(certificateSigningRequest *v1bet func (c *FakeCertificateSigningRequests) UpdateStatus(certificateSigningRequest *v1beta1.CertificateSigningRequest) (*v1beta1.CertificateSigningRequest, error) { obj, err := c.Fake. - Invokes(core.NewRootUpdateSubresourceAction(certificatesigningrequestsResource, "status", certificateSigningRequest), &v1beta1.CertificateSigningRequest{}) + Invokes(testing.NewRootUpdateSubresourceAction(certificatesigningrequestsResource, "status", certificateSigningRequest), &v1beta1.CertificateSigningRequest{}) if obj == nil { return nil, err } @@ -62,12 +62,12 @@ func (c *FakeCertificateSigningRequests) UpdateStatus(certificateSigningRequest func (c *FakeCertificateSigningRequests) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewRootDeleteAction(certificatesigningrequestsResource, name), &v1beta1.CertificateSigningRequest{}) + Invokes(testing.NewRootDeleteAction(certificatesigningrequestsResource, name), &v1beta1.CertificateSigningRequest{}) return err } func (c *FakeCertificateSigningRequests) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := core.NewRootDeleteCollectionAction(certificatesigningrequestsResource, listOptions) + action := testing.NewRootDeleteCollectionAction(certificatesigningrequestsResource, listOptions) _, err := c.Fake.Invokes(action, &v1beta1.CertificateSigningRequestList{}) return err @@ -75,7 +75,7 @@ func (c *FakeCertificateSigningRequests) DeleteCollection(options *v1.DeleteOpti func (c *FakeCertificateSigningRequests) Get(name string, options v1.GetOptions) (result *v1beta1.CertificateSigningRequest, err error) { obj, err := c.Fake. - Invokes(core.NewRootGetAction(certificatesigningrequestsResource, name), &v1beta1.CertificateSigningRequest{}) + Invokes(testing.NewRootGetAction(certificatesigningrequestsResource, name), &v1beta1.CertificateSigningRequest{}) if obj == nil { return nil, err } @@ -84,12 +84,12 @@ func (c *FakeCertificateSigningRequests) Get(name string, options v1.GetOptions) func (c *FakeCertificateSigningRequests) List(opts v1.ListOptions) (result *v1beta1.CertificateSigningRequestList, err error) { obj, err := c.Fake. - Invokes(core.NewRootListAction(certificatesigningrequestsResource, opts), &v1beta1.CertificateSigningRequestList{}) + Invokes(testing.NewRootListAction(certificatesigningrequestsResource, opts), &v1beta1.CertificateSigningRequestList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -105,13 +105,13 @@ func (c *FakeCertificateSigningRequests) List(opts v1.ListOptions) (result *v1be // Watch returns a watch.Interface that watches the requested certificateSigningRequests. func (c *FakeCertificateSigningRequests) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewRootWatchAction(certificatesigningrequestsResource, opts)) + InvokesWatch(testing.NewRootWatchAction(certificatesigningrequestsResource, opts)) } // Patch applies the patch and returns the patched certificateSigningRequest. func (c *FakeCertificateSigningRequests) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.CertificateSigningRequest, err error) { obj, err := c.Fake. - Invokes(core.NewRootPatchSubresourceAction(certificatesigningrequestsResource, name, data, subresources...), &v1beta1.CertificateSigningRequest{}) + Invokes(testing.NewRootPatchSubresourceAction(certificatesigningrequestsResource, name, data, subresources...), &v1beta1.CertificateSigningRequest{}) if obj == nil { return nil, err } diff --git a/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/fake/fake_certificatesigningrequest_expansion.go b/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/fake/fake_certificatesigningrequest_expansion.go index 2359d12e0f5..ce42faa0860 100644 --- a/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/fake/fake_certificatesigningrequest_expansion.go +++ b/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/fake/fake_certificatesigningrequest_expansion.go @@ -17,8 +17,8 @@ limitations under the License. package fake import ( + core "k8s.io/client-go/testing" certificates "k8s.io/kubernetes/pkg/apis/certificates/v1beta1" - "k8s.io/kubernetes/pkg/client/testing/core" ) func (c *FakeCertificateSigningRequests) UpdateApproval(certificateSigningRequest *certificates.CertificateSigningRequest) (result *certificates.CertificateSigningRequest, err error) { diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/BUILD b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/BUILD index f94c0f481f3..91ad57e5df9 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/BUILD +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/BUILD @@ -40,7 +40,6 @@ go_library( "//pkg/api/v1:go_default_library", "//pkg/apis/policy/v1beta1:go_default_library", "//pkg/client/clientset_generated/clientset/typed/core/v1:go_default_library", - "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/fields", "//vendor:k8s.io/apimachinery/pkg/labels", @@ -49,6 +48,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/testing", ], ) diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_componentstatus.go b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_componentstatus.go index 0beddc664aa..3be5a83bd84 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_componentstatus.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_componentstatus.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" v1 "k8s.io/kubernetes/pkg/api/v1" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeComponentStatuses implements ComponentStatusInterface @@ -35,7 +35,7 @@ var componentstatusesResource = schema.GroupVersionResource{Group: "", Version: func (c *FakeComponentStatuses) Create(componentStatus *v1.ComponentStatus) (result *v1.ComponentStatus, err error) { obj, err := c.Fake. - Invokes(core.NewRootCreateAction(componentstatusesResource, componentStatus), &v1.ComponentStatus{}) + Invokes(testing.NewRootCreateAction(componentstatusesResource, componentStatus), &v1.ComponentStatus{}) if obj == nil { return nil, err } @@ -44,7 +44,7 @@ func (c *FakeComponentStatuses) Create(componentStatus *v1.ComponentStatus) (res func (c *FakeComponentStatuses) Update(componentStatus *v1.ComponentStatus) (result *v1.ComponentStatus, err error) { obj, err := c.Fake. - Invokes(core.NewRootUpdateAction(componentstatusesResource, componentStatus), &v1.ComponentStatus{}) + Invokes(testing.NewRootUpdateAction(componentstatusesResource, componentStatus), &v1.ComponentStatus{}) if obj == nil { return nil, err } @@ -53,12 +53,12 @@ func (c *FakeComponentStatuses) Update(componentStatus *v1.ComponentStatus) (res func (c *FakeComponentStatuses) Delete(name string, options *meta_v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewRootDeleteAction(componentstatusesResource, name), &v1.ComponentStatus{}) + Invokes(testing.NewRootDeleteAction(componentstatusesResource, name), &v1.ComponentStatus{}) return err } func (c *FakeComponentStatuses) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error { - action := core.NewRootDeleteCollectionAction(componentstatusesResource, listOptions) + action := testing.NewRootDeleteCollectionAction(componentstatusesResource, listOptions) _, err := c.Fake.Invokes(action, &v1.ComponentStatusList{}) return err @@ -66,7 +66,7 @@ func (c *FakeComponentStatuses) DeleteCollection(options *meta_v1.DeleteOptions, func (c *FakeComponentStatuses) Get(name string, options meta_v1.GetOptions) (result *v1.ComponentStatus, err error) { obj, err := c.Fake. - Invokes(core.NewRootGetAction(componentstatusesResource, name), &v1.ComponentStatus{}) + Invokes(testing.NewRootGetAction(componentstatusesResource, name), &v1.ComponentStatus{}) if obj == nil { return nil, err } @@ -75,12 +75,12 @@ func (c *FakeComponentStatuses) Get(name string, options meta_v1.GetOptions) (re func (c *FakeComponentStatuses) List(opts meta_v1.ListOptions) (result *v1.ComponentStatusList, err error) { obj, err := c.Fake. - Invokes(core.NewRootListAction(componentstatusesResource, opts), &v1.ComponentStatusList{}) + Invokes(testing.NewRootListAction(componentstatusesResource, opts), &v1.ComponentStatusList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -96,13 +96,13 @@ func (c *FakeComponentStatuses) List(opts meta_v1.ListOptions) (result *v1.Compo // Watch returns a watch.Interface that watches the requested componentStatuses. func (c *FakeComponentStatuses) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewRootWatchAction(componentstatusesResource, opts)) + InvokesWatch(testing.NewRootWatchAction(componentstatusesResource, opts)) } // Patch applies the patch and returns the patched componentStatus. func (c *FakeComponentStatuses) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.ComponentStatus, err error) { obj, err := c.Fake. - Invokes(core.NewRootPatchSubresourceAction(componentstatusesResource, name, data, subresources...), &v1.ComponentStatus{}) + Invokes(testing.NewRootPatchSubresourceAction(componentstatusesResource, name, data, subresources...), &v1.ComponentStatus{}) if obj == nil { return nil, err } diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_configmap.go b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_configmap.go index a320a45227f..4cdc6fb33a3 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_configmap.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_configmap.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" v1 "k8s.io/kubernetes/pkg/api/v1" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeConfigMaps implements ConfigMapInterface @@ -36,7 +36,7 @@ var configmapsResource = schema.GroupVersionResource{Group: "", Version: "v1", R func (c *FakeConfigMaps) Create(configMap *v1.ConfigMap) (result *v1.ConfigMap, err error) { obj, err := c.Fake. - Invokes(core.NewCreateAction(configmapsResource, c.ns, configMap), &v1.ConfigMap{}) + Invokes(testing.NewCreateAction(configmapsResource, c.ns, configMap), &v1.ConfigMap{}) if obj == nil { return nil, err @@ -46,7 +46,7 @@ func (c *FakeConfigMaps) Create(configMap *v1.ConfigMap) (result *v1.ConfigMap, func (c *FakeConfigMaps) Update(configMap *v1.ConfigMap) (result *v1.ConfigMap, err error) { obj, err := c.Fake. - Invokes(core.NewUpdateAction(configmapsResource, c.ns, configMap), &v1.ConfigMap{}) + Invokes(testing.NewUpdateAction(configmapsResource, c.ns, configMap), &v1.ConfigMap{}) if obj == nil { return nil, err @@ -56,13 +56,13 @@ func (c *FakeConfigMaps) Update(configMap *v1.ConfigMap) (result *v1.ConfigMap, func (c *FakeConfigMaps) Delete(name string, options *meta_v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewDeleteAction(configmapsResource, c.ns, name), &v1.ConfigMap{}) + Invokes(testing.NewDeleteAction(configmapsResource, c.ns, name), &v1.ConfigMap{}) return err } func (c *FakeConfigMaps) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error { - action := core.NewDeleteCollectionAction(configmapsResource, c.ns, listOptions) + action := testing.NewDeleteCollectionAction(configmapsResource, c.ns, listOptions) _, err := c.Fake.Invokes(action, &v1.ConfigMapList{}) return err @@ -70,7 +70,7 @@ func (c *FakeConfigMaps) DeleteCollection(options *meta_v1.DeleteOptions, listOp func (c *FakeConfigMaps) Get(name string, options meta_v1.GetOptions) (result *v1.ConfigMap, err error) { obj, err := c.Fake. - Invokes(core.NewGetAction(configmapsResource, c.ns, name), &v1.ConfigMap{}) + Invokes(testing.NewGetAction(configmapsResource, c.ns, name), &v1.ConfigMap{}) if obj == nil { return nil, err @@ -80,13 +80,13 @@ func (c *FakeConfigMaps) Get(name string, options meta_v1.GetOptions) (result *v func (c *FakeConfigMaps) List(opts meta_v1.ListOptions) (result *v1.ConfigMapList, err error) { obj, err := c.Fake. - Invokes(core.NewListAction(configmapsResource, c.ns, opts), &v1.ConfigMapList{}) + Invokes(testing.NewListAction(configmapsResource, c.ns, opts), &v1.ConfigMapList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -102,14 +102,14 @@ func (c *FakeConfigMaps) List(opts meta_v1.ListOptions) (result *v1.ConfigMapLis // Watch returns a watch.Interface that watches the requested configMaps. func (c *FakeConfigMaps) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewWatchAction(configmapsResource, c.ns, opts)) + InvokesWatch(testing.NewWatchAction(configmapsResource, c.ns, opts)) } // Patch applies the patch and returns the patched configMap. func (c *FakeConfigMaps) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.ConfigMap, err error) { obj, err := c.Fake. - Invokes(core.NewPatchSubresourceAction(configmapsResource, c.ns, name, data, subresources...), &v1.ConfigMap{}) + Invokes(testing.NewPatchSubresourceAction(configmapsResource, c.ns, name, data, subresources...), &v1.ConfigMap{}) if obj == nil { return nil, err diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_core_client.go b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_core_client.go index 98fd03a0c97..262bfa1d02e 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_core_client.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_core_client.go @@ -18,12 +18,12 @@ package fake import ( rest "k8s.io/client-go/rest" + testing "k8s.io/client-go/testing" v1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/core/v1" - core "k8s.io/kubernetes/pkg/client/testing/core" ) type FakeCoreV1 struct { - *core.Fake + *testing.Fake } func (c *FakeCoreV1) ComponentStatuses() v1.ComponentStatusInterface { diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_endpoints.go b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_endpoints.go index 2ea0083ae81..4ed285319d3 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_endpoints.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_endpoints.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" v1 "k8s.io/kubernetes/pkg/api/v1" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeEndpoints implements EndpointsInterface @@ -36,7 +36,7 @@ var endpointsResource = schema.GroupVersionResource{Group: "", Version: "v1", Re func (c *FakeEndpoints) Create(endpoints *v1.Endpoints) (result *v1.Endpoints, err error) { obj, err := c.Fake. - Invokes(core.NewCreateAction(endpointsResource, c.ns, endpoints), &v1.Endpoints{}) + Invokes(testing.NewCreateAction(endpointsResource, c.ns, endpoints), &v1.Endpoints{}) if obj == nil { return nil, err @@ -46,7 +46,7 @@ func (c *FakeEndpoints) Create(endpoints *v1.Endpoints) (result *v1.Endpoints, e func (c *FakeEndpoints) Update(endpoints *v1.Endpoints) (result *v1.Endpoints, err error) { obj, err := c.Fake. - Invokes(core.NewUpdateAction(endpointsResource, c.ns, endpoints), &v1.Endpoints{}) + Invokes(testing.NewUpdateAction(endpointsResource, c.ns, endpoints), &v1.Endpoints{}) if obj == nil { return nil, err @@ -56,13 +56,13 @@ func (c *FakeEndpoints) Update(endpoints *v1.Endpoints) (result *v1.Endpoints, e func (c *FakeEndpoints) Delete(name string, options *meta_v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewDeleteAction(endpointsResource, c.ns, name), &v1.Endpoints{}) + Invokes(testing.NewDeleteAction(endpointsResource, c.ns, name), &v1.Endpoints{}) return err } func (c *FakeEndpoints) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error { - action := core.NewDeleteCollectionAction(endpointsResource, c.ns, listOptions) + action := testing.NewDeleteCollectionAction(endpointsResource, c.ns, listOptions) _, err := c.Fake.Invokes(action, &v1.EndpointsList{}) return err @@ -70,7 +70,7 @@ func (c *FakeEndpoints) DeleteCollection(options *meta_v1.DeleteOptions, listOpt func (c *FakeEndpoints) Get(name string, options meta_v1.GetOptions) (result *v1.Endpoints, err error) { obj, err := c.Fake. - Invokes(core.NewGetAction(endpointsResource, c.ns, name), &v1.Endpoints{}) + Invokes(testing.NewGetAction(endpointsResource, c.ns, name), &v1.Endpoints{}) if obj == nil { return nil, err @@ -80,13 +80,13 @@ func (c *FakeEndpoints) Get(name string, options meta_v1.GetOptions) (result *v1 func (c *FakeEndpoints) List(opts meta_v1.ListOptions) (result *v1.EndpointsList, err error) { obj, err := c.Fake. - Invokes(core.NewListAction(endpointsResource, c.ns, opts), &v1.EndpointsList{}) + Invokes(testing.NewListAction(endpointsResource, c.ns, opts), &v1.EndpointsList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -102,14 +102,14 @@ func (c *FakeEndpoints) List(opts meta_v1.ListOptions) (result *v1.EndpointsList // Watch returns a watch.Interface that watches the requested endpoints. func (c *FakeEndpoints) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewWatchAction(endpointsResource, c.ns, opts)) + InvokesWatch(testing.NewWatchAction(endpointsResource, c.ns, opts)) } // Patch applies the patch and returns the patched endpoints. func (c *FakeEndpoints) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.Endpoints, err error) { obj, err := c.Fake. - Invokes(core.NewPatchSubresourceAction(endpointsResource, c.ns, name, data, subresources...), &v1.Endpoints{}) + Invokes(testing.NewPatchSubresourceAction(endpointsResource, c.ns, name, data, subresources...), &v1.Endpoints{}) if obj == nil { return nil, err diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_event.go b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_event.go index 611300ee34a..dbdc3d30489 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_event.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_event.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" v1 "k8s.io/kubernetes/pkg/api/v1" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeEvents implements EventInterface @@ -36,7 +36,7 @@ var eventsResource = schema.GroupVersionResource{Group: "", Version: "v1", Resou func (c *FakeEvents) Create(event *v1.Event) (result *v1.Event, err error) { obj, err := c.Fake. - Invokes(core.NewCreateAction(eventsResource, c.ns, event), &v1.Event{}) + Invokes(testing.NewCreateAction(eventsResource, c.ns, event), &v1.Event{}) if obj == nil { return nil, err @@ -46,7 +46,7 @@ func (c *FakeEvents) Create(event *v1.Event) (result *v1.Event, err error) { func (c *FakeEvents) Update(event *v1.Event) (result *v1.Event, err error) { obj, err := c.Fake. - Invokes(core.NewUpdateAction(eventsResource, c.ns, event), &v1.Event{}) + Invokes(testing.NewUpdateAction(eventsResource, c.ns, event), &v1.Event{}) if obj == nil { return nil, err @@ -56,13 +56,13 @@ func (c *FakeEvents) Update(event *v1.Event) (result *v1.Event, err error) { func (c *FakeEvents) Delete(name string, options *meta_v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewDeleteAction(eventsResource, c.ns, name), &v1.Event{}) + Invokes(testing.NewDeleteAction(eventsResource, c.ns, name), &v1.Event{}) return err } func (c *FakeEvents) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error { - action := core.NewDeleteCollectionAction(eventsResource, c.ns, listOptions) + action := testing.NewDeleteCollectionAction(eventsResource, c.ns, listOptions) _, err := c.Fake.Invokes(action, &v1.EventList{}) return err @@ -70,7 +70,7 @@ func (c *FakeEvents) DeleteCollection(options *meta_v1.DeleteOptions, listOption func (c *FakeEvents) Get(name string, options meta_v1.GetOptions) (result *v1.Event, err error) { obj, err := c.Fake. - Invokes(core.NewGetAction(eventsResource, c.ns, name), &v1.Event{}) + Invokes(testing.NewGetAction(eventsResource, c.ns, name), &v1.Event{}) if obj == nil { return nil, err @@ -80,13 +80,13 @@ func (c *FakeEvents) Get(name string, options meta_v1.GetOptions) (result *v1.Ev func (c *FakeEvents) List(opts meta_v1.ListOptions) (result *v1.EventList, err error) { obj, err := c.Fake. - Invokes(core.NewListAction(eventsResource, c.ns, opts), &v1.EventList{}) + Invokes(testing.NewListAction(eventsResource, c.ns, opts), &v1.EventList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -102,14 +102,14 @@ func (c *FakeEvents) List(opts meta_v1.ListOptions) (result *v1.EventList, err e // Watch returns a watch.Interface that watches the requested events. func (c *FakeEvents) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewWatchAction(eventsResource, c.ns, opts)) + InvokesWatch(testing.NewWatchAction(eventsResource, c.ns, opts)) } // Patch applies the patch and returns the patched event. func (c *FakeEvents) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.Event, err error) { obj, err := c.Fake. - Invokes(core.NewPatchSubresourceAction(eventsResource, c.ns, name, data, subresources...), &v1.Event{}) + Invokes(testing.NewPatchSubresourceAction(eventsResource, c.ns, name, data, subresources...), &v1.Event{}) if obj == nil { return nil, err diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_event_expansion.go b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_event_expansion.go index 56c745fd008..584898e935e 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_event_expansion.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_event_expansion.go @@ -19,9 +19,9 @@ package fake import ( "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/runtime" + core "k8s.io/client-go/testing" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1" - "k8s.io/kubernetes/pkg/client/testing/core" ) func (c *FakeEvents) CreateWithEventNamespace(event *v1.Event) (*v1.Event, error) { diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_limitrange.go b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_limitrange.go index c4b05071a41..bffb3041abf 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_limitrange.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_limitrange.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" v1 "k8s.io/kubernetes/pkg/api/v1" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeLimitRanges implements LimitRangeInterface @@ -36,7 +36,7 @@ var limitrangesResource = schema.GroupVersionResource{Group: "", Version: "v1", func (c *FakeLimitRanges) Create(limitRange *v1.LimitRange) (result *v1.LimitRange, err error) { obj, err := c.Fake. - Invokes(core.NewCreateAction(limitrangesResource, c.ns, limitRange), &v1.LimitRange{}) + Invokes(testing.NewCreateAction(limitrangesResource, c.ns, limitRange), &v1.LimitRange{}) if obj == nil { return nil, err @@ -46,7 +46,7 @@ func (c *FakeLimitRanges) Create(limitRange *v1.LimitRange) (result *v1.LimitRan func (c *FakeLimitRanges) Update(limitRange *v1.LimitRange) (result *v1.LimitRange, err error) { obj, err := c.Fake. - Invokes(core.NewUpdateAction(limitrangesResource, c.ns, limitRange), &v1.LimitRange{}) + Invokes(testing.NewUpdateAction(limitrangesResource, c.ns, limitRange), &v1.LimitRange{}) if obj == nil { return nil, err @@ -56,13 +56,13 @@ func (c *FakeLimitRanges) Update(limitRange *v1.LimitRange) (result *v1.LimitRan func (c *FakeLimitRanges) Delete(name string, options *meta_v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewDeleteAction(limitrangesResource, c.ns, name), &v1.LimitRange{}) + Invokes(testing.NewDeleteAction(limitrangesResource, c.ns, name), &v1.LimitRange{}) return err } func (c *FakeLimitRanges) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error { - action := core.NewDeleteCollectionAction(limitrangesResource, c.ns, listOptions) + action := testing.NewDeleteCollectionAction(limitrangesResource, c.ns, listOptions) _, err := c.Fake.Invokes(action, &v1.LimitRangeList{}) return err @@ -70,7 +70,7 @@ func (c *FakeLimitRanges) DeleteCollection(options *meta_v1.DeleteOptions, listO func (c *FakeLimitRanges) Get(name string, options meta_v1.GetOptions) (result *v1.LimitRange, err error) { obj, err := c.Fake. - Invokes(core.NewGetAction(limitrangesResource, c.ns, name), &v1.LimitRange{}) + Invokes(testing.NewGetAction(limitrangesResource, c.ns, name), &v1.LimitRange{}) if obj == nil { return nil, err @@ -80,13 +80,13 @@ func (c *FakeLimitRanges) Get(name string, options meta_v1.GetOptions) (result * func (c *FakeLimitRanges) List(opts meta_v1.ListOptions) (result *v1.LimitRangeList, err error) { obj, err := c.Fake. - Invokes(core.NewListAction(limitrangesResource, c.ns, opts), &v1.LimitRangeList{}) + Invokes(testing.NewListAction(limitrangesResource, c.ns, opts), &v1.LimitRangeList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -102,14 +102,14 @@ func (c *FakeLimitRanges) List(opts meta_v1.ListOptions) (result *v1.LimitRangeL // Watch returns a watch.Interface that watches the requested limitRanges. func (c *FakeLimitRanges) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewWatchAction(limitrangesResource, c.ns, opts)) + InvokesWatch(testing.NewWatchAction(limitrangesResource, c.ns, opts)) } // Patch applies the patch and returns the patched limitRange. func (c *FakeLimitRanges) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.LimitRange, err error) { obj, err := c.Fake. - Invokes(core.NewPatchSubresourceAction(limitrangesResource, c.ns, name, data, subresources...), &v1.LimitRange{}) + Invokes(testing.NewPatchSubresourceAction(limitrangesResource, c.ns, name, data, subresources...), &v1.LimitRange{}) if obj == nil { return nil, err diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_namespace.go b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_namespace.go index 90c6bbd6686..0c6f55fce71 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_namespace.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_namespace.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" v1 "k8s.io/kubernetes/pkg/api/v1" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeNamespaces implements NamespaceInterface @@ -35,7 +35,7 @@ var namespacesResource = schema.GroupVersionResource{Group: "", Version: "v1", R func (c *FakeNamespaces) Create(namespace *v1.Namespace) (result *v1.Namespace, err error) { obj, err := c.Fake. - Invokes(core.NewRootCreateAction(namespacesResource, namespace), &v1.Namespace{}) + Invokes(testing.NewRootCreateAction(namespacesResource, namespace), &v1.Namespace{}) if obj == nil { return nil, err } @@ -44,7 +44,7 @@ func (c *FakeNamespaces) Create(namespace *v1.Namespace) (result *v1.Namespace, func (c *FakeNamespaces) Update(namespace *v1.Namespace) (result *v1.Namespace, err error) { obj, err := c.Fake. - Invokes(core.NewRootUpdateAction(namespacesResource, namespace), &v1.Namespace{}) + Invokes(testing.NewRootUpdateAction(namespacesResource, namespace), &v1.Namespace{}) if obj == nil { return nil, err } @@ -53,7 +53,7 @@ func (c *FakeNamespaces) Update(namespace *v1.Namespace) (result *v1.Namespace, func (c *FakeNamespaces) UpdateStatus(namespace *v1.Namespace) (*v1.Namespace, error) { obj, err := c.Fake. - Invokes(core.NewRootUpdateSubresourceAction(namespacesResource, "status", namespace), &v1.Namespace{}) + Invokes(testing.NewRootUpdateSubresourceAction(namespacesResource, "status", namespace), &v1.Namespace{}) if obj == nil { return nil, err } @@ -62,12 +62,12 @@ func (c *FakeNamespaces) UpdateStatus(namespace *v1.Namespace) (*v1.Namespace, e func (c *FakeNamespaces) Delete(name string, options *meta_v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewRootDeleteAction(namespacesResource, name), &v1.Namespace{}) + Invokes(testing.NewRootDeleteAction(namespacesResource, name), &v1.Namespace{}) return err } func (c *FakeNamespaces) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error { - action := core.NewRootDeleteCollectionAction(namespacesResource, listOptions) + action := testing.NewRootDeleteCollectionAction(namespacesResource, listOptions) _, err := c.Fake.Invokes(action, &v1.NamespaceList{}) return err @@ -75,7 +75,7 @@ func (c *FakeNamespaces) DeleteCollection(options *meta_v1.DeleteOptions, listOp func (c *FakeNamespaces) Get(name string, options meta_v1.GetOptions) (result *v1.Namespace, err error) { obj, err := c.Fake. - Invokes(core.NewRootGetAction(namespacesResource, name), &v1.Namespace{}) + Invokes(testing.NewRootGetAction(namespacesResource, name), &v1.Namespace{}) if obj == nil { return nil, err } @@ -84,12 +84,12 @@ func (c *FakeNamespaces) Get(name string, options meta_v1.GetOptions) (result *v func (c *FakeNamespaces) List(opts meta_v1.ListOptions) (result *v1.NamespaceList, err error) { obj, err := c.Fake. - Invokes(core.NewRootListAction(namespacesResource, opts), &v1.NamespaceList{}) + Invokes(testing.NewRootListAction(namespacesResource, opts), &v1.NamespaceList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -105,13 +105,13 @@ func (c *FakeNamespaces) List(opts meta_v1.ListOptions) (result *v1.NamespaceLis // Watch returns a watch.Interface that watches the requested namespaces. func (c *FakeNamespaces) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewRootWatchAction(namespacesResource, opts)) + InvokesWatch(testing.NewRootWatchAction(namespacesResource, opts)) } // Patch applies the patch and returns the patched namespace. func (c *FakeNamespaces) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.Namespace, err error) { obj, err := c.Fake. - Invokes(core.NewRootPatchSubresourceAction(namespacesResource, name, data, subresources...), &v1.Namespace{}) + Invokes(testing.NewRootPatchSubresourceAction(namespacesResource, name, data, subresources...), &v1.Namespace{}) if obj == nil { return nil, err } diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_namespace_expansion.go b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_namespace_expansion.go index c3ea410ad50..1bf5318488a 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_namespace_expansion.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_namespace_expansion.go @@ -17,8 +17,8 @@ limitations under the License. package fake import ( + core "k8s.io/client-go/testing" "k8s.io/kubernetes/pkg/api/v1" - "k8s.io/kubernetes/pkg/client/testing/core" ) func (c *FakeNamespaces) Finalize(namespace *v1.Namespace) (*v1.Namespace, error) { diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_node.go b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_node.go index cfccbb607f8..0799ccc8c25 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_node.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_node.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" v1 "k8s.io/kubernetes/pkg/api/v1" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeNodes implements NodeInterface @@ -35,7 +35,7 @@ var nodesResource = schema.GroupVersionResource{Group: "", Version: "v1", Resour func (c *FakeNodes) Create(node *v1.Node) (result *v1.Node, err error) { obj, err := c.Fake. - Invokes(core.NewRootCreateAction(nodesResource, node), &v1.Node{}) + Invokes(testing.NewRootCreateAction(nodesResource, node), &v1.Node{}) if obj == nil { return nil, err } @@ -44,7 +44,7 @@ func (c *FakeNodes) Create(node *v1.Node) (result *v1.Node, err error) { func (c *FakeNodes) Update(node *v1.Node) (result *v1.Node, err error) { obj, err := c.Fake. - Invokes(core.NewRootUpdateAction(nodesResource, node), &v1.Node{}) + Invokes(testing.NewRootUpdateAction(nodesResource, node), &v1.Node{}) if obj == nil { return nil, err } @@ -53,7 +53,7 @@ func (c *FakeNodes) Update(node *v1.Node) (result *v1.Node, err error) { func (c *FakeNodes) UpdateStatus(node *v1.Node) (*v1.Node, error) { obj, err := c.Fake. - Invokes(core.NewRootUpdateSubresourceAction(nodesResource, "status", node), &v1.Node{}) + Invokes(testing.NewRootUpdateSubresourceAction(nodesResource, "status", node), &v1.Node{}) if obj == nil { return nil, err } @@ -62,12 +62,12 @@ func (c *FakeNodes) UpdateStatus(node *v1.Node) (*v1.Node, error) { func (c *FakeNodes) Delete(name string, options *meta_v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewRootDeleteAction(nodesResource, name), &v1.Node{}) + Invokes(testing.NewRootDeleteAction(nodesResource, name), &v1.Node{}) return err } func (c *FakeNodes) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error { - action := core.NewRootDeleteCollectionAction(nodesResource, listOptions) + action := testing.NewRootDeleteCollectionAction(nodesResource, listOptions) _, err := c.Fake.Invokes(action, &v1.NodeList{}) return err @@ -75,7 +75,7 @@ func (c *FakeNodes) DeleteCollection(options *meta_v1.DeleteOptions, listOptions func (c *FakeNodes) Get(name string, options meta_v1.GetOptions) (result *v1.Node, err error) { obj, err := c.Fake. - Invokes(core.NewRootGetAction(nodesResource, name), &v1.Node{}) + Invokes(testing.NewRootGetAction(nodesResource, name), &v1.Node{}) if obj == nil { return nil, err } @@ -84,12 +84,12 @@ func (c *FakeNodes) Get(name string, options meta_v1.GetOptions) (result *v1.Nod func (c *FakeNodes) List(opts meta_v1.ListOptions) (result *v1.NodeList, err error) { obj, err := c.Fake. - Invokes(core.NewRootListAction(nodesResource, opts), &v1.NodeList{}) + Invokes(testing.NewRootListAction(nodesResource, opts), &v1.NodeList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -105,13 +105,13 @@ func (c *FakeNodes) List(opts meta_v1.ListOptions) (result *v1.NodeList, err err // Watch returns a watch.Interface that watches the requested nodes. func (c *FakeNodes) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewRootWatchAction(nodesResource, opts)) + InvokesWatch(testing.NewRootWatchAction(nodesResource, opts)) } // Patch applies the patch and returns the patched node. func (c *FakeNodes) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.Node, err error) { obj, err := c.Fake. - Invokes(core.NewRootPatchSubresourceAction(nodesResource, name, data, subresources...), &v1.Node{}) + Invokes(testing.NewRootPatchSubresourceAction(nodesResource, name, data, subresources...), &v1.Node{}) if obj == nil { return nil, err } diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_node_expansion.go b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_node_expansion.go index db7e66ba222..eb338aa106b 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_node_expansion.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_node_expansion.go @@ -17,8 +17,8 @@ limitations under the License. package fake import ( + core "k8s.io/client-go/testing" "k8s.io/kubernetes/pkg/api/v1" - "k8s.io/kubernetes/pkg/client/testing/core" ) func (c *FakeNodes) PatchStatus(nodeName string, data []byte) (*v1.Node, error) { diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_persistentvolume.go b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_persistentvolume.go index 3d9d830433e..1c7109626cc 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_persistentvolume.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_persistentvolume.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" v1 "k8s.io/kubernetes/pkg/api/v1" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakePersistentVolumes implements PersistentVolumeInterface @@ -35,7 +35,7 @@ var persistentvolumesResource = schema.GroupVersionResource{Group: "", Version: func (c *FakePersistentVolumes) Create(persistentVolume *v1.PersistentVolume) (result *v1.PersistentVolume, err error) { obj, err := c.Fake. - Invokes(core.NewRootCreateAction(persistentvolumesResource, persistentVolume), &v1.PersistentVolume{}) + Invokes(testing.NewRootCreateAction(persistentvolumesResource, persistentVolume), &v1.PersistentVolume{}) if obj == nil { return nil, err } @@ -44,7 +44,7 @@ func (c *FakePersistentVolumes) Create(persistentVolume *v1.PersistentVolume) (r func (c *FakePersistentVolumes) Update(persistentVolume *v1.PersistentVolume) (result *v1.PersistentVolume, err error) { obj, err := c.Fake. - Invokes(core.NewRootUpdateAction(persistentvolumesResource, persistentVolume), &v1.PersistentVolume{}) + Invokes(testing.NewRootUpdateAction(persistentvolumesResource, persistentVolume), &v1.PersistentVolume{}) if obj == nil { return nil, err } @@ -53,7 +53,7 @@ func (c *FakePersistentVolumes) Update(persistentVolume *v1.PersistentVolume) (r func (c *FakePersistentVolumes) UpdateStatus(persistentVolume *v1.PersistentVolume) (*v1.PersistentVolume, error) { obj, err := c.Fake. - Invokes(core.NewRootUpdateSubresourceAction(persistentvolumesResource, "status", persistentVolume), &v1.PersistentVolume{}) + Invokes(testing.NewRootUpdateSubresourceAction(persistentvolumesResource, "status", persistentVolume), &v1.PersistentVolume{}) if obj == nil { return nil, err } @@ -62,12 +62,12 @@ func (c *FakePersistentVolumes) UpdateStatus(persistentVolume *v1.PersistentVolu func (c *FakePersistentVolumes) Delete(name string, options *meta_v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewRootDeleteAction(persistentvolumesResource, name), &v1.PersistentVolume{}) + Invokes(testing.NewRootDeleteAction(persistentvolumesResource, name), &v1.PersistentVolume{}) return err } func (c *FakePersistentVolumes) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error { - action := core.NewRootDeleteCollectionAction(persistentvolumesResource, listOptions) + action := testing.NewRootDeleteCollectionAction(persistentvolumesResource, listOptions) _, err := c.Fake.Invokes(action, &v1.PersistentVolumeList{}) return err @@ -75,7 +75,7 @@ func (c *FakePersistentVolumes) DeleteCollection(options *meta_v1.DeleteOptions, func (c *FakePersistentVolumes) Get(name string, options meta_v1.GetOptions) (result *v1.PersistentVolume, err error) { obj, err := c.Fake. - Invokes(core.NewRootGetAction(persistentvolumesResource, name), &v1.PersistentVolume{}) + Invokes(testing.NewRootGetAction(persistentvolumesResource, name), &v1.PersistentVolume{}) if obj == nil { return nil, err } @@ -84,12 +84,12 @@ func (c *FakePersistentVolumes) Get(name string, options meta_v1.GetOptions) (re func (c *FakePersistentVolumes) List(opts meta_v1.ListOptions) (result *v1.PersistentVolumeList, err error) { obj, err := c.Fake. - Invokes(core.NewRootListAction(persistentvolumesResource, opts), &v1.PersistentVolumeList{}) + Invokes(testing.NewRootListAction(persistentvolumesResource, opts), &v1.PersistentVolumeList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -105,13 +105,13 @@ func (c *FakePersistentVolumes) List(opts meta_v1.ListOptions) (result *v1.Persi // Watch returns a watch.Interface that watches the requested persistentVolumes. func (c *FakePersistentVolumes) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewRootWatchAction(persistentvolumesResource, opts)) + InvokesWatch(testing.NewRootWatchAction(persistentvolumesResource, opts)) } // Patch applies the patch and returns the patched persistentVolume. func (c *FakePersistentVolumes) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.PersistentVolume, err error) { obj, err := c.Fake. - Invokes(core.NewRootPatchSubresourceAction(persistentvolumesResource, name, data, subresources...), &v1.PersistentVolume{}) + Invokes(testing.NewRootPatchSubresourceAction(persistentvolumesResource, name, data, subresources...), &v1.PersistentVolume{}) if obj == nil { return nil, err } diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_persistentvolumeclaim.go b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_persistentvolumeclaim.go index 06b6b1490be..d23dc36ef35 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_persistentvolumeclaim.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_persistentvolumeclaim.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" v1 "k8s.io/kubernetes/pkg/api/v1" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakePersistentVolumeClaims implements PersistentVolumeClaimInterface @@ -36,7 +36,7 @@ var persistentvolumeclaimsResource = schema.GroupVersionResource{Group: "", Vers func (c *FakePersistentVolumeClaims) Create(persistentVolumeClaim *v1.PersistentVolumeClaim) (result *v1.PersistentVolumeClaim, err error) { obj, err := c.Fake. - Invokes(core.NewCreateAction(persistentvolumeclaimsResource, c.ns, persistentVolumeClaim), &v1.PersistentVolumeClaim{}) + Invokes(testing.NewCreateAction(persistentvolumeclaimsResource, c.ns, persistentVolumeClaim), &v1.PersistentVolumeClaim{}) if obj == nil { return nil, err @@ -46,7 +46,7 @@ func (c *FakePersistentVolumeClaims) Create(persistentVolumeClaim *v1.Persistent func (c *FakePersistentVolumeClaims) Update(persistentVolumeClaim *v1.PersistentVolumeClaim) (result *v1.PersistentVolumeClaim, err error) { obj, err := c.Fake. - Invokes(core.NewUpdateAction(persistentvolumeclaimsResource, c.ns, persistentVolumeClaim), &v1.PersistentVolumeClaim{}) + Invokes(testing.NewUpdateAction(persistentvolumeclaimsResource, c.ns, persistentVolumeClaim), &v1.PersistentVolumeClaim{}) if obj == nil { return nil, err @@ -56,7 +56,7 @@ func (c *FakePersistentVolumeClaims) Update(persistentVolumeClaim *v1.Persistent func (c *FakePersistentVolumeClaims) UpdateStatus(persistentVolumeClaim *v1.PersistentVolumeClaim) (*v1.PersistentVolumeClaim, error) { obj, err := c.Fake. - Invokes(core.NewUpdateSubresourceAction(persistentvolumeclaimsResource, "status", c.ns, persistentVolumeClaim), &v1.PersistentVolumeClaim{}) + Invokes(testing.NewUpdateSubresourceAction(persistentvolumeclaimsResource, "status", c.ns, persistentVolumeClaim), &v1.PersistentVolumeClaim{}) if obj == nil { return nil, err @@ -66,13 +66,13 @@ func (c *FakePersistentVolumeClaims) UpdateStatus(persistentVolumeClaim *v1.Pers func (c *FakePersistentVolumeClaims) Delete(name string, options *meta_v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewDeleteAction(persistentvolumeclaimsResource, c.ns, name), &v1.PersistentVolumeClaim{}) + Invokes(testing.NewDeleteAction(persistentvolumeclaimsResource, c.ns, name), &v1.PersistentVolumeClaim{}) return err } func (c *FakePersistentVolumeClaims) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error { - action := core.NewDeleteCollectionAction(persistentvolumeclaimsResource, c.ns, listOptions) + action := testing.NewDeleteCollectionAction(persistentvolumeclaimsResource, c.ns, listOptions) _, err := c.Fake.Invokes(action, &v1.PersistentVolumeClaimList{}) return err @@ -80,7 +80,7 @@ func (c *FakePersistentVolumeClaims) DeleteCollection(options *meta_v1.DeleteOpt func (c *FakePersistentVolumeClaims) Get(name string, options meta_v1.GetOptions) (result *v1.PersistentVolumeClaim, err error) { obj, err := c.Fake. - Invokes(core.NewGetAction(persistentvolumeclaimsResource, c.ns, name), &v1.PersistentVolumeClaim{}) + Invokes(testing.NewGetAction(persistentvolumeclaimsResource, c.ns, name), &v1.PersistentVolumeClaim{}) if obj == nil { return nil, err @@ -90,13 +90,13 @@ func (c *FakePersistentVolumeClaims) Get(name string, options meta_v1.GetOptions func (c *FakePersistentVolumeClaims) List(opts meta_v1.ListOptions) (result *v1.PersistentVolumeClaimList, err error) { obj, err := c.Fake. - Invokes(core.NewListAction(persistentvolumeclaimsResource, c.ns, opts), &v1.PersistentVolumeClaimList{}) + Invokes(testing.NewListAction(persistentvolumeclaimsResource, c.ns, opts), &v1.PersistentVolumeClaimList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -112,14 +112,14 @@ func (c *FakePersistentVolumeClaims) List(opts meta_v1.ListOptions) (result *v1. // Watch returns a watch.Interface that watches the requested persistentVolumeClaims. func (c *FakePersistentVolumeClaims) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewWatchAction(persistentvolumeclaimsResource, c.ns, opts)) + InvokesWatch(testing.NewWatchAction(persistentvolumeclaimsResource, c.ns, opts)) } // Patch applies the patch and returns the patched persistentVolumeClaim. func (c *FakePersistentVolumeClaims) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.PersistentVolumeClaim, err error) { obj, err := c.Fake. - Invokes(core.NewPatchSubresourceAction(persistentvolumeclaimsResource, c.ns, name, data, subresources...), &v1.PersistentVolumeClaim{}) + Invokes(testing.NewPatchSubresourceAction(persistentvolumeclaimsResource, c.ns, name, data, subresources...), &v1.PersistentVolumeClaim{}) if obj == nil { return nil, err diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_pod.go b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_pod.go index 4d6ed312b96..f562216a5ba 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_pod.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_pod.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" v1 "k8s.io/kubernetes/pkg/api/v1" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakePods implements PodInterface @@ -36,7 +36,7 @@ var podsResource = schema.GroupVersionResource{Group: "", Version: "v1", Resourc func (c *FakePods) Create(pod *v1.Pod) (result *v1.Pod, err error) { obj, err := c.Fake. - Invokes(core.NewCreateAction(podsResource, c.ns, pod), &v1.Pod{}) + Invokes(testing.NewCreateAction(podsResource, c.ns, pod), &v1.Pod{}) if obj == nil { return nil, err @@ -46,7 +46,7 @@ func (c *FakePods) Create(pod *v1.Pod) (result *v1.Pod, err error) { func (c *FakePods) Update(pod *v1.Pod) (result *v1.Pod, err error) { obj, err := c.Fake. - Invokes(core.NewUpdateAction(podsResource, c.ns, pod), &v1.Pod{}) + Invokes(testing.NewUpdateAction(podsResource, c.ns, pod), &v1.Pod{}) if obj == nil { return nil, err @@ -56,7 +56,7 @@ func (c *FakePods) Update(pod *v1.Pod) (result *v1.Pod, err error) { func (c *FakePods) UpdateStatus(pod *v1.Pod) (*v1.Pod, error) { obj, err := c.Fake. - Invokes(core.NewUpdateSubresourceAction(podsResource, "status", c.ns, pod), &v1.Pod{}) + Invokes(testing.NewUpdateSubresourceAction(podsResource, "status", c.ns, pod), &v1.Pod{}) if obj == nil { return nil, err @@ -66,13 +66,13 @@ func (c *FakePods) UpdateStatus(pod *v1.Pod) (*v1.Pod, error) { func (c *FakePods) Delete(name string, options *meta_v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewDeleteAction(podsResource, c.ns, name), &v1.Pod{}) + Invokes(testing.NewDeleteAction(podsResource, c.ns, name), &v1.Pod{}) return err } func (c *FakePods) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error { - action := core.NewDeleteCollectionAction(podsResource, c.ns, listOptions) + action := testing.NewDeleteCollectionAction(podsResource, c.ns, listOptions) _, err := c.Fake.Invokes(action, &v1.PodList{}) return err @@ -80,7 +80,7 @@ func (c *FakePods) DeleteCollection(options *meta_v1.DeleteOptions, listOptions func (c *FakePods) Get(name string, options meta_v1.GetOptions) (result *v1.Pod, err error) { obj, err := c.Fake. - Invokes(core.NewGetAction(podsResource, c.ns, name), &v1.Pod{}) + Invokes(testing.NewGetAction(podsResource, c.ns, name), &v1.Pod{}) if obj == nil { return nil, err @@ -90,13 +90,13 @@ func (c *FakePods) Get(name string, options meta_v1.GetOptions) (result *v1.Pod, func (c *FakePods) List(opts meta_v1.ListOptions) (result *v1.PodList, err error) { obj, err := c.Fake. - Invokes(core.NewListAction(podsResource, c.ns, opts), &v1.PodList{}) + Invokes(testing.NewListAction(podsResource, c.ns, opts), &v1.PodList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -112,14 +112,14 @@ func (c *FakePods) List(opts meta_v1.ListOptions) (result *v1.PodList, err error // Watch returns a watch.Interface that watches the requested pods. func (c *FakePods) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewWatchAction(podsResource, c.ns, opts)) + InvokesWatch(testing.NewWatchAction(podsResource, c.ns, opts)) } // Patch applies the patch and returns the patched pod. func (c *FakePods) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.Pod, err error) { obj, err := c.Fake. - Invokes(core.NewPatchSubresourceAction(podsResource, c.ns, name, data, subresources...), &v1.Pod{}) + Invokes(testing.NewPatchSubresourceAction(podsResource, c.ns, name, data, subresources...), &v1.Pod{}) if obj == nil { return nil, err diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_pod_expansion.go b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_pod_expansion.go index e215baf25fa..3d62eb7945d 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_pod_expansion.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_pod_expansion.go @@ -18,9 +18,9 @@ package fake import ( restclient "k8s.io/client-go/rest" + core "k8s.io/client-go/testing" "k8s.io/kubernetes/pkg/api/v1" policy "k8s.io/kubernetes/pkg/apis/policy/v1beta1" - "k8s.io/kubernetes/pkg/client/testing/core" ) func (c *FakePods) Bind(binding *v1.Binding) error { diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_podtemplate.go b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_podtemplate.go index e68bbff3088..d14d380cf25 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_podtemplate.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_podtemplate.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" v1 "k8s.io/kubernetes/pkg/api/v1" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakePodTemplates implements PodTemplateInterface @@ -36,7 +36,7 @@ var podtemplatesResource = schema.GroupVersionResource{Group: "", Version: "v1", func (c *FakePodTemplates) Create(podTemplate *v1.PodTemplate) (result *v1.PodTemplate, err error) { obj, err := c.Fake. - Invokes(core.NewCreateAction(podtemplatesResource, c.ns, podTemplate), &v1.PodTemplate{}) + Invokes(testing.NewCreateAction(podtemplatesResource, c.ns, podTemplate), &v1.PodTemplate{}) if obj == nil { return nil, err @@ -46,7 +46,7 @@ func (c *FakePodTemplates) Create(podTemplate *v1.PodTemplate) (result *v1.PodTe func (c *FakePodTemplates) Update(podTemplate *v1.PodTemplate) (result *v1.PodTemplate, err error) { obj, err := c.Fake. - Invokes(core.NewUpdateAction(podtemplatesResource, c.ns, podTemplate), &v1.PodTemplate{}) + Invokes(testing.NewUpdateAction(podtemplatesResource, c.ns, podTemplate), &v1.PodTemplate{}) if obj == nil { return nil, err @@ -56,13 +56,13 @@ func (c *FakePodTemplates) Update(podTemplate *v1.PodTemplate) (result *v1.PodTe func (c *FakePodTemplates) Delete(name string, options *meta_v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewDeleteAction(podtemplatesResource, c.ns, name), &v1.PodTemplate{}) + Invokes(testing.NewDeleteAction(podtemplatesResource, c.ns, name), &v1.PodTemplate{}) return err } func (c *FakePodTemplates) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error { - action := core.NewDeleteCollectionAction(podtemplatesResource, c.ns, listOptions) + action := testing.NewDeleteCollectionAction(podtemplatesResource, c.ns, listOptions) _, err := c.Fake.Invokes(action, &v1.PodTemplateList{}) return err @@ -70,7 +70,7 @@ func (c *FakePodTemplates) DeleteCollection(options *meta_v1.DeleteOptions, list func (c *FakePodTemplates) Get(name string, options meta_v1.GetOptions) (result *v1.PodTemplate, err error) { obj, err := c.Fake. - Invokes(core.NewGetAction(podtemplatesResource, c.ns, name), &v1.PodTemplate{}) + Invokes(testing.NewGetAction(podtemplatesResource, c.ns, name), &v1.PodTemplate{}) if obj == nil { return nil, err @@ -80,13 +80,13 @@ func (c *FakePodTemplates) Get(name string, options meta_v1.GetOptions) (result func (c *FakePodTemplates) List(opts meta_v1.ListOptions) (result *v1.PodTemplateList, err error) { obj, err := c.Fake. - Invokes(core.NewListAction(podtemplatesResource, c.ns, opts), &v1.PodTemplateList{}) + Invokes(testing.NewListAction(podtemplatesResource, c.ns, opts), &v1.PodTemplateList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -102,14 +102,14 @@ func (c *FakePodTemplates) List(opts meta_v1.ListOptions) (result *v1.PodTemplat // Watch returns a watch.Interface that watches the requested podTemplates. func (c *FakePodTemplates) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewWatchAction(podtemplatesResource, c.ns, opts)) + InvokesWatch(testing.NewWatchAction(podtemplatesResource, c.ns, opts)) } // Patch applies the patch and returns the patched podTemplate. func (c *FakePodTemplates) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.PodTemplate, err error) { obj, err := c.Fake. - Invokes(core.NewPatchSubresourceAction(podtemplatesResource, c.ns, name, data, subresources...), &v1.PodTemplate{}) + Invokes(testing.NewPatchSubresourceAction(podtemplatesResource, c.ns, name, data, subresources...), &v1.PodTemplate{}) if obj == nil { return nil, err diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_replicationcontroller.go b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_replicationcontroller.go index 7bf7a8b7b30..1d31ed22c23 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_replicationcontroller.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_replicationcontroller.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" v1 "k8s.io/kubernetes/pkg/api/v1" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeReplicationControllers implements ReplicationControllerInterface @@ -36,7 +36,7 @@ var replicationcontrollersResource = schema.GroupVersionResource{Group: "", Vers func (c *FakeReplicationControllers) Create(replicationController *v1.ReplicationController) (result *v1.ReplicationController, err error) { obj, err := c.Fake. - Invokes(core.NewCreateAction(replicationcontrollersResource, c.ns, replicationController), &v1.ReplicationController{}) + Invokes(testing.NewCreateAction(replicationcontrollersResource, c.ns, replicationController), &v1.ReplicationController{}) if obj == nil { return nil, err @@ -46,7 +46,7 @@ func (c *FakeReplicationControllers) Create(replicationController *v1.Replicatio func (c *FakeReplicationControllers) Update(replicationController *v1.ReplicationController) (result *v1.ReplicationController, err error) { obj, err := c.Fake. - Invokes(core.NewUpdateAction(replicationcontrollersResource, c.ns, replicationController), &v1.ReplicationController{}) + Invokes(testing.NewUpdateAction(replicationcontrollersResource, c.ns, replicationController), &v1.ReplicationController{}) if obj == nil { return nil, err @@ -56,7 +56,7 @@ func (c *FakeReplicationControllers) Update(replicationController *v1.Replicatio func (c *FakeReplicationControllers) UpdateStatus(replicationController *v1.ReplicationController) (*v1.ReplicationController, error) { obj, err := c.Fake. - Invokes(core.NewUpdateSubresourceAction(replicationcontrollersResource, "status", c.ns, replicationController), &v1.ReplicationController{}) + Invokes(testing.NewUpdateSubresourceAction(replicationcontrollersResource, "status", c.ns, replicationController), &v1.ReplicationController{}) if obj == nil { return nil, err @@ -66,13 +66,13 @@ func (c *FakeReplicationControllers) UpdateStatus(replicationController *v1.Repl func (c *FakeReplicationControllers) Delete(name string, options *meta_v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewDeleteAction(replicationcontrollersResource, c.ns, name), &v1.ReplicationController{}) + Invokes(testing.NewDeleteAction(replicationcontrollersResource, c.ns, name), &v1.ReplicationController{}) return err } func (c *FakeReplicationControllers) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error { - action := core.NewDeleteCollectionAction(replicationcontrollersResource, c.ns, listOptions) + action := testing.NewDeleteCollectionAction(replicationcontrollersResource, c.ns, listOptions) _, err := c.Fake.Invokes(action, &v1.ReplicationControllerList{}) return err @@ -80,7 +80,7 @@ func (c *FakeReplicationControllers) DeleteCollection(options *meta_v1.DeleteOpt func (c *FakeReplicationControllers) Get(name string, options meta_v1.GetOptions) (result *v1.ReplicationController, err error) { obj, err := c.Fake. - Invokes(core.NewGetAction(replicationcontrollersResource, c.ns, name), &v1.ReplicationController{}) + Invokes(testing.NewGetAction(replicationcontrollersResource, c.ns, name), &v1.ReplicationController{}) if obj == nil { return nil, err @@ -90,13 +90,13 @@ func (c *FakeReplicationControllers) Get(name string, options meta_v1.GetOptions func (c *FakeReplicationControllers) List(opts meta_v1.ListOptions) (result *v1.ReplicationControllerList, err error) { obj, err := c.Fake. - Invokes(core.NewListAction(replicationcontrollersResource, c.ns, opts), &v1.ReplicationControllerList{}) + Invokes(testing.NewListAction(replicationcontrollersResource, c.ns, opts), &v1.ReplicationControllerList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -112,14 +112,14 @@ func (c *FakeReplicationControllers) List(opts meta_v1.ListOptions) (result *v1. // Watch returns a watch.Interface that watches the requested replicationControllers. func (c *FakeReplicationControllers) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewWatchAction(replicationcontrollersResource, c.ns, opts)) + InvokesWatch(testing.NewWatchAction(replicationcontrollersResource, c.ns, opts)) } // Patch applies the patch and returns the patched replicationController. func (c *FakeReplicationControllers) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.ReplicationController, err error) { obj, err := c.Fake. - Invokes(core.NewPatchSubresourceAction(replicationcontrollersResource, c.ns, name, data, subresources...), &v1.ReplicationController{}) + Invokes(testing.NewPatchSubresourceAction(replicationcontrollersResource, c.ns, name, data, subresources...), &v1.ReplicationController{}) if obj == nil { return nil, err diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_resourcequota.go b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_resourcequota.go index 69439cb6d67..ac94967ec59 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_resourcequota.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_resourcequota.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" v1 "k8s.io/kubernetes/pkg/api/v1" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeResourceQuotas implements ResourceQuotaInterface @@ -36,7 +36,7 @@ var resourcequotasResource = schema.GroupVersionResource{Group: "", Version: "v1 func (c *FakeResourceQuotas) Create(resourceQuota *v1.ResourceQuota) (result *v1.ResourceQuota, err error) { obj, err := c.Fake. - Invokes(core.NewCreateAction(resourcequotasResource, c.ns, resourceQuota), &v1.ResourceQuota{}) + Invokes(testing.NewCreateAction(resourcequotasResource, c.ns, resourceQuota), &v1.ResourceQuota{}) if obj == nil { return nil, err @@ -46,7 +46,7 @@ func (c *FakeResourceQuotas) Create(resourceQuota *v1.ResourceQuota) (result *v1 func (c *FakeResourceQuotas) Update(resourceQuota *v1.ResourceQuota) (result *v1.ResourceQuota, err error) { obj, err := c.Fake. - Invokes(core.NewUpdateAction(resourcequotasResource, c.ns, resourceQuota), &v1.ResourceQuota{}) + Invokes(testing.NewUpdateAction(resourcequotasResource, c.ns, resourceQuota), &v1.ResourceQuota{}) if obj == nil { return nil, err @@ -56,7 +56,7 @@ func (c *FakeResourceQuotas) Update(resourceQuota *v1.ResourceQuota) (result *v1 func (c *FakeResourceQuotas) UpdateStatus(resourceQuota *v1.ResourceQuota) (*v1.ResourceQuota, error) { obj, err := c.Fake. - Invokes(core.NewUpdateSubresourceAction(resourcequotasResource, "status", c.ns, resourceQuota), &v1.ResourceQuota{}) + Invokes(testing.NewUpdateSubresourceAction(resourcequotasResource, "status", c.ns, resourceQuota), &v1.ResourceQuota{}) if obj == nil { return nil, err @@ -66,13 +66,13 @@ func (c *FakeResourceQuotas) UpdateStatus(resourceQuota *v1.ResourceQuota) (*v1. func (c *FakeResourceQuotas) Delete(name string, options *meta_v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewDeleteAction(resourcequotasResource, c.ns, name), &v1.ResourceQuota{}) + Invokes(testing.NewDeleteAction(resourcequotasResource, c.ns, name), &v1.ResourceQuota{}) return err } func (c *FakeResourceQuotas) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error { - action := core.NewDeleteCollectionAction(resourcequotasResource, c.ns, listOptions) + action := testing.NewDeleteCollectionAction(resourcequotasResource, c.ns, listOptions) _, err := c.Fake.Invokes(action, &v1.ResourceQuotaList{}) return err @@ -80,7 +80,7 @@ func (c *FakeResourceQuotas) DeleteCollection(options *meta_v1.DeleteOptions, li func (c *FakeResourceQuotas) Get(name string, options meta_v1.GetOptions) (result *v1.ResourceQuota, err error) { obj, err := c.Fake. - Invokes(core.NewGetAction(resourcequotasResource, c.ns, name), &v1.ResourceQuota{}) + Invokes(testing.NewGetAction(resourcequotasResource, c.ns, name), &v1.ResourceQuota{}) if obj == nil { return nil, err @@ -90,13 +90,13 @@ func (c *FakeResourceQuotas) Get(name string, options meta_v1.GetOptions) (resul func (c *FakeResourceQuotas) List(opts meta_v1.ListOptions) (result *v1.ResourceQuotaList, err error) { obj, err := c.Fake. - Invokes(core.NewListAction(resourcequotasResource, c.ns, opts), &v1.ResourceQuotaList{}) + Invokes(testing.NewListAction(resourcequotasResource, c.ns, opts), &v1.ResourceQuotaList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -112,14 +112,14 @@ func (c *FakeResourceQuotas) List(opts meta_v1.ListOptions) (result *v1.Resource // Watch returns a watch.Interface that watches the requested resourceQuotas. func (c *FakeResourceQuotas) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewWatchAction(resourcequotasResource, c.ns, opts)) + InvokesWatch(testing.NewWatchAction(resourcequotasResource, c.ns, opts)) } // Patch applies the patch and returns the patched resourceQuota. func (c *FakeResourceQuotas) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.ResourceQuota, err error) { obj, err := c.Fake. - Invokes(core.NewPatchSubresourceAction(resourcequotasResource, c.ns, name, data, subresources...), &v1.ResourceQuota{}) + Invokes(testing.NewPatchSubresourceAction(resourcequotasResource, c.ns, name, data, subresources...), &v1.ResourceQuota{}) if obj == nil { return nil, err diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_secret.go b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_secret.go index 9ed22038566..0d6537dbdbd 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_secret.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_secret.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" v1 "k8s.io/kubernetes/pkg/api/v1" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeSecrets implements SecretInterface @@ -36,7 +36,7 @@ var secretsResource = schema.GroupVersionResource{Group: "", Version: "v1", Reso func (c *FakeSecrets) Create(secret *v1.Secret) (result *v1.Secret, err error) { obj, err := c.Fake. - Invokes(core.NewCreateAction(secretsResource, c.ns, secret), &v1.Secret{}) + Invokes(testing.NewCreateAction(secretsResource, c.ns, secret), &v1.Secret{}) if obj == nil { return nil, err @@ -46,7 +46,7 @@ func (c *FakeSecrets) Create(secret *v1.Secret) (result *v1.Secret, err error) { func (c *FakeSecrets) Update(secret *v1.Secret) (result *v1.Secret, err error) { obj, err := c.Fake. - Invokes(core.NewUpdateAction(secretsResource, c.ns, secret), &v1.Secret{}) + Invokes(testing.NewUpdateAction(secretsResource, c.ns, secret), &v1.Secret{}) if obj == nil { return nil, err @@ -56,13 +56,13 @@ func (c *FakeSecrets) Update(secret *v1.Secret) (result *v1.Secret, err error) { func (c *FakeSecrets) Delete(name string, options *meta_v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewDeleteAction(secretsResource, c.ns, name), &v1.Secret{}) + Invokes(testing.NewDeleteAction(secretsResource, c.ns, name), &v1.Secret{}) return err } func (c *FakeSecrets) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error { - action := core.NewDeleteCollectionAction(secretsResource, c.ns, listOptions) + action := testing.NewDeleteCollectionAction(secretsResource, c.ns, listOptions) _, err := c.Fake.Invokes(action, &v1.SecretList{}) return err @@ -70,7 +70,7 @@ func (c *FakeSecrets) DeleteCollection(options *meta_v1.DeleteOptions, listOptio func (c *FakeSecrets) Get(name string, options meta_v1.GetOptions) (result *v1.Secret, err error) { obj, err := c.Fake. - Invokes(core.NewGetAction(secretsResource, c.ns, name), &v1.Secret{}) + Invokes(testing.NewGetAction(secretsResource, c.ns, name), &v1.Secret{}) if obj == nil { return nil, err @@ -80,13 +80,13 @@ func (c *FakeSecrets) Get(name string, options meta_v1.GetOptions) (result *v1.S func (c *FakeSecrets) List(opts meta_v1.ListOptions) (result *v1.SecretList, err error) { obj, err := c.Fake. - Invokes(core.NewListAction(secretsResource, c.ns, opts), &v1.SecretList{}) + Invokes(testing.NewListAction(secretsResource, c.ns, opts), &v1.SecretList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -102,14 +102,14 @@ func (c *FakeSecrets) List(opts meta_v1.ListOptions) (result *v1.SecretList, err // Watch returns a watch.Interface that watches the requested secrets. func (c *FakeSecrets) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewWatchAction(secretsResource, c.ns, opts)) + InvokesWatch(testing.NewWatchAction(secretsResource, c.ns, opts)) } // Patch applies the patch and returns the patched secret. func (c *FakeSecrets) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.Secret, err error) { obj, err := c.Fake. - Invokes(core.NewPatchSubresourceAction(secretsResource, c.ns, name, data, subresources...), &v1.Secret{}) + Invokes(testing.NewPatchSubresourceAction(secretsResource, c.ns, name, data, subresources...), &v1.Secret{}) if obj == nil { return nil, err diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_service.go b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_service.go index ba891a36f89..d106086d483 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_service.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_service.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" v1 "k8s.io/kubernetes/pkg/api/v1" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeServices implements ServiceInterface @@ -36,7 +36,7 @@ var servicesResource = schema.GroupVersionResource{Group: "", Version: "v1", Res func (c *FakeServices) Create(service *v1.Service) (result *v1.Service, err error) { obj, err := c.Fake. - Invokes(core.NewCreateAction(servicesResource, c.ns, service), &v1.Service{}) + Invokes(testing.NewCreateAction(servicesResource, c.ns, service), &v1.Service{}) if obj == nil { return nil, err @@ -46,7 +46,7 @@ func (c *FakeServices) Create(service *v1.Service) (result *v1.Service, err erro func (c *FakeServices) Update(service *v1.Service) (result *v1.Service, err error) { obj, err := c.Fake. - Invokes(core.NewUpdateAction(servicesResource, c.ns, service), &v1.Service{}) + Invokes(testing.NewUpdateAction(servicesResource, c.ns, service), &v1.Service{}) if obj == nil { return nil, err @@ -56,7 +56,7 @@ func (c *FakeServices) Update(service *v1.Service) (result *v1.Service, err erro func (c *FakeServices) UpdateStatus(service *v1.Service) (*v1.Service, error) { obj, err := c.Fake. - Invokes(core.NewUpdateSubresourceAction(servicesResource, "status", c.ns, service), &v1.Service{}) + Invokes(testing.NewUpdateSubresourceAction(servicesResource, "status", c.ns, service), &v1.Service{}) if obj == nil { return nil, err @@ -66,13 +66,13 @@ func (c *FakeServices) UpdateStatus(service *v1.Service) (*v1.Service, error) { func (c *FakeServices) Delete(name string, options *meta_v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewDeleteAction(servicesResource, c.ns, name), &v1.Service{}) + Invokes(testing.NewDeleteAction(servicesResource, c.ns, name), &v1.Service{}) return err } func (c *FakeServices) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error { - action := core.NewDeleteCollectionAction(servicesResource, c.ns, listOptions) + action := testing.NewDeleteCollectionAction(servicesResource, c.ns, listOptions) _, err := c.Fake.Invokes(action, &v1.ServiceList{}) return err @@ -80,7 +80,7 @@ func (c *FakeServices) DeleteCollection(options *meta_v1.DeleteOptions, listOpti func (c *FakeServices) Get(name string, options meta_v1.GetOptions) (result *v1.Service, err error) { obj, err := c.Fake. - Invokes(core.NewGetAction(servicesResource, c.ns, name), &v1.Service{}) + Invokes(testing.NewGetAction(servicesResource, c.ns, name), &v1.Service{}) if obj == nil { return nil, err @@ -90,13 +90,13 @@ func (c *FakeServices) Get(name string, options meta_v1.GetOptions) (result *v1. func (c *FakeServices) List(opts meta_v1.ListOptions) (result *v1.ServiceList, err error) { obj, err := c.Fake. - Invokes(core.NewListAction(servicesResource, c.ns, opts), &v1.ServiceList{}) + Invokes(testing.NewListAction(servicesResource, c.ns, opts), &v1.ServiceList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -112,14 +112,14 @@ func (c *FakeServices) List(opts meta_v1.ListOptions) (result *v1.ServiceList, e // Watch returns a watch.Interface that watches the requested services. func (c *FakeServices) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewWatchAction(servicesResource, c.ns, opts)) + InvokesWatch(testing.NewWatchAction(servicesResource, c.ns, opts)) } // Patch applies the patch and returns the patched service. func (c *FakeServices) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.Service, err error) { obj, err := c.Fake. - Invokes(core.NewPatchSubresourceAction(servicesResource, c.ns, name, data, subresources...), &v1.Service{}) + Invokes(testing.NewPatchSubresourceAction(servicesResource, c.ns, name, data, subresources...), &v1.Service{}) if obj == nil { return nil, err diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_service_expansion.go b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_service_expansion.go index 51d6fa8d3fd..92e4930d711 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_service_expansion.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_service_expansion.go @@ -18,7 +18,7 @@ package fake import ( restclient "k8s.io/client-go/rest" - "k8s.io/kubernetes/pkg/client/testing/core" + core "k8s.io/client-go/testing" ) func (c *FakeServices) ProxyGet(scheme, name, port, path string, params map[string]string) restclient.ResponseWrapper { diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_serviceaccount.go b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_serviceaccount.go index 130a9df90d7..f4f2da492f8 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_serviceaccount.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_serviceaccount.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" v1 "k8s.io/kubernetes/pkg/api/v1" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeServiceAccounts implements ServiceAccountInterface @@ -36,7 +36,7 @@ var serviceaccountsResource = schema.GroupVersionResource{Group: "", Version: "v func (c *FakeServiceAccounts) Create(serviceAccount *v1.ServiceAccount) (result *v1.ServiceAccount, err error) { obj, err := c.Fake. - Invokes(core.NewCreateAction(serviceaccountsResource, c.ns, serviceAccount), &v1.ServiceAccount{}) + Invokes(testing.NewCreateAction(serviceaccountsResource, c.ns, serviceAccount), &v1.ServiceAccount{}) if obj == nil { return nil, err @@ -46,7 +46,7 @@ func (c *FakeServiceAccounts) Create(serviceAccount *v1.ServiceAccount) (result func (c *FakeServiceAccounts) Update(serviceAccount *v1.ServiceAccount) (result *v1.ServiceAccount, err error) { obj, err := c.Fake. - Invokes(core.NewUpdateAction(serviceaccountsResource, c.ns, serviceAccount), &v1.ServiceAccount{}) + Invokes(testing.NewUpdateAction(serviceaccountsResource, c.ns, serviceAccount), &v1.ServiceAccount{}) if obj == nil { return nil, err @@ -56,13 +56,13 @@ func (c *FakeServiceAccounts) Update(serviceAccount *v1.ServiceAccount) (result func (c *FakeServiceAccounts) Delete(name string, options *meta_v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewDeleteAction(serviceaccountsResource, c.ns, name), &v1.ServiceAccount{}) + Invokes(testing.NewDeleteAction(serviceaccountsResource, c.ns, name), &v1.ServiceAccount{}) return err } func (c *FakeServiceAccounts) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error { - action := core.NewDeleteCollectionAction(serviceaccountsResource, c.ns, listOptions) + action := testing.NewDeleteCollectionAction(serviceaccountsResource, c.ns, listOptions) _, err := c.Fake.Invokes(action, &v1.ServiceAccountList{}) return err @@ -70,7 +70,7 @@ func (c *FakeServiceAccounts) DeleteCollection(options *meta_v1.DeleteOptions, l func (c *FakeServiceAccounts) Get(name string, options meta_v1.GetOptions) (result *v1.ServiceAccount, err error) { obj, err := c.Fake. - Invokes(core.NewGetAction(serviceaccountsResource, c.ns, name), &v1.ServiceAccount{}) + Invokes(testing.NewGetAction(serviceaccountsResource, c.ns, name), &v1.ServiceAccount{}) if obj == nil { return nil, err @@ -80,13 +80,13 @@ func (c *FakeServiceAccounts) Get(name string, options meta_v1.GetOptions) (resu func (c *FakeServiceAccounts) List(opts meta_v1.ListOptions) (result *v1.ServiceAccountList, err error) { obj, err := c.Fake. - Invokes(core.NewListAction(serviceaccountsResource, c.ns, opts), &v1.ServiceAccountList{}) + Invokes(testing.NewListAction(serviceaccountsResource, c.ns, opts), &v1.ServiceAccountList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -102,14 +102,14 @@ func (c *FakeServiceAccounts) List(opts meta_v1.ListOptions) (result *v1.Service // Watch returns a watch.Interface that watches the requested serviceAccounts. func (c *FakeServiceAccounts) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewWatchAction(serviceaccountsResource, c.ns, opts)) + InvokesWatch(testing.NewWatchAction(serviceaccountsResource, c.ns, opts)) } // Patch applies the patch and returns the patched serviceAccount. func (c *FakeServiceAccounts) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.ServiceAccount, err error) { obj, err := c.Fake. - Invokes(core.NewPatchSubresourceAction(serviceaccountsResource, c.ns, name, data, subresources...), &v1.ServiceAccount{}) + Invokes(testing.NewPatchSubresourceAction(serviceaccountsResource, c.ns, name, data, subresources...), &v1.ServiceAccount{}) if obj == nil { return nil, err diff --git a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/BUILD b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/BUILD index 7a0c6ec5ce8..7e0edb7dd1a 100644 --- a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/BUILD +++ b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/BUILD @@ -26,13 +26,13 @@ go_library( deps = [ "//pkg/apis/extensions/v1beta1:go_default_library", "//pkg/client/clientset_generated/clientset/typed/extensions/v1beta1:go_default_library", - "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/testing", ], ) diff --git a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_daemonset.go b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_daemonset.go index 1af9a446876..5bbdb729210 100644 --- a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_daemonset.go +++ b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_daemonset.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeDaemonSets implements DaemonSetInterface @@ -36,7 +36,7 @@ var daemonsetsResource = schema.GroupVersionResource{Group: "extensions", Versio func (c *FakeDaemonSets) Create(daemonSet *v1beta1.DaemonSet) (result *v1beta1.DaemonSet, err error) { obj, err := c.Fake. - Invokes(core.NewCreateAction(daemonsetsResource, c.ns, daemonSet), &v1beta1.DaemonSet{}) + Invokes(testing.NewCreateAction(daemonsetsResource, c.ns, daemonSet), &v1beta1.DaemonSet{}) if obj == nil { return nil, err @@ -46,7 +46,7 @@ func (c *FakeDaemonSets) Create(daemonSet *v1beta1.DaemonSet) (result *v1beta1.D func (c *FakeDaemonSets) Update(daemonSet *v1beta1.DaemonSet) (result *v1beta1.DaemonSet, err error) { obj, err := c.Fake. - Invokes(core.NewUpdateAction(daemonsetsResource, c.ns, daemonSet), &v1beta1.DaemonSet{}) + Invokes(testing.NewUpdateAction(daemonsetsResource, c.ns, daemonSet), &v1beta1.DaemonSet{}) if obj == nil { return nil, err @@ -56,7 +56,7 @@ func (c *FakeDaemonSets) Update(daemonSet *v1beta1.DaemonSet) (result *v1beta1.D func (c *FakeDaemonSets) UpdateStatus(daemonSet *v1beta1.DaemonSet) (*v1beta1.DaemonSet, error) { obj, err := c.Fake. - Invokes(core.NewUpdateSubresourceAction(daemonsetsResource, "status", c.ns, daemonSet), &v1beta1.DaemonSet{}) + Invokes(testing.NewUpdateSubresourceAction(daemonsetsResource, "status", c.ns, daemonSet), &v1beta1.DaemonSet{}) if obj == nil { return nil, err @@ -66,13 +66,13 @@ func (c *FakeDaemonSets) UpdateStatus(daemonSet *v1beta1.DaemonSet) (*v1beta1.Da func (c *FakeDaemonSets) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewDeleteAction(daemonsetsResource, c.ns, name), &v1beta1.DaemonSet{}) + Invokes(testing.NewDeleteAction(daemonsetsResource, c.ns, name), &v1beta1.DaemonSet{}) return err } func (c *FakeDaemonSets) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := core.NewDeleteCollectionAction(daemonsetsResource, c.ns, listOptions) + action := testing.NewDeleteCollectionAction(daemonsetsResource, c.ns, listOptions) _, err := c.Fake.Invokes(action, &v1beta1.DaemonSetList{}) return err @@ -80,7 +80,7 @@ func (c *FakeDaemonSets) DeleteCollection(options *v1.DeleteOptions, listOptions func (c *FakeDaemonSets) Get(name string, options v1.GetOptions) (result *v1beta1.DaemonSet, err error) { obj, err := c.Fake. - Invokes(core.NewGetAction(daemonsetsResource, c.ns, name), &v1beta1.DaemonSet{}) + Invokes(testing.NewGetAction(daemonsetsResource, c.ns, name), &v1beta1.DaemonSet{}) if obj == nil { return nil, err @@ -90,13 +90,13 @@ func (c *FakeDaemonSets) Get(name string, options v1.GetOptions) (result *v1beta func (c *FakeDaemonSets) List(opts v1.ListOptions) (result *v1beta1.DaemonSetList, err error) { obj, err := c.Fake. - Invokes(core.NewListAction(daemonsetsResource, c.ns, opts), &v1beta1.DaemonSetList{}) + Invokes(testing.NewListAction(daemonsetsResource, c.ns, opts), &v1beta1.DaemonSetList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -112,14 +112,14 @@ func (c *FakeDaemonSets) List(opts v1.ListOptions) (result *v1beta1.DaemonSetLis // Watch returns a watch.Interface that watches the requested daemonSets. func (c *FakeDaemonSets) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewWatchAction(daemonsetsResource, c.ns, opts)) + InvokesWatch(testing.NewWatchAction(daemonsetsResource, c.ns, opts)) } // Patch applies the patch and returns the patched daemonSet. func (c *FakeDaemonSets) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.DaemonSet, err error) { obj, err := c.Fake. - Invokes(core.NewPatchSubresourceAction(daemonsetsResource, c.ns, name, data, subresources...), &v1beta1.DaemonSet{}) + Invokes(testing.NewPatchSubresourceAction(daemonsetsResource, c.ns, name, data, subresources...), &v1beta1.DaemonSet{}) if obj == nil { return nil, err diff --git a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_deployment.go b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_deployment.go index f49ab7e7897..78b0e56c58d 100644 --- a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_deployment.go +++ b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_deployment.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeDeployments implements DeploymentInterface @@ -36,7 +36,7 @@ var deploymentsResource = schema.GroupVersionResource{Group: "extensions", Versi func (c *FakeDeployments) Create(deployment *v1beta1.Deployment) (result *v1beta1.Deployment, err error) { obj, err := c.Fake. - Invokes(core.NewCreateAction(deploymentsResource, c.ns, deployment), &v1beta1.Deployment{}) + Invokes(testing.NewCreateAction(deploymentsResource, c.ns, deployment), &v1beta1.Deployment{}) if obj == nil { return nil, err @@ -46,7 +46,7 @@ func (c *FakeDeployments) Create(deployment *v1beta1.Deployment) (result *v1beta func (c *FakeDeployments) Update(deployment *v1beta1.Deployment) (result *v1beta1.Deployment, err error) { obj, err := c.Fake. - Invokes(core.NewUpdateAction(deploymentsResource, c.ns, deployment), &v1beta1.Deployment{}) + Invokes(testing.NewUpdateAction(deploymentsResource, c.ns, deployment), &v1beta1.Deployment{}) if obj == nil { return nil, err @@ -56,7 +56,7 @@ func (c *FakeDeployments) Update(deployment *v1beta1.Deployment) (result *v1beta func (c *FakeDeployments) UpdateStatus(deployment *v1beta1.Deployment) (*v1beta1.Deployment, error) { obj, err := c.Fake. - Invokes(core.NewUpdateSubresourceAction(deploymentsResource, "status", c.ns, deployment), &v1beta1.Deployment{}) + Invokes(testing.NewUpdateSubresourceAction(deploymentsResource, "status", c.ns, deployment), &v1beta1.Deployment{}) if obj == nil { return nil, err @@ -66,13 +66,13 @@ func (c *FakeDeployments) UpdateStatus(deployment *v1beta1.Deployment) (*v1beta1 func (c *FakeDeployments) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewDeleteAction(deploymentsResource, c.ns, name), &v1beta1.Deployment{}) + Invokes(testing.NewDeleteAction(deploymentsResource, c.ns, name), &v1beta1.Deployment{}) return err } func (c *FakeDeployments) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := core.NewDeleteCollectionAction(deploymentsResource, c.ns, listOptions) + action := testing.NewDeleteCollectionAction(deploymentsResource, c.ns, listOptions) _, err := c.Fake.Invokes(action, &v1beta1.DeploymentList{}) return err @@ -80,7 +80,7 @@ func (c *FakeDeployments) DeleteCollection(options *v1.DeleteOptions, listOption func (c *FakeDeployments) Get(name string, options v1.GetOptions) (result *v1beta1.Deployment, err error) { obj, err := c.Fake. - Invokes(core.NewGetAction(deploymentsResource, c.ns, name), &v1beta1.Deployment{}) + Invokes(testing.NewGetAction(deploymentsResource, c.ns, name), &v1beta1.Deployment{}) if obj == nil { return nil, err @@ -90,13 +90,13 @@ func (c *FakeDeployments) Get(name string, options v1.GetOptions) (result *v1bet func (c *FakeDeployments) List(opts v1.ListOptions) (result *v1beta1.DeploymentList, err error) { obj, err := c.Fake. - Invokes(core.NewListAction(deploymentsResource, c.ns, opts), &v1beta1.DeploymentList{}) + Invokes(testing.NewListAction(deploymentsResource, c.ns, opts), &v1beta1.DeploymentList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -112,14 +112,14 @@ func (c *FakeDeployments) List(opts v1.ListOptions) (result *v1beta1.DeploymentL // Watch returns a watch.Interface that watches the requested deployments. func (c *FakeDeployments) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewWatchAction(deploymentsResource, c.ns, opts)) + InvokesWatch(testing.NewWatchAction(deploymentsResource, c.ns, opts)) } // Patch applies the patch and returns the patched deployment. func (c *FakeDeployments) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.Deployment, err error) { obj, err := c.Fake. - Invokes(core.NewPatchSubresourceAction(deploymentsResource, c.ns, name, data, subresources...), &v1beta1.Deployment{}) + Invokes(testing.NewPatchSubresourceAction(deploymentsResource, c.ns, name, data, subresources...), &v1beta1.Deployment{}) if obj == nil { return nil, err diff --git a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_deployment_expansion.go b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_deployment_expansion.go index 37836278aea..7fb5027eab4 100644 --- a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_deployment_expansion.go +++ b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_deployment_expansion.go @@ -17,8 +17,8 @@ limitations under the License. package fake import ( + core "k8s.io/client-go/testing" "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" - "k8s.io/kubernetes/pkg/client/testing/core" ) func (c *FakeDeployments) Rollback(deploymentRollback *v1beta1.DeploymentRollback) error { diff --git a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_extensions_client.go b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_extensions_client.go index 84749284c2e..e89bdfdb482 100644 --- a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_extensions_client.go +++ b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_extensions_client.go @@ -18,12 +18,12 @@ package fake import ( rest "k8s.io/client-go/rest" + testing "k8s.io/client-go/testing" v1beta1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1" - core "k8s.io/kubernetes/pkg/client/testing/core" ) type FakeExtensionsV1beta1 struct { - *core.Fake + *testing.Fake } func (c *FakeExtensionsV1beta1) DaemonSets(namespace string) v1beta1.DaemonSetInterface { diff --git a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_ingress.go b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_ingress.go index 277717bb60f..84d023dff2e 100644 --- a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_ingress.go +++ b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_ingress.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeIngresses implements IngressInterface @@ -36,7 +36,7 @@ var ingressesResource = schema.GroupVersionResource{Group: "extensions", Version func (c *FakeIngresses) Create(ingress *v1beta1.Ingress) (result *v1beta1.Ingress, err error) { obj, err := c.Fake. - Invokes(core.NewCreateAction(ingressesResource, c.ns, ingress), &v1beta1.Ingress{}) + Invokes(testing.NewCreateAction(ingressesResource, c.ns, ingress), &v1beta1.Ingress{}) if obj == nil { return nil, err @@ -46,7 +46,7 @@ func (c *FakeIngresses) Create(ingress *v1beta1.Ingress) (result *v1beta1.Ingres func (c *FakeIngresses) Update(ingress *v1beta1.Ingress) (result *v1beta1.Ingress, err error) { obj, err := c.Fake. - Invokes(core.NewUpdateAction(ingressesResource, c.ns, ingress), &v1beta1.Ingress{}) + Invokes(testing.NewUpdateAction(ingressesResource, c.ns, ingress), &v1beta1.Ingress{}) if obj == nil { return nil, err @@ -56,7 +56,7 @@ func (c *FakeIngresses) Update(ingress *v1beta1.Ingress) (result *v1beta1.Ingres func (c *FakeIngresses) UpdateStatus(ingress *v1beta1.Ingress) (*v1beta1.Ingress, error) { obj, err := c.Fake. - Invokes(core.NewUpdateSubresourceAction(ingressesResource, "status", c.ns, ingress), &v1beta1.Ingress{}) + Invokes(testing.NewUpdateSubresourceAction(ingressesResource, "status", c.ns, ingress), &v1beta1.Ingress{}) if obj == nil { return nil, err @@ -66,13 +66,13 @@ func (c *FakeIngresses) UpdateStatus(ingress *v1beta1.Ingress) (*v1beta1.Ingress func (c *FakeIngresses) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewDeleteAction(ingressesResource, c.ns, name), &v1beta1.Ingress{}) + Invokes(testing.NewDeleteAction(ingressesResource, c.ns, name), &v1beta1.Ingress{}) return err } func (c *FakeIngresses) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := core.NewDeleteCollectionAction(ingressesResource, c.ns, listOptions) + action := testing.NewDeleteCollectionAction(ingressesResource, c.ns, listOptions) _, err := c.Fake.Invokes(action, &v1beta1.IngressList{}) return err @@ -80,7 +80,7 @@ func (c *FakeIngresses) DeleteCollection(options *v1.DeleteOptions, listOptions func (c *FakeIngresses) Get(name string, options v1.GetOptions) (result *v1beta1.Ingress, err error) { obj, err := c.Fake. - Invokes(core.NewGetAction(ingressesResource, c.ns, name), &v1beta1.Ingress{}) + Invokes(testing.NewGetAction(ingressesResource, c.ns, name), &v1beta1.Ingress{}) if obj == nil { return nil, err @@ -90,13 +90,13 @@ func (c *FakeIngresses) Get(name string, options v1.GetOptions) (result *v1beta1 func (c *FakeIngresses) List(opts v1.ListOptions) (result *v1beta1.IngressList, err error) { obj, err := c.Fake. - Invokes(core.NewListAction(ingressesResource, c.ns, opts), &v1beta1.IngressList{}) + Invokes(testing.NewListAction(ingressesResource, c.ns, opts), &v1beta1.IngressList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -112,14 +112,14 @@ func (c *FakeIngresses) List(opts v1.ListOptions) (result *v1beta1.IngressList, // Watch returns a watch.Interface that watches the requested ingresses. func (c *FakeIngresses) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewWatchAction(ingressesResource, c.ns, opts)) + InvokesWatch(testing.NewWatchAction(ingressesResource, c.ns, opts)) } // Patch applies the patch and returns the patched ingress. func (c *FakeIngresses) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.Ingress, err error) { obj, err := c.Fake. - Invokes(core.NewPatchSubresourceAction(ingressesResource, c.ns, name, data, subresources...), &v1beta1.Ingress{}) + Invokes(testing.NewPatchSubresourceAction(ingressesResource, c.ns, name, data, subresources...), &v1beta1.Ingress{}) if obj == nil { return nil, err diff --git a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_podsecuritypolicy.go b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_podsecuritypolicy.go index 38bc128468e..d277e78f155 100644 --- a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_podsecuritypolicy.go +++ b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_podsecuritypolicy.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakePodSecurityPolicies implements PodSecurityPolicyInterface @@ -35,7 +35,7 @@ var podsecuritypoliciesResource = schema.GroupVersionResource{Group: "extensions func (c *FakePodSecurityPolicies) Create(podSecurityPolicy *v1beta1.PodSecurityPolicy) (result *v1beta1.PodSecurityPolicy, err error) { obj, err := c.Fake. - Invokes(core.NewRootCreateAction(podsecuritypoliciesResource, podSecurityPolicy), &v1beta1.PodSecurityPolicy{}) + Invokes(testing.NewRootCreateAction(podsecuritypoliciesResource, podSecurityPolicy), &v1beta1.PodSecurityPolicy{}) if obj == nil { return nil, err } @@ -44,7 +44,7 @@ func (c *FakePodSecurityPolicies) Create(podSecurityPolicy *v1beta1.PodSecurityP func (c *FakePodSecurityPolicies) Update(podSecurityPolicy *v1beta1.PodSecurityPolicy) (result *v1beta1.PodSecurityPolicy, err error) { obj, err := c.Fake. - Invokes(core.NewRootUpdateAction(podsecuritypoliciesResource, podSecurityPolicy), &v1beta1.PodSecurityPolicy{}) + Invokes(testing.NewRootUpdateAction(podsecuritypoliciesResource, podSecurityPolicy), &v1beta1.PodSecurityPolicy{}) if obj == nil { return nil, err } @@ -53,12 +53,12 @@ func (c *FakePodSecurityPolicies) Update(podSecurityPolicy *v1beta1.PodSecurityP func (c *FakePodSecurityPolicies) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewRootDeleteAction(podsecuritypoliciesResource, name), &v1beta1.PodSecurityPolicy{}) + Invokes(testing.NewRootDeleteAction(podsecuritypoliciesResource, name), &v1beta1.PodSecurityPolicy{}) return err } func (c *FakePodSecurityPolicies) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := core.NewRootDeleteCollectionAction(podsecuritypoliciesResource, listOptions) + action := testing.NewRootDeleteCollectionAction(podsecuritypoliciesResource, listOptions) _, err := c.Fake.Invokes(action, &v1beta1.PodSecurityPolicyList{}) return err @@ -66,7 +66,7 @@ func (c *FakePodSecurityPolicies) DeleteCollection(options *v1.DeleteOptions, li func (c *FakePodSecurityPolicies) Get(name string, options v1.GetOptions) (result *v1beta1.PodSecurityPolicy, err error) { obj, err := c.Fake. - Invokes(core.NewRootGetAction(podsecuritypoliciesResource, name), &v1beta1.PodSecurityPolicy{}) + Invokes(testing.NewRootGetAction(podsecuritypoliciesResource, name), &v1beta1.PodSecurityPolicy{}) if obj == nil { return nil, err } @@ -75,12 +75,12 @@ func (c *FakePodSecurityPolicies) Get(name string, options v1.GetOptions) (resul func (c *FakePodSecurityPolicies) List(opts v1.ListOptions) (result *v1beta1.PodSecurityPolicyList, err error) { obj, err := c.Fake. - Invokes(core.NewRootListAction(podsecuritypoliciesResource, opts), &v1beta1.PodSecurityPolicyList{}) + Invokes(testing.NewRootListAction(podsecuritypoliciesResource, opts), &v1beta1.PodSecurityPolicyList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -96,13 +96,13 @@ func (c *FakePodSecurityPolicies) List(opts v1.ListOptions) (result *v1beta1.Pod // Watch returns a watch.Interface that watches the requested podSecurityPolicies. func (c *FakePodSecurityPolicies) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewRootWatchAction(podsecuritypoliciesResource, opts)) + InvokesWatch(testing.NewRootWatchAction(podsecuritypoliciesResource, opts)) } // Patch applies the patch and returns the patched podSecurityPolicy. func (c *FakePodSecurityPolicies) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.PodSecurityPolicy, err error) { obj, err := c.Fake. - Invokes(core.NewRootPatchSubresourceAction(podsecuritypoliciesResource, name, data, subresources...), &v1beta1.PodSecurityPolicy{}) + Invokes(testing.NewRootPatchSubresourceAction(podsecuritypoliciesResource, name, data, subresources...), &v1beta1.PodSecurityPolicy{}) if obj == nil { return nil, err } diff --git a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_replicaset.go b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_replicaset.go index 3835577b529..58281306cdb 100644 --- a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_replicaset.go +++ b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_replicaset.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeReplicaSets implements ReplicaSetInterface @@ -36,7 +36,7 @@ var replicasetsResource = schema.GroupVersionResource{Group: "extensions", Versi func (c *FakeReplicaSets) Create(replicaSet *v1beta1.ReplicaSet) (result *v1beta1.ReplicaSet, err error) { obj, err := c.Fake. - Invokes(core.NewCreateAction(replicasetsResource, c.ns, replicaSet), &v1beta1.ReplicaSet{}) + Invokes(testing.NewCreateAction(replicasetsResource, c.ns, replicaSet), &v1beta1.ReplicaSet{}) if obj == nil { return nil, err @@ -46,7 +46,7 @@ func (c *FakeReplicaSets) Create(replicaSet *v1beta1.ReplicaSet) (result *v1beta func (c *FakeReplicaSets) Update(replicaSet *v1beta1.ReplicaSet) (result *v1beta1.ReplicaSet, err error) { obj, err := c.Fake. - Invokes(core.NewUpdateAction(replicasetsResource, c.ns, replicaSet), &v1beta1.ReplicaSet{}) + Invokes(testing.NewUpdateAction(replicasetsResource, c.ns, replicaSet), &v1beta1.ReplicaSet{}) if obj == nil { return nil, err @@ -56,7 +56,7 @@ func (c *FakeReplicaSets) Update(replicaSet *v1beta1.ReplicaSet) (result *v1beta func (c *FakeReplicaSets) UpdateStatus(replicaSet *v1beta1.ReplicaSet) (*v1beta1.ReplicaSet, error) { obj, err := c.Fake. - Invokes(core.NewUpdateSubresourceAction(replicasetsResource, "status", c.ns, replicaSet), &v1beta1.ReplicaSet{}) + Invokes(testing.NewUpdateSubresourceAction(replicasetsResource, "status", c.ns, replicaSet), &v1beta1.ReplicaSet{}) if obj == nil { return nil, err @@ -66,13 +66,13 @@ func (c *FakeReplicaSets) UpdateStatus(replicaSet *v1beta1.ReplicaSet) (*v1beta1 func (c *FakeReplicaSets) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewDeleteAction(replicasetsResource, c.ns, name), &v1beta1.ReplicaSet{}) + Invokes(testing.NewDeleteAction(replicasetsResource, c.ns, name), &v1beta1.ReplicaSet{}) return err } func (c *FakeReplicaSets) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := core.NewDeleteCollectionAction(replicasetsResource, c.ns, listOptions) + action := testing.NewDeleteCollectionAction(replicasetsResource, c.ns, listOptions) _, err := c.Fake.Invokes(action, &v1beta1.ReplicaSetList{}) return err @@ -80,7 +80,7 @@ func (c *FakeReplicaSets) DeleteCollection(options *v1.DeleteOptions, listOption func (c *FakeReplicaSets) Get(name string, options v1.GetOptions) (result *v1beta1.ReplicaSet, err error) { obj, err := c.Fake. - Invokes(core.NewGetAction(replicasetsResource, c.ns, name), &v1beta1.ReplicaSet{}) + Invokes(testing.NewGetAction(replicasetsResource, c.ns, name), &v1beta1.ReplicaSet{}) if obj == nil { return nil, err @@ -90,13 +90,13 @@ func (c *FakeReplicaSets) Get(name string, options v1.GetOptions) (result *v1bet func (c *FakeReplicaSets) List(opts v1.ListOptions) (result *v1beta1.ReplicaSetList, err error) { obj, err := c.Fake. - Invokes(core.NewListAction(replicasetsResource, c.ns, opts), &v1beta1.ReplicaSetList{}) + Invokes(testing.NewListAction(replicasetsResource, c.ns, opts), &v1beta1.ReplicaSetList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -112,14 +112,14 @@ func (c *FakeReplicaSets) List(opts v1.ListOptions) (result *v1beta1.ReplicaSetL // Watch returns a watch.Interface that watches the requested replicaSets. func (c *FakeReplicaSets) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewWatchAction(replicasetsResource, c.ns, opts)) + InvokesWatch(testing.NewWatchAction(replicasetsResource, c.ns, opts)) } // Patch applies the patch and returns the patched replicaSet. func (c *FakeReplicaSets) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.ReplicaSet, err error) { obj, err := c.Fake. - Invokes(core.NewPatchSubresourceAction(replicasetsResource, c.ns, name, data, subresources...), &v1beta1.ReplicaSet{}) + Invokes(testing.NewPatchSubresourceAction(replicasetsResource, c.ns, name, data, subresources...), &v1beta1.ReplicaSet{}) if obj == nil { return nil, err diff --git a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_scale_expansion.go b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_scale_expansion.go index 056e0d30ff8..a05f6353fda 100644 --- a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_scale_expansion.go +++ b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_scale_expansion.go @@ -18,8 +18,8 @@ package fake import ( "k8s.io/apimachinery/pkg/runtime/schema" + core "k8s.io/client-go/testing" "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" - "k8s.io/kubernetes/pkg/client/testing/core" ) func (c *FakeScales) Get(kind string, name string) (result *v1beta1.Scale, err error) { diff --git a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_thirdpartyresource.go b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_thirdpartyresource.go index 119baf8ab89..0dc7e9e3ba9 100644 --- a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_thirdpartyresource.go +++ b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_thirdpartyresource.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeThirdPartyResources implements ThirdPartyResourceInterface @@ -35,7 +35,7 @@ var thirdpartyresourcesResource = schema.GroupVersionResource{Group: "extensions func (c *FakeThirdPartyResources) Create(thirdPartyResource *v1beta1.ThirdPartyResource) (result *v1beta1.ThirdPartyResource, err error) { obj, err := c.Fake. - Invokes(core.NewRootCreateAction(thirdpartyresourcesResource, thirdPartyResource), &v1beta1.ThirdPartyResource{}) + Invokes(testing.NewRootCreateAction(thirdpartyresourcesResource, thirdPartyResource), &v1beta1.ThirdPartyResource{}) if obj == nil { return nil, err } @@ -44,7 +44,7 @@ func (c *FakeThirdPartyResources) Create(thirdPartyResource *v1beta1.ThirdPartyR func (c *FakeThirdPartyResources) Update(thirdPartyResource *v1beta1.ThirdPartyResource) (result *v1beta1.ThirdPartyResource, err error) { obj, err := c.Fake. - Invokes(core.NewRootUpdateAction(thirdpartyresourcesResource, thirdPartyResource), &v1beta1.ThirdPartyResource{}) + Invokes(testing.NewRootUpdateAction(thirdpartyresourcesResource, thirdPartyResource), &v1beta1.ThirdPartyResource{}) if obj == nil { return nil, err } @@ -53,12 +53,12 @@ func (c *FakeThirdPartyResources) Update(thirdPartyResource *v1beta1.ThirdPartyR func (c *FakeThirdPartyResources) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewRootDeleteAction(thirdpartyresourcesResource, name), &v1beta1.ThirdPartyResource{}) + Invokes(testing.NewRootDeleteAction(thirdpartyresourcesResource, name), &v1beta1.ThirdPartyResource{}) return err } func (c *FakeThirdPartyResources) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := core.NewRootDeleteCollectionAction(thirdpartyresourcesResource, listOptions) + action := testing.NewRootDeleteCollectionAction(thirdpartyresourcesResource, listOptions) _, err := c.Fake.Invokes(action, &v1beta1.ThirdPartyResourceList{}) return err @@ -66,7 +66,7 @@ func (c *FakeThirdPartyResources) DeleteCollection(options *v1.DeleteOptions, li func (c *FakeThirdPartyResources) Get(name string, options v1.GetOptions) (result *v1beta1.ThirdPartyResource, err error) { obj, err := c.Fake. - Invokes(core.NewRootGetAction(thirdpartyresourcesResource, name), &v1beta1.ThirdPartyResource{}) + Invokes(testing.NewRootGetAction(thirdpartyresourcesResource, name), &v1beta1.ThirdPartyResource{}) if obj == nil { return nil, err } @@ -75,12 +75,12 @@ func (c *FakeThirdPartyResources) Get(name string, options v1.GetOptions) (resul func (c *FakeThirdPartyResources) List(opts v1.ListOptions) (result *v1beta1.ThirdPartyResourceList, err error) { obj, err := c.Fake. - Invokes(core.NewRootListAction(thirdpartyresourcesResource, opts), &v1beta1.ThirdPartyResourceList{}) + Invokes(testing.NewRootListAction(thirdpartyresourcesResource, opts), &v1beta1.ThirdPartyResourceList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -96,13 +96,13 @@ func (c *FakeThirdPartyResources) List(opts v1.ListOptions) (result *v1beta1.Thi // Watch returns a watch.Interface that watches the requested thirdPartyResources. func (c *FakeThirdPartyResources) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewRootWatchAction(thirdpartyresourcesResource, opts)) + InvokesWatch(testing.NewRootWatchAction(thirdpartyresourcesResource, opts)) } // Patch applies the patch and returns the patched thirdPartyResource. func (c *FakeThirdPartyResources) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.ThirdPartyResource, err error) { obj, err := c.Fake. - Invokes(core.NewRootPatchSubresourceAction(thirdpartyresourcesResource, name, data, subresources...), &v1beta1.ThirdPartyResource{}) + Invokes(testing.NewRootPatchSubresourceAction(thirdpartyresourcesResource, name, data, subresources...), &v1beta1.ThirdPartyResource{}) if obj == nil { return nil, err } diff --git a/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/fake/BUILD b/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/fake/BUILD index eae1bdb06bd..22f3f1da7a1 100644 --- a/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/fake/BUILD +++ b/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/fake/BUILD @@ -20,13 +20,13 @@ go_library( deps = [ "//pkg/apis/policy/v1beta1:go_default_library", "//pkg/client/clientset_generated/clientset/typed/policy/v1beta1:go_default_library", - "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/testing", ], ) diff --git a/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/fake/fake_eviction_expansion.go b/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/fake/fake_eviction_expansion.go index 7cf723417e4..3061efe4704 100644 --- a/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/fake/fake_eviction_expansion.go +++ b/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/fake/fake_eviction_expansion.go @@ -18,8 +18,8 @@ package fake import ( "k8s.io/apimachinery/pkg/runtime/schema" + core "k8s.io/client-go/testing" policy "k8s.io/kubernetes/pkg/apis/policy/v1beta1" - core "k8s.io/kubernetes/pkg/client/testing/core" ) func (c *FakeEvictions) Evict(eviction *policy.Eviction) error { diff --git a/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/fake/fake_poddisruptionbudget.go b/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/fake/fake_poddisruptionbudget.go index b308ad95b56..c81478c2220 100644 --- a/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/fake/fake_poddisruptionbudget.go +++ b/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/fake/fake_poddisruptionbudget.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" v1beta1 "k8s.io/kubernetes/pkg/apis/policy/v1beta1" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakePodDisruptionBudgets implements PodDisruptionBudgetInterface @@ -36,7 +36,7 @@ var poddisruptionbudgetsResource = schema.GroupVersionResource{Group: "policy", func (c *FakePodDisruptionBudgets) Create(podDisruptionBudget *v1beta1.PodDisruptionBudget) (result *v1beta1.PodDisruptionBudget, err error) { obj, err := c.Fake. - Invokes(core.NewCreateAction(poddisruptionbudgetsResource, c.ns, podDisruptionBudget), &v1beta1.PodDisruptionBudget{}) + Invokes(testing.NewCreateAction(poddisruptionbudgetsResource, c.ns, podDisruptionBudget), &v1beta1.PodDisruptionBudget{}) if obj == nil { return nil, err @@ -46,7 +46,7 @@ func (c *FakePodDisruptionBudgets) Create(podDisruptionBudget *v1beta1.PodDisrup func (c *FakePodDisruptionBudgets) Update(podDisruptionBudget *v1beta1.PodDisruptionBudget) (result *v1beta1.PodDisruptionBudget, err error) { obj, err := c.Fake. - Invokes(core.NewUpdateAction(poddisruptionbudgetsResource, c.ns, podDisruptionBudget), &v1beta1.PodDisruptionBudget{}) + Invokes(testing.NewUpdateAction(poddisruptionbudgetsResource, c.ns, podDisruptionBudget), &v1beta1.PodDisruptionBudget{}) if obj == nil { return nil, err @@ -56,7 +56,7 @@ func (c *FakePodDisruptionBudgets) Update(podDisruptionBudget *v1beta1.PodDisrup func (c *FakePodDisruptionBudgets) UpdateStatus(podDisruptionBudget *v1beta1.PodDisruptionBudget) (*v1beta1.PodDisruptionBudget, error) { obj, err := c.Fake. - Invokes(core.NewUpdateSubresourceAction(poddisruptionbudgetsResource, "status", c.ns, podDisruptionBudget), &v1beta1.PodDisruptionBudget{}) + Invokes(testing.NewUpdateSubresourceAction(poddisruptionbudgetsResource, "status", c.ns, podDisruptionBudget), &v1beta1.PodDisruptionBudget{}) if obj == nil { return nil, err @@ -66,13 +66,13 @@ func (c *FakePodDisruptionBudgets) UpdateStatus(podDisruptionBudget *v1beta1.Pod func (c *FakePodDisruptionBudgets) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewDeleteAction(poddisruptionbudgetsResource, c.ns, name), &v1beta1.PodDisruptionBudget{}) + Invokes(testing.NewDeleteAction(poddisruptionbudgetsResource, c.ns, name), &v1beta1.PodDisruptionBudget{}) return err } func (c *FakePodDisruptionBudgets) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := core.NewDeleteCollectionAction(poddisruptionbudgetsResource, c.ns, listOptions) + action := testing.NewDeleteCollectionAction(poddisruptionbudgetsResource, c.ns, listOptions) _, err := c.Fake.Invokes(action, &v1beta1.PodDisruptionBudgetList{}) return err @@ -80,7 +80,7 @@ func (c *FakePodDisruptionBudgets) DeleteCollection(options *v1.DeleteOptions, l func (c *FakePodDisruptionBudgets) Get(name string, options v1.GetOptions) (result *v1beta1.PodDisruptionBudget, err error) { obj, err := c.Fake. - Invokes(core.NewGetAction(poddisruptionbudgetsResource, c.ns, name), &v1beta1.PodDisruptionBudget{}) + Invokes(testing.NewGetAction(poddisruptionbudgetsResource, c.ns, name), &v1beta1.PodDisruptionBudget{}) if obj == nil { return nil, err @@ -90,13 +90,13 @@ func (c *FakePodDisruptionBudgets) Get(name string, options v1.GetOptions) (resu func (c *FakePodDisruptionBudgets) List(opts v1.ListOptions) (result *v1beta1.PodDisruptionBudgetList, err error) { obj, err := c.Fake. - Invokes(core.NewListAction(poddisruptionbudgetsResource, c.ns, opts), &v1beta1.PodDisruptionBudgetList{}) + Invokes(testing.NewListAction(poddisruptionbudgetsResource, c.ns, opts), &v1beta1.PodDisruptionBudgetList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -112,14 +112,14 @@ func (c *FakePodDisruptionBudgets) List(opts v1.ListOptions) (result *v1beta1.Po // Watch returns a watch.Interface that watches the requested podDisruptionBudgets. func (c *FakePodDisruptionBudgets) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewWatchAction(poddisruptionbudgetsResource, c.ns, opts)) + InvokesWatch(testing.NewWatchAction(poddisruptionbudgetsResource, c.ns, opts)) } // Patch applies the patch and returns the patched podDisruptionBudget. func (c *FakePodDisruptionBudgets) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.PodDisruptionBudget, err error) { obj, err := c.Fake. - Invokes(core.NewPatchSubresourceAction(poddisruptionbudgetsResource, c.ns, name, data, subresources...), &v1beta1.PodDisruptionBudget{}) + Invokes(testing.NewPatchSubresourceAction(poddisruptionbudgetsResource, c.ns, name, data, subresources...), &v1beta1.PodDisruptionBudget{}) if obj == nil { return nil, err diff --git a/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/fake/fake_policy_client.go b/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/fake/fake_policy_client.go index d25b1753b19..5f441084eb4 100644 --- a/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/fake/fake_policy_client.go +++ b/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/fake/fake_policy_client.go @@ -18,12 +18,12 @@ package fake import ( rest "k8s.io/client-go/rest" + testing "k8s.io/client-go/testing" v1beta1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/policy/v1beta1" - core "k8s.io/kubernetes/pkg/client/testing/core" ) type FakePolicyV1beta1 struct { - *core.Fake + *testing.Fake } func (c *FakePolicyV1beta1) Evictions(namespace string) v1beta1.EvictionInterface { diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/fake/BUILD b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/fake/BUILD index b4b3dd96ff1..13c215b6bfb 100644 --- a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/fake/BUILD +++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/fake/BUILD @@ -21,13 +21,13 @@ go_library( deps = [ "//pkg/apis/rbac/v1alpha1:go_default_library", "//pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1:go_default_library", - "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/testing", ], ) diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/fake/fake_clusterrole.go b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/fake/fake_clusterrole.go index b73cb1da537..9de9e2f94a6 100644 --- a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/fake/fake_clusterrole.go +++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/fake/fake_clusterrole.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" v1alpha1 "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeClusterRoles implements ClusterRoleInterface @@ -35,7 +35,7 @@ var clusterrolesResource = schema.GroupVersionResource{Group: "rbac.authorizatio func (c *FakeClusterRoles) Create(clusterRole *v1alpha1.ClusterRole) (result *v1alpha1.ClusterRole, err error) { obj, err := c.Fake. - Invokes(core.NewRootCreateAction(clusterrolesResource, clusterRole), &v1alpha1.ClusterRole{}) + Invokes(testing.NewRootCreateAction(clusterrolesResource, clusterRole), &v1alpha1.ClusterRole{}) if obj == nil { return nil, err } @@ -44,7 +44,7 @@ func (c *FakeClusterRoles) Create(clusterRole *v1alpha1.ClusterRole) (result *v1 func (c *FakeClusterRoles) Update(clusterRole *v1alpha1.ClusterRole) (result *v1alpha1.ClusterRole, err error) { obj, err := c.Fake. - Invokes(core.NewRootUpdateAction(clusterrolesResource, clusterRole), &v1alpha1.ClusterRole{}) + Invokes(testing.NewRootUpdateAction(clusterrolesResource, clusterRole), &v1alpha1.ClusterRole{}) if obj == nil { return nil, err } @@ -53,12 +53,12 @@ func (c *FakeClusterRoles) Update(clusterRole *v1alpha1.ClusterRole) (result *v1 func (c *FakeClusterRoles) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewRootDeleteAction(clusterrolesResource, name), &v1alpha1.ClusterRole{}) + Invokes(testing.NewRootDeleteAction(clusterrolesResource, name), &v1alpha1.ClusterRole{}) return err } func (c *FakeClusterRoles) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := core.NewRootDeleteCollectionAction(clusterrolesResource, listOptions) + action := testing.NewRootDeleteCollectionAction(clusterrolesResource, listOptions) _, err := c.Fake.Invokes(action, &v1alpha1.ClusterRoleList{}) return err @@ -66,7 +66,7 @@ func (c *FakeClusterRoles) DeleteCollection(options *v1.DeleteOptions, listOptio func (c *FakeClusterRoles) Get(name string, options v1.GetOptions) (result *v1alpha1.ClusterRole, err error) { obj, err := c.Fake. - Invokes(core.NewRootGetAction(clusterrolesResource, name), &v1alpha1.ClusterRole{}) + Invokes(testing.NewRootGetAction(clusterrolesResource, name), &v1alpha1.ClusterRole{}) if obj == nil { return nil, err } @@ -75,12 +75,12 @@ func (c *FakeClusterRoles) Get(name string, options v1.GetOptions) (result *v1al func (c *FakeClusterRoles) List(opts v1.ListOptions) (result *v1alpha1.ClusterRoleList, err error) { obj, err := c.Fake. - Invokes(core.NewRootListAction(clusterrolesResource, opts), &v1alpha1.ClusterRoleList{}) + Invokes(testing.NewRootListAction(clusterrolesResource, opts), &v1alpha1.ClusterRoleList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -96,13 +96,13 @@ func (c *FakeClusterRoles) List(opts v1.ListOptions) (result *v1alpha1.ClusterRo // Watch returns a watch.Interface that watches the requested clusterRoles. func (c *FakeClusterRoles) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewRootWatchAction(clusterrolesResource, opts)) + InvokesWatch(testing.NewRootWatchAction(clusterrolesResource, opts)) } // Patch applies the patch and returns the patched clusterRole. func (c *FakeClusterRoles) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1alpha1.ClusterRole, err error) { obj, err := c.Fake. - Invokes(core.NewRootPatchSubresourceAction(clusterrolesResource, name, data, subresources...), &v1alpha1.ClusterRole{}) + Invokes(testing.NewRootPatchSubresourceAction(clusterrolesResource, name, data, subresources...), &v1alpha1.ClusterRole{}) if obj == nil { return nil, err } diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/fake/fake_clusterrolebinding.go b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/fake/fake_clusterrolebinding.go index 3d319a7b1dc..ac8960c125e 100644 --- a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/fake/fake_clusterrolebinding.go +++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/fake/fake_clusterrolebinding.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" v1alpha1 "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeClusterRoleBindings implements ClusterRoleBindingInterface @@ -35,7 +35,7 @@ var clusterrolebindingsResource = schema.GroupVersionResource{Group: "rbac.autho func (c *FakeClusterRoleBindings) Create(clusterRoleBinding *v1alpha1.ClusterRoleBinding) (result *v1alpha1.ClusterRoleBinding, err error) { obj, err := c.Fake. - Invokes(core.NewRootCreateAction(clusterrolebindingsResource, clusterRoleBinding), &v1alpha1.ClusterRoleBinding{}) + Invokes(testing.NewRootCreateAction(clusterrolebindingsResource, clusterRoleBinding), &v1alpha1.ClusterRoleBinding{}) if obj == nil { return nil, err } @@ -44,7 +44,7 @@ func (c *FakeClusterRoleBindings) Create(clusterRoleBinding *v1alpha1.ClusterRol func (c *FakeClusterRoleBindings) Update(clusterRoleBinding *v1alpha1.ClusterRoleBinding) (result *v1alpha1.ClusterRoleBinding, err error) { obj, err := c.Fake. - Invokes(core.NewRootUpdateAction(clusterrolebindingsResource, clusterRoleBinding), &v1alpha1.ClusterRoleBinding{}) + Invokes(testing.NewRootUpdateAction(clusterrolebindingsResource, clusterRoleBinding), &v1alpha1.ClusterRoleBinding{}) if obj == nil { return nil, err } @@ -53,12 +53,12 @@ func (c *FakeClusterRoleBindings) Update(clusterRoleBinding *v1alpha1.ClusterRol func (c *FakeClusterRoleBindings) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewRootDeleteAction(clusterrolebindingsResource, name), &v1alpha1.ClusterRoleBinding{}) + Invokes(testing.NewRootDeleteAction(clusterrolebindingsResource, name), &v1alpha1.ClusterRoleBinding{}) return err } func (c *FakeClusterRoleBindings) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := core.NewRootDeleteCollectionAction(clusterrolebindingsResource, listOptions) + action := testing.NewRootDeleteCollectionAction(clusterrolebindingsResource, listOptions) _, err := c.Fake.Invokes(action, &v1alpha1.ClusterRoleBindingList{}) return err @@ -66,7 +66,7 @@ func (c *FakeClusterRoleBindings) DeleteCollection(options *v1.DeleteOptions, li func (c *FakeClusterRoleBindings) Get(name string, options v1.GetOptions) (result *v1alpha1.ClusterRoleBinding, err error) { obj, err := c.Fake. - Invokes(core.NewRootGetAction(clusterrolebindingsResource, name), &v1alpha1.ClusterRoleBinding{}) + Invokes(testing.NewRootGetAction(clusterrolebindingsResource, name), &v1alpha1.ClusterRoleBinding{}) if obj == nil { return nil, err } @@ -75,12 +75,12 @@ func (c *FakeClusterRoleBindings) Get(name string, options v1.GetOptions) (resul func (c *FakeClusterRoleBindings) List(opts v1.ListOptions) (result *v1alpha1.ClusterRoleBindingList, err error) { obj, err := c.Fake. - Invokes(core.NewRootListAction(clusterrolebindingsResource, opts), &v1alpha1.ClusterRoleBindingList{}) + Invokes(testing.NewRootListAction(clusterrolebindingsResource, opts), &v1alpha1.ClusterRoleBindingList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -96,13 +96,13 @@ func (c *FakeClusterRoleBindings) List(opts v1.ListOptions) (result *v1alpha1.Cl // Watch returns a watch.Interface that watches the requested clusterRoleBindings. func (c *FakeClusterRoleBindings) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewRootWatchAction(clusterrolebindingsResource, opts)) + InvokesWatch(testing.NewRootWatchAction(clusterrolebindingsResource, opts)) } // Patch applies the patch and returns the patched clusterRoleBinding. func (c *FakeClusterRoleBindings) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1alpha1.ClusterRoleBinding, err error) { obj, err := c.Fake. - Invokes(core.NewRootPatchSubresourceAction(clusterrolebindingsResource, name, data, subresources...), &v1alpha1.ClusterRoleBinding{}) + Invokes(testing.NewRootPatchSubresourceAction(clusterrolebindingsResource, name, data, subresources...), &v1alpha1.ClusterRoleBinding{}) if obj == nil { return nil, err } diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/fake/fake_rbac_client.go b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/fake/fake_rbac_client.go index 5216e04bbd3..78bbffb2d1d 100644 --- a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/fake/fake_rbac_client.go +++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/fake/fake_rbac_client.go @@ -18,12 +18,12 @@ package fake import ( rest "k8s.io/client-go/rest" + testing "k8s.io/client-go/testing" v1alpha1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1" - core "k8s.io/kubernetes/pkg/client/testing/core" ) type FakeRbacV1alpha1 struct { - *core.Fake + *testing.Fake } func (c *FakeRbacV1alpha1) ClusterRoles() v1alpha1.ClusterRoleInterface { diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/fake/fake_role.go b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/fake/fake_role.go index e20405b1d0b..49e1f7b27d7 100644 --- a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/fake/fake_role.go +++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/fake/fake_role.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" v1alpha1 "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeRoles implements RoleInterface @@ -36,7 +36,7 @@ var rolesResource = schema.GroupVersionResource{Group: "rbac.authorization.k8s.i func (c *FakeRoles) Create(role *v1alpha1.Role) (result *v1alpha1.Role, err error) { obj, err := c.Fake. - Invokes(core.NewCreateAction(rolesResource, c.ns, role), &v1alpha1.Role{}) + Invokes(testing.NewCreateAction(rolesResource, c.ns, role), &v1alpha1.Role{}) if obj == nil { return nil, err @@ -46,7 +46,7 @@ func (c *FakeRoles) Create(role *v1alpha1.Role) (result *v1alpha1.Role, err erro func (c *FakeRoles) Update(role *v1alpha1.Role) (result *v1alpha1.Role, err error) { obj, err := c.Fake. - Invokes(core.NewUpdateAction(rolesResource, c.ns, role), &v1alpha1.Role{}) + Invokes(testing.NewUpdateAction(rolesResource, c.ns, role), &v1alpha1.Role{}) if obj == nil { return nil, err @@ -56,13 +56,13 @@ func (c *FakeRoles) Update(role *v1alpha1.Role) (result *v1alpha1.Role, err erro func (c *FakeRoles) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewDeleteAction(rolesResource, c.ns, name), &v1alpha1.Role{}) + Invokes(testing.NewDeleteAction(rolesResource, c.ns, name), &v1alpha1.Role{}) return err } func (c *FakeRoles) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := core.NewDeleteCollectionAction(rolesResource, c.ns, listOptions) + action := testing.NewDeleteCollectionAction(rolesResource, c.ns, listOptions) _, err := c.Fake.Invokes(action, &v1alpha1.RoleList{}) return err @@ -70,7 +70,7 @@ func (c *FakeRoles) DeleteCollection(options *v1.DeleteOptions, listOptions v1.L func (c *FakeRoles) Get(name string, options v1.GetOptions) (result *v1alpha1.Role, err error) { obj, err := c.Fake. - Invokes(core.NewGetAction(rolesResource, c.ns, name), &v1alpha1.Role{}) + Invokes(testing.NewGetAction(rolesResource, c.ns, name), &v1alpha1.Role{}) if obj == nil { return nil, err @@ -80,13 +80,13 @@ func (c *FakeRoles) Get(name string, options v1.GetOptions) (result *v1alpha1.Ro func (c *FakeRoles) List(opts v1.ListOptions) (result *v1alpha1.RoleList, err error) { obj, err := c.Fake. - Invokes(core.NewListAction(rolesResource, c.ns, opts), &v1alpha1.RoleList{}) + Invokes(testing.NewListAction(rolesResource, c.ns, opts), &v1alpha1.RoleList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -102,14 +102,14 @@ func (c *FakeRoles) List(opts v1.ListOptions) (result *v1alpha1.RoleList, err er // Watch returns a watch.Interface that watches the requested roles. func (c *FakeRoles) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewWatchAction(rolesResource, c.ns, opts)) + InvokesWatch(testing.NewWatchAction(rolesResource, c.ns, opts)) } // Patch applies the patch and returns the patched role. func (c *FakeRoles) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1alpha1.Role, err error) { obj, err := c.Fake. - Invokes(core.NewPatchSubresourceAction(rolesResource, c.ns, name, data, subresources...), &v1alpha1.Role{}) + Invokes(testing.NewPatchSubresourceAction(rolesResource, c.ns, name, data, subresources...), &v1alpha1.Role{}) if obj == nil { return nil, err diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/fake/fake_rolebinding.go b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/fake/fake_rolebinding.go index 3221d9bd67b..2ab2267bf08 100644 --- a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/fake/fake_rolebinding.go +++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/fake/fake_rolebinding.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" v1alpha1 "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeRoleBindings implements RoleBindingInterface @@ -36,7 +36,7 @@ var rolebindingsResource = schema.GroupVersionResource{Group: "rbac.authorizatio func (c *FakeRoleBindings) Create(roleBinding *v1alpha1.RoleBinding) (result *v1alpha1.RoleBinding, err error) { obj, err := c.Fake. - Invokes(core.NewCreateAction(rolebindingsResource, c.ns, roleBinding), &v1alpha1.RoleBinding{}) + Invokes(testing.NewCreateAction(rolebindingsResource, c.ns, roleBinding), &v1alpha1.RoleBinding{}) if obj == nil { return nil, err @@ -46,7 +46,7 @@ func (c *FakeRoleBindings) Create(roleBinding *v1alpha1.RoleBinding) (result *v1 func (c *FakeRoleBindings) Update(roleBinding *v1alpha1.RoleBinding) (result *v1alpha1.RoleBinding, err error) { obj, err := c.Fake. - Invokes(core.NewUpdateAction(rolebindingsResource, c.ns, roleBinding), &v1alpha1.RoleBinding{}) + Invokes(testing.NewUpdateAction(rolebindingsResource, c.ns, roleBinding), &v1alpha1.RoleBinding{}) if obj == nil { return nil, err @@ -56,13 +56,13 @@ func (c *FakeRoleBindings) Update(roleBinding *v1alpha1.RoleBinding) (result *v1 func (c *FakeRoleBindings) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewDeleteAction(rolebindingsResource, c.ns, name), &v1alpha1.RoleBinding{}) + Invokes(testing.NewDeleteAction(rolebindingsResource, c.ns, name), &v1alpha1.RoleBinding{}) return err } func (c *FakeRoleBindings) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := core.NewDeleteCollectionAction(rolebindingsResource, c.ns, listOptions) + action := testing.NewDeleteCollectionAction(rolebindingsResource, c.ns, listOptions) _, err := c.Fake.Invokes(action, &v1alpha1.RoleBindingList{}) return err @@ -70,7 +70,7 @@ func (c *FakeRoleBindings) DeleteCollection(options *v1.DeleteOptions, listOptio func (c *FakeRoleBindings) Get(name string, options v1.GetOptions) (result *v1alpha1.RoleBinding, err error) { obj, err := c.Fake. - Invokes(core.NewGetAction(rolebindingsResource, c.ns, name), &v1alpha1.RoleBinding{}) + Invokes(testing.NewGetAction(rolebindingsResource, c.ns, name), &v1alpha1.RoleBinding{}) if obj == nil { return nil, err @@ -80,13 +80,13 @@ func (c *FakeRoleBindings) Get(name string, options v1.GetOptions) (result *v1al func (c *FakeRoleBindings) List(opts v1.ListOptions) (result *v1alpha1.RoleBindingList, err error) { obj, err := c.Fake. - Invokes(core.NewListAction(rolebindingsResource, c.ns, opts), &v1alpha1.RoleBindingList{}) + Invokes(testing.NewListAction(rolebindingsResource, c.ns, opts), &v1alpha1.RoleBindingList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -102,14 +102,14 @@ func (c *FakeRoleBindings) List(opts v1.ListOptions) (result *v1alpha1.RoleBindi // Watch returns a watch.Interface that watches the requested roleBindings. func (c *FakeRoleBindings) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewWatchAction(rolebindingsResource, c.ns, opts)) + InvokesWatch(testing.NewWatchAction(rolebindingsResource, c.ns, opts)) } // Patch applies the patch and returns the patched roleBinding. func (c *FakeRoleBindings) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1alpha1.RoleBinding, err error) { obj, err := c.Fake. - Invokes(core.NewPatchSubresourceAction(rolebindingsResource, c.ns, name, data, subresources...), &v1alpha1.RoleBinding{}) + Invokes(testing.NewPatchSubresourceAction(rolebindingsResource, c.ns, name, data, subresources...), &v1alpha1.RoleBinding{}) if obj == nil { return nil, err diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/fake/BUILD b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/fake/BUILD index 578f2389f9c..2471b8649fc 100644 --- a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/fake/BUILD +++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/fake/BUILD @@ -21,13 +21,13 @@ go_library( deps = [ "//pkg/apis/rbac/v1beta1:go_default_library", "//pkg/client/clientset_generated/clientset/typed/rbac/v1beta1:go_default_library", - "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/testing", ], ) diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/fake/fake_clusterrole.go b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/fake/fake_clusterrole.go index b2e2e4e4ec9..d983e993e03 100644 --- a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/fake/fake_clusterrole.go +++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/fake/fake_clusterrole.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" v1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeClusterRoles implements ClusterRoleInterface @@ -35,7 +35,7 @@ var clusterrolesResource = schema.GroupVersionResource{Group: "rbac.authorizatio func (c *FakeClusterRoles) Create(clusterRole *v1beta1.ClusterRole) (result *v1beta1.ClusterRole, err error) { obj, err := c.Fake. - Invokes(core.NewRootCreateAction(clusterrolesResource, clusterRole), &v1beta1.ClusterRole{}) + Invokes(testing.NewRootCreateAction(clusterrolesResource, clusterRole), &v1beta1.ClusterRole{}) if obj == nil { return nil, err } @@ -44,7 +44,7 @@ func (c *FakeClusterRoles) Create(clusterRole *v1beta1.ClusterRole) (result *v1b func (c *FakeClusterRoles) Update(clusterRole *v1beta1.ClusterRole) (result *v1beta1.ClusterRole, err error) { obj, err := c.Fake. - Invokes(core.NewRootUpdateAction(clusterrolesResource, clusterRole), &v1beta1.ClusterRole{}) + Invokes(testing.NewRootUpdateAction(clusterrolesResource, clusterRole), &v1beta1.ClusterRole{}) if obj == nil { return nil, err } @@ -53,12 +53,12 @@ func (c *FakeClusterRoles) Update(clusterRole *v1beta1.ClusterRole) (result *v1b func (c *FakeClusterRoles) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewRootDeleteAction(clusterrolesResource, name), &v1beta1.ClusterRole{}) + Invokes(testing.NewRootDeleteAction(clusterrolesResource, name), &v1beta1.ClusterRole{}) return err } func (c *FakeClusterRoles) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := core.NewRootDeleteCollectionAction(clusterrolesResource, listOptions) + action := testing.NewRootDeleteCollectionAction(clusterrolesResource, listOptions) _, err := c.Fake.Invokes(action, &v1beta1.ClusterRoleList{}) return err @@ -66,7 +66,7 @@ func (c *FakeClusterRoles) DeleteCollection(options *v1.DeleteOptions, listOptio func (c *FakeClusterRoles) Get(name string, options v1.GetOptions) (result *v1beta1.ClusterRole, err error) { obj, err := c.Fake. - Invokes(core.NewRootGetAction(clusterrolesResource, name), &v1beta1.ClusterRole{}) + Invokes(testing.NewRootGetAction(clusterrolesResource, name), &v1beta1.ClusterRole{}) if obj == nil { return nil, err } @@ -75,12 +75,12 @@ func (c *FakeClusterRoles) Get(name string, options v1.GetOptions) (result *v1be func (c *FakeClusterRoles) List(opts v1.ListOptions) (result *v1beta1.ClusterRoleList, err error) { obj, err := c.Fake. - Invokes(core.NewRootListAction(clusterrolesResource, opts), &v1beta1.ClusterRoleList{}) + Invokes(testing.NewRootListAction(clusterrolesResource, opts), &v1beta1.ClusterRoleList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -96,13 +96,13 @@ func (c *FakeClusterRoles) List(opts v1.ListOptions) (result *v1beta1.ClusterRol // Watch returns a watch.Interface that watches the requested clusterRoles. func (c *FakeClusterRoles) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewRootWatchAction(clusterrolesResource, opts)) + InvokesWatch(testing.NewRootWatchAction(clusterrolesResource, opts)) } // Patch applies the patch and returns the patched clusterRole. func (c *FakeClusterRoles) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.ClusterRole, err error) { obj, err := c.Fake. - Invokes(core.NewRootPatchSubresourceAction(clusterrolesResource, name, data, subresources...), &v1beta1.ClusterRole{}) + Invokes(testing.NewRootPatchSubresourceAction(clusterrolesResource, name, data, subresources...), &v1beta1.ClusterRole{}) if obj == nil { return nil, err } diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/fake/fake_clusterrolebinding.go b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/fake/fake_clusterrolebinding.go index 1c78500a399..d315620b9d7 100644 --- a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/fake/fake_clusterrolebinding.go +++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/fake/fake_clusterrolebinding.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" v1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeClusterRoleBindings implements ClusterRoleBindingInterface @@ -35,7 +35,7 @@ var clusterrolebindingsResource = schema.GroupVersionResource{Group: "rbac.autho func (c *FakeClusterRoleBindings) Create(clusterRoleBinding *v1beta1.ClusterRoleBinding) (result *v1beta1.ClusterRoleBinding, err error) { obj, err := c.Fake. - Invokes(core.NewRootCreateAction(clusterrolebindingsResource, clusterRoleBinding), &v1beta1.ClusterRoleBinding{}) + Invokes(testing.NewRootCreateAction(clusterrolebindingsResource, clusterRoleBinding), &v1beta1.ClusterRoleBinding{}) if obj == nil { return nil, err } @@ -44,7 +44,7 @@ func (c *FakeClusterRoleBindings) Create(clusterRoleBinding *v1beta1.ClusterRole func (c *FakeClusterRoleBindings) Update(clusterRoleBinding *v1beta1.ClusterRoleBinding) (result *v1beta1.ClusterRoleBinding, err error) { obj, err := c.Fake. - Invokes(core.NewRootUpdateAction(clusterrolebindingsResource, clusterRoleBinding), &v1beta1.ClusterRoleBinding{}) + Invokes(testing.NewRootUpdateAction(clusterrolebindingsResource, clusterRoleBinding), &v1beta1.ClusterRoleBinding{}) if obj == nil { return nil, err } @@ -53,12 +53,12 @@ func (c *FakeClusterRoleBindings) Update(clusterRoleBinding *v1beta1.ClusterRole func (c *FakeClusterRoleBindings) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewRootDeleteAction(clusterrolebindingsResource, name), &v1beta1.ClusterRoleBinding{}) + Invokes(testing.NewRootDeleteAction(clusterrolebindingsResource, name), &v1beta1.ClusterRoleBinding{}) return err } func (c *FakeClusterRoleBindings) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := core.NewRootDeleteCollectionAction(clusterrolebindingsResource, listOptions) + action := testing.NewRootDeleteCollectionAction(clusterrolebindingsResource, listOptions) _, err := c.Fake.Invokes(action, &v1beta1.ClusterRoleBindingList{}) return err @@ -66,7 +66,7 @@ func (c *FakeClusterRoleBindings) DeleteCollection(options *v1.DeleteOptions, li func (c *FakeClusterRoleBindings) Get(name string, options v1.GetOptions) (result *v1beta1.ClusterRoleBinding, err error) { obj, err := c.Fake. - Invokes(core.NewRootGetAction(clusterrolebindingsResource, name), &v1beta1.ClusterRoleBinding{}) + Invokes(testing.NewRootGetAction(clusterrolebindingsResource, name), &v1beta1.ClusterRoleBinding{}) if obj == nil { return nil, err } @@ -75,12 +75,12 @@ func (c *FakeClusterRoleBindings) Get(name string, options v1.GetOptions) (resul func (c *FakeClusterRoleBindings) List(opts v1.ListOptions) (result *v1beta1.ClusterRoleBindingList, err error) { obj, err := c.Fake. - Invokes(core.NewRootListAction(clusterrolebindingsResource, opts), &v1beta1.ClusterRoleBindingList{}) + Invokes(testing.NewRootListAction(clusterrolebindingsResource, opts), &v1beta1.ClusterRoleBindingList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -96,13 +96,13 @@ func (c *FakeClusterRoleBindings) List(opts v1.ListOptions) (result *v1beta1.Clu // Watch returns a watch.Interface that watches the requested clusterRoleBindings. func (c *FakeClusterRoleBindings) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewRootWatchAction(clusterrolebindingsResource, opts)) + InvokesWatch(testing.NewRootWatchAction(clusterrolebindingsResource, opts)) } // Patch applies the patch and returns the patched clusterRoleBinding. func (c *FakeClusterRoleBindings) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.ClusterRoleBinding, err error) { obj, err := c.Fake. - Invokes(core.NewRootPatchSubresourceAction(clusterrolebindingsResource, name, data, subresources...), &v1beta1.ClusterRoleBinding{}) + Invokes(testing.NewRootPatchSubresourceAction(clusterrolebindingsResource, name, data, subresources...), &v1beta1.ClusterRoleBinding{}) if obj == nil { return nil, err } diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/fake/fake_rbac_client.go b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/fake/fake_rbac_client.go index 2ce1900f6b1..04997d50859 100644 --- a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/fake/fake_rbac_client.go +++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/fake/fake_rbac_client.go @@ -18,12 +18,12 @@ package fake import ( rest "k8s.io/client-go/rest" + testing "k8s.io/client-go/testing" v1beta1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1" - core "k8s.io/kubernetes/pkg/client/testing/core" ) type FakeRbacV1beta1 struct { - *core.Fake + *testing.Fake } func (c *FakeRbacV1beta1) ClusterRoles() v1beta1.ClusterRoleInterface { diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/fake/fake_role.go b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/fake/fake_role.go index 12edda0bf23..41c9e354337 100644 --- a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/fake/fake_role.go +++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/fake/fake_role.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" v1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeRoles implements RoleInterface @@ -36,7 +36,7 @@ var rolesResource = schema.GroupVersionResource{Group: "rbac.authorization.k8s.i func (c *FakeRoles) Create(role *v1beta1.Role) (result *v1beta1.Role, err error) { obj, err := c.Fake. - Invokes(core.NewCreateAction(rolesResource, c.ns, role), &v1beta1.Role{}) + Invokes(testing.NewCreateAction(rolesResource, c.ns, role), &v1beta1.Role{}) if obj == nil { return nil, err @@ -46,7 +46,7 @@ func (c *FakeRoles) Create(role *v1beta1.Role) (result *v1beta1.Role, err error) func (c *FakeRoles) Update(role *v1beta1.Role) (result *v1beta1.Role, err error) { obj, err := c.Fake. - Invokes(core.NewUpdateAction(rolesResource, c.ns, role), &v1beta1.Role{}) + Invokes(testing.NewUpdateAction(rolesResource, c.ns, role), &v1beta1.Role{}) if obj == nil { return nil, err @@ -56,13 +56,13 @@ func (c *FakeRoles) Update(role *v1beta1.Role) (result *v1beta1.Role, err error) func (c *FakeRoles) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewDeleteAction(rolesResource, c.ns, name), &v1beta1.Role{}) + Invokes(testing.NewDeleteAction(rolesResource, c.ns, name), &v1beta1.Role{}) return err } func (c *FakeRoles) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := core.NewDeleteCollectionAction(rolesResource, c.ns, listOptions) + action := testing.NewDeleteCollectionAction(rolesResource, c.ns, listOptions) _, err := c.Fake.Invokes(action, &v1beta1.RoleList{}) return err @@ -70,7 +70,7 @@ func (c *FakeRoles) DeleteCollection(options *v1.DeleteOptions, listOptions v1.L func (c *FakeRoles) Get(name string, options v1.GetOptions) (result *v1beta1.Role, err error) { obj, err := c.Fake. - Invokes(core.NewGetAction(rolesResource, c.ns, name), &v1beta1.Role{}) + Invokes(testing.NewGetAction(rolesResource, c.ns, name), &v1beta1.Role{}) if obj == nil { return nil, err @@ -80,13 +80,13 @@ func (c *FakeRoles) Get(name string, options v1.GetOptions) (result *v1beta1.Rol func (c *FakeRoles) List(opts v1.ListOptions) (result *v1beta1.RoleList, err error) { obj, err := c.Fake. - Invokes(core.NewListAction(rolesResource, c.ns, opts), &v1beta1.RoleList{}) + Invokes(testing.NewListAction(rolesResource, c.ns, opts), &v1beta1.RoleList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -102,14 +102,14 @@ func (c *FakeRoles) List(opts v1.ListOptions) (result *v1beta1.RoleList, err err // Watch returns a watch.Interface that watches the requested roles. func (c *FakeRoles) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewWatchAction(rolesResource, c.ns, opts)) + InvokesWatch(testing.NewWatchAction(rolesResource, c.ns, opts)) } // Patch applies the patch and returns the patched role. func (c *FakeRoles) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.Role, err error) { obj, err := c.Fake. - Invokes(core.NewPatchSubresourceAction(rolesResource, c.ns, name, data, subresources...), &v1beta1.Role{}) + Invokes(testing.NewPatchSubresourceAction(rolesResource, c.ns, name, data, subresources...), &v1beta1.Role{}) if obj == nil { return nil, err diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/fake/fake_rolebinding.go b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/fake/fake_rolebinding.go index 1d1b0a375a6..3fbaea8c578 100644 --- a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/fake/fake_rolebinding.go +++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/fake/fake_rolebinding.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" v1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeRoleBindings implements RoleBindingInterface @@ -36,7 +36,7 @@ var rolebindingsResource = schema.GroupVersionResource{Group: "rbac.authorizatio func (c *FakeRoleBindings) Create(roleBinding *v1beta1.RoleBinding) (result *v1beta1.RoleBinding, err error) { obj, err := c.Fake. - Invokes(core.NewCreateAction(rolebindingsResource, c.ns, roleBinding), &v1beta1.RoleBinding{}) + Invokes(testing.NewCreateAction(rolebindingsResource, c.ns, roleBinding), &v1beta1.RoleBinding{}) if obj == nil { return nil, err @@ -46,7 +46,7 @@ func (c *FakeRoleBindings) Create(roleBinding *v1beta1.RoleBinding) (result *v1b func (c *FakeRoleBindings) Update(roleBinding *v1beta1.RoleBinding) (result *v1beta1.RoleBinding, err error) { obj, err := c.Fake. - Invokes(core.NewUpdateAction(rolebindingsResource, c.ns, roleBinding), &v1beta1.RoleBinding{}) + Invokes(testing.NewUpdateAction(rolebindingsResource, c.ns, roleBinding), &v1beta1.RoleBinding{}) if obj == nil { return nil, err @@ -56,13 +56,13 @@ func (c *FakeRoleBindings) Update(roleBinding *v1beta1.RoleBinding) (result *v1b func (c *FakeRoleBindings) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewDeleteAction(rolebindingsResource, c.ns, name), &v1beta1.RoleBinding{}) + Invokes(testing.NewDeleteAction(rolebindingsResource, c.ns, name), &v1beta1.RoleBinding{}) return err } func (c *FakeRoleBindings) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := core.NewDeleteCollectionAction(rolebindingsResource, c.ns, listOptions) + action := testing.NewDeleteCollectionAction(rolebindingsResource, c.ns, listOptions) _, err := c.Fake.Invokes(action, &v1beta1.RoleBindingList{}) return err @@ -70,7 +70,7 @@ func (c *FakeRoleBindings) DeleteCollection(options *v1.DeleteOptions, listOptio func (c *FakeRoleBindings) Get(name string, options v1.GetOptions) (result *v1beta1.RoleBinding, err error) { obj, err := c.Fake. - Invokes(core.NewGetAction(rolebindingsResource, c.ns, name), &v1beta1.RoleBinding{}) + Invokes(testing.NewGetAction(rolebindingsResource, c.ns, name), &v1beta1.RoleBinding{}) if obj == nil { return nil, err @@ -80,13 +80,13 @@ func (c *FakeRoleBindings) Get(name string, options v1.GetOptions) (result *v1be func (c *FakeRoleBindings) List(opts v1.ListOptions) (result *v1beta1.RoleBindingList, err error) { obj, err := c.Fake. - Invokes(core.NewListAction(rolebindingsResource, c.ns, opts), &v1beta1.RoleBindingList{}) + Invokes(testing.NewListAction(rolebindingsResource, c.ns, opts), &v1beta1.RoleBindingList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -102,14 +102,14 @@ func (c *FakeRoleBindings) List(opts v1.ListOptions) (result *v1beta1.RoleBindin // Watch returns a watch.Interface that watches the requested roleBindings. func (c *FakeRoleBindings) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewWatchAction(rolebindingsResource, c.ns, opts)) + InvokesWatch(testing.NewWatchAction(rolebindingsResource, c.ns, opts)) } // Patch applies the patch and returns the patched roleBinding. func (c *FakeRoleBindings) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.RoleBinding, err error) { obj, err := c.Fake. - Invokes(core.NewPatchSubresourceAction(rolebindingsResource, c.ns, name, data, subresources...), &v1beta1.RoleBinding{}) + Invokes(testing.NewPatchSubresourceAction(rolebindingsResource, c.ns, name, data, subresources...), &v1beta1.RoleBinding{}) if obj == nil { return nil, err diff --git a/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/fake/BUILD b/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/fake/BUILD index 7b95a59bb90..d63db4b41e4 100644 --- a/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/fake/BUILD +++ b/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/fake/BUILD @@ -18,13 +18,13 @@ go_library( deps = [ "//pkg/apis/storage/v1beta1:go_default_library", "//pkg/client/clientset_generated/clientset/typed/storage/v1beta1:go_default_library", - "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/testing", ], ) diff --git a/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/fake/fake_storage_client.go b/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/fake/fake_storage_client.go index ac58580602f..3592d1c6572 100644 --- a/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/fake/fake_storage_client.go +++ b/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/fake/fake_storage_client.go @@ -18,12 +18,12 @@ package fake import ( rest "k8s.io/client-go/rest" + testing "k8s.io/client-go/testing" v1beta1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/storage/v1beta1" - core "k8s.io/kubernetes/pkg/client/testing/core" ) type FakeStorageV1beta1 struct { - *core.Fake + *testing.Fake } func (c *FakeStorageV1beta1) StorageClasses() v1beta1.StorageClassInterface { diff --git a/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/fake/fake_storageclass.go b/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/fake/fake_storageclass.go index 881e5272a27..0306a603a09 100644 --- a/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/fake/fake_storageclass.go +++ b/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/fake/fake_storageclass.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" v1beta1 "k8s.io/kubernetes/pkg/apis/storage/v1beta1" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeStorageClasses implements StorageClassInterface @@ -35,7 +35,7 @@ var storageclassesResource = schema.GroupVersionResource{Group: "storage.k8s.io" func (c *FakeStorageClasses) Create(storageClass *v1beta1.StorageClass) (result *v1beta1.StorageClass, err error) { obj, err := c.Fake. - Invokes(core.NewRootCreateAction(storageclassesResource, storageClass), &v1beta1.StorageClass{}) + Invokes(testing.NewRootCreateAction(storageclassesResource, storageClass), &v1beta1.StorageClass{}) if obj == nil { return nil, err } @@ -44,7 +44,7 @@ func (c *FakeStorageClasses) Create(storageClass *v1beta1.StorageClass) (result func (c *FakeStorageClasses) Update(storageClass *v1beta1.StorageClass) (result *v1beta1.StorageClass, err error) { obj, err := c.Fake. - Invokes(core.NewRootUpdateAction(storageclassesResource, storageClass), &v1beta1.StorageClass{}) + Invokes(testing.NewRootUpdateAction(storageclassesResource, storageClass), &v1beta1.StorageClass{}) if obj == nil { return nil, err } @@ -53,12 +53,12 @@ func (c *FakeStorageClasses) Update(storageClass *v1beta1.StorageClass) (result func (c *FakeStorageClasses) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewRootDeleteAction(storageclassesResource, name), &v1beta1.StorageClass{}) + Invokes(testing.NewRootDeleteAction(storageclassesResource, name), &v1beta1.StorageClass{}) return err } func (c *FakeStorageClasses) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := core.NewRootDeleteCollectionAction(storageclassesResource, listOptions) + action := testing.NewRootDeleteCollectionAction(storageclassesResource, listOptions) _, err := c.Fake.Invokes(action, &v1beta1.StorageClassList{}) return err @@ -66,7 +66,7 @@ func (c *FakeStorageClasses) DeleteCollection(options *v1.DeleteOptions, listOpt func (c *FakeStorageClasses) Get(name string, options v1.GetOptions) (result *v1beta1.StorageClass, err error) { obj, err := c.Fake. - Invokes(core.NewRootGetAction(storageclassesResource, name), &v1beta1.StorageClass{}) + Invokes(testing.NewRootGetAction(storageclassesResource, name), &v1beta1.StorageClass{}) if obj == nil { return nil, err } @@ -75,12 +75,12 @@ func (c *FakeStorageClasses) Get(name string, options v1.GetOptions) (result *v1 func (c *FakeStorageClasses) List(opts v1.ListOptions) (result *v1beta1.StorageClassList, err error) { obj, err := c.Fake. - Invokes(core.NewRootListAction(storageclassesResource, opts), &v1beta1.StorageClassList{}) + Invokes(testing.NewRootListAction(storageclassesResource, opts), &v1beta1.StorageClassList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -96,13 +96,13 @@ func (c *FakeStorageClasses) List(opts v1.ListOptions) (result *v1beta1.StorageC // Watch returns a watch.Interface that watches the requested storageClasses. func (c *FakeStorageClasses) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewRootWatchAction(storageclassesResource, opts)) + InvokesWatch(testing.NewRootWatchAction(storageclassesResource, opts)) } // Patch applies the patch and returns the patched storageClass. func (c *FakeStorageClasses) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.StorageClass, err error) { obj, err := c.Fake. - Invokes(core.NewRootPatchSubresourceAction(storageclassesResource, name, data, subresources...), &v1beta1.StorageClass{}) + Invokes(testing.NewRootPatchSubresourceAction(storageclassesResource, name, data, subresources...), &v1beta1.StorageClass{}) if obj == nil { return nil, err } diff --git a/pkg/client/clientset_generated/internalclientset/fake/BUILD b/pkg/client/clientset_generated/internalclientset/fake/BUILD index fe87527b380..8a356e5af4b 100644 --- a/pkg/client/clientset_generated/internalclientset/fake/BUILD +++ b/pkg/client/clientset_generated/internalclientset/fake/BUILD @@ -39,11 +39,11 @@ go_library( "//pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake:go_default_library", "//pkg/client/clientset_generated/internalclientset/typed/storage/internalversion:go_default_library", "//pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/fake:go_default_library", - "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/client-go/discovery", "//vendor:k8s.io/client-go/discovery/fake", + "//vendor:k8s.io/client-go/testing", ], ) diff --git a/pkg/client/clientset_generated/internalclientset/fake/clientset_generated.go b/pkg/client/clientset_generated/internalclientset/fake/clientset_generated.go index ec3e0325ce4..139f0f0f236 100644 --- a/pkg/client/clientset_generated/internalclientset/fake/clientset_generated.go +++ b/pkg/client/clientset_generated/internalclientset/fake/clientset_generated.go @@ -21,6 +21,7 @@ import ( "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/discovery" fakediscovery "k8s.io/client-go/discovery/fake" + "k8s.io/client-go/testing" "k8s.io/kubernetes/pkg/api" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" internalversionapps "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion" @@ -45,7 +46,6 @@ import ( fakeinternalversionrbac "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake" internalversionstorage "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion" fakeinternalversionstorage "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/fake" - "k8s.io/kubernetes/pkg/client/testing/core" ) // NewSimpleClientset returns a clientset that will respond with the provided objects. @@ -53,17 +53,17 @@ import ( // without applying any validations and/or defaults. It shouldn't be considered a replacement // for a real clientset and is mostly useful in simple unit tests. func NewSimpleClientset(objects ...runtime.Object) *Clientset { - o := core.NewObjectTracker(api.Scheme, api.Codecs.UniversalDecoder()) + o := testing.NewObjectTracker(api.Registry, api.Scheme, api.Codecs.UniversalDecoder()) for _, obj := range objects { if err := o.Add(obj); err != nil { panic(err) } } - fakePtr := core.Fake{} - fakePtr.AddReactor("*", "*", core.ObjectReaction(o, api.Registry.RESTMapper())) + fakePtr := testing.Fake{} + fakePtr.AddReactor("*", "*", testing.ObjectReaction(o, api.Registry.RESTMapper())) - fakePtr.AddWatchReactor("*", core.DefaultWatchReactor(watch.NewFake(), nil)) + fakePtr.AddWatchReactor("*", testing.DefaultWatchReactor(watch.NewFake(), nil)) return &Clientset{fakePtr} } @@ -72,7 +72,7 @@ func NewSimpleClientset(objects ...runtime.Object) *Clientset { // struct to get a default implementation. This makes faking out just the method // you want to test easier. type Clientset struct { - core.Fake + testing.Fake } func (c *Clientset) Discovery() discovery.DiscoveryInterface { diff --git a/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/fake/BUILD b/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/fake/BUILD index 34b4441180e..b9957650a47 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/fake/BUILD +++ b/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/fake/BUILD @@ -18,13 +18,13 @@ go_library( deps = [ "//pkg/apis/apps:go_default_library", "//pkg/client/clientset_generated/internalclientset/typed/apps/internalversion:go_default_library", - "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/testing", ], ) diff --git a/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/fake/fake_apps_client.go b/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/fake/fake_apps_client.go index 69f39aea960..540106848d9 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/fake/fake_apps_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/fake/fake_apps_client.go @@ -18,12 +18,12 @@ package fake import ( rest "k8s.io/client-go/rest" + testing "k8s.io/client-go/testing" internalversion "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion" - core "k8s.io/kubernetes/pkg/client/testing/core" ) type FakeApps struct { - *core.Fake + *testing.Fake } func (c *FakeApps) StatefulSets(namespace string) internalversion.StatefulSetInterface { diff --git a/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/fake/fake_statefulset.go b/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/fake/fake_statefulset.go index d42f642d309..0de18c7adc5 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/fake/fake_statefulset.go +++ b/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/fake/fake_statefulset.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" apps "k8s.io/kubernetes/pkg/apis/apps" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeStatefulSets implements StatefulSetInterface @@ -36,7 +36,7 @@ var statefulsetsResource = schema.GroupVersionResource{Group: "apps", Version: " func (c *FakeStatefulSets) Create(statefulSet *apps.StatefulSet) (result *apps.StatefulSet, err error) { obj, err := c.Fake. - Invokes(core.NewCreateAction(statefulsetsResource, c.ns, statefulSet), &apps.StatefulSet{}) + Invokes(testing.NewCreateAction(statefulsetsResource, c.ns, statefulSet), &apps.StatefulSet{}) if obj == nil { return nil, err @@ -46,7 +46,7 @@ func (c *FakeStatefulSets) Create(statefulSet *apps.StatefulSet) (result *apps.S func (c *FakeStatefulSets) Update(statefulSet *apps.StatefulSet) (result *apps.StatefulSet, err error) { obj, err := c.Fake. - Invokes(core.NewUpdateAction(statefulsetsResource, c.ns, statefulSet), &apps.StatefulSet{}) + Invokes(testing.NewUpdateAction(statefulsetsResource, c.ns, statefulSet), &apps.StatefulSet{}) if obj == nil { return nil, err @@ -56,7 +56,7 @@ func (c *FakeStatefulSets) Update(statefulSet *apps.StatefulSet) (result *apps.S func (c *FakeStatefulSets) UpdateStatus(statefulSet *apps.StatefulSet) (*apps.StatefulSet, error) { obj, err := c.Fake. - Invokes(core.NewUpdateSubresourceAction(statefulsetsResource, "status", c.ns, statefulSet), &apps.StatefulSet{}) + Invokes(testing.NewUpdateSubresourceAction(statefulsetsResource, "status", c.ns, statefulSet), &apps.StatefulSet{}) if obj == nil { return nil, err @@ -66,13 +66,13 @@ func (c *FakeStatefulSets) UpdateStatus(statefulSet *apps.StatefulSet) (*apps.St func (c *FakeStatefulSets) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewDeleteAction(statefulsetsResource, c.ns, name), &apps.StatefulSet{}) + Invokes(testing.NewDeleteAction(statefulsetsResource, c.ns, name), &apps.StatefulSet{}) return err } func (c *FakeStatefulSets) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := core.NewDeleteCollectionAction(statefulsetsResource, c.ns, listOptions) + action := testing.NewDeleteCollectionAction(statefulsetsResource, c.ns, listOptions) _, err := c.Fake.Invokes(action, &apps.StatefulSetList{}) return err @@ -80,7 +80,7 @@ func (c *FakeStatefulSets) DeleteCollection(options *v1.DeleteOptions, listOptio func (c *FakeStatefulSets) Get(name string, options v1.GetOptions) (result *apps.StatefulSet, err error) { obj, err := c.Fake. - Invokes(core.NewGetAction(statefulsetsResource, c.ns, name), &apps.StatefulSet{}) + Invokes(testing.NewGetAction(statefulsetsResource, c.ns, name), &apps.StatefulSet{}) if obj == nil { return nil, err @@ -90,13 +90,13 @@ func (c *FakeStatefulSets) Get(name string, options v1.GetOptions) (result *apps func (c *FakeStatefulSets) List(opts v1.ListOptions) (result *apps.StatefulSetList, err error) { obj, err := c.Fake. - Invokes(core.NewListAction(statefulsetsResource, c.ns, opts), &apps.StatefulSetList{}) + Invokes(testing.NewListAction(statefulsetsResource, c.ns, opts), &apps.StatefulSetList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -112,14 +112,14 @@ func (c *FakeStatefulSets) List(opts v1.ListOptions) (result *apps.StatefulSetLi // Watch returns a watch.Interface that watches the requested statefulSets. func (c *FakeStatefulSets) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewWatchAction(statefulsetsResource, c.ns, opts)) + InvokesWatch(testing.NewWatchAction(statefulsetsResource, c.ns, opts)) } // Patch applies the patch and returns the patched statefulSet. func (c *FakeStatefulSets) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *apps.StatefulSet, err error) { obj, err := c.Fake. - Invokes(core.NewPatchSubresourceAction(statefulsetsResource, c.ns, name, data, subresources...), &apps.StatefulSet{}) + Invokes(testing.NewPatchSubresourceAction(statefulsetsResource, c.ns, name, data, subresources...), &apps.StatefulSet{}) if obj == nil { return nil, err diff --git a/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/fake/BUILD b/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/fake/BUILD index fce2c0e7eaf..337298fc950 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/fake/BUILD +++ b/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/fake/BUILD @@ -20,8 +20,8 @@ go_library( deps = [ "//pkg/apis/authentication:go_default_library", "//pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion:go_default_library", - "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/testing", ], ) diff --git a/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/fake/fake_authentication_client.go b/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/fake/fake_authentication_client.go index 93da718a487..ec72845a061 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/fake/fake_authentication_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/fake/fake_authentication_client.go @@ -18,12 +18,12 @@ package fake import ( rest "k8s.io/client-go/rest" + testing "k8s.io/client-go/testing" internalversion "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion" - core "k8s.io/kubernetes/pkg/client/testing/core" ) type FakeAuthentication struct { - *core.Fake + *testing.Fake } func (c *FakeAuthentication) TokenReviews() internalversion.TokenReviewInterface { diff --git a/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/fake/fake_tokenreview_expansion.go b/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/fake/fake_tokenreview_expansion.go index b00de0e6b59..1c5fbf96013 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/fake/fake_tokenreview_expansion.go +++ b/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/fake/fake_tokenreview_expansion.go @@ -17,8 +17,8 @@ limitations under the License. package fake import ( + core "k8s.io/client-go/testing" authenticationapi "k8s.io/kubernetes/pkg/apis/authentication" - "k8s.io/kubernetes/pkg/client/testing/core" ) func (c *FakeTokenReviews) Create(tokenReview *authenticationapi.TokenReview) (result *authenticationapi.TokenReview, err error) { diff --git a/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/fake/BUILD b/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/fake/BUILD index 4f3bd44ca23..34f18ae8ac3 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/fake/BUILD +++ b/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/fake/BUILD @@ -24,8 +24,8 @@ go_library( deps = [ "//pkg/apis/authorization:go_default_library", "//pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion:go_default_library", - "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/testing", ], ) diff --git a/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/fake/fake_authorization_client.go b/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/fake/fake_authorization_client.go index 4c32605ceba..3f458c1fd48 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/fake/fake_authorization_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/fake/fake_authorization_client.go @@ -18,12 +18,12 @@ package fake import ( rest "k8s.io/client-go/rest" + testing "k8s.io/client-go/testing" internalversion "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion" - core "k8s.io/kubernetes/pkg/client/testing/core" ) type FakeAuthorization struct { - *core.Fake + *testing.Fake } func (c *FakeAuthorization) LocalSubjectAccessReviews(namespace string) internalversion.LocalSubjectAccessReviewInterface { diff --git a/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/fake/fake_localsubjectaccessreview_expansion.go b/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/fake/fake_localsubjectaccessreview_expansion.go index 6e6164aafac..7cf295fedcd 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/fake/fake_localsubjectaccessreview_expansion.go +++ b/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/fake/fake_localsubjectaccessreview_expansion.go @@ -19,7 +19,7 @@ package fake import ( authorizationapi "k8s.io/kubernetes/pkg/apis/authorization" - "k8s.io/kubernetes/pkg/client/testing/core" + core "k8s.io/client-go/testing" ) func (c *FakeLocalSubjectAccessReviews) Create(sar *authorizationapi.LocalSubjectAccessReview) (result *authorizationapi.LocalSubjectAccessReview, err error) { diff --git a/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/fake/fake_selfsubjectaccessreview_expansion.go b/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/fake/fake_selfsubjectaccessreview_expansion.go index 15f9c8d2346..af3ee45c065 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/fake/fake_selfsubjectaccessreview_expansion.go +++ b/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/fake/fake_selfsubjectaccessreview_expansion.go @@ -17,8 +17,8 @@ limitations under the License. package fake import ( + core "k8s.io/client-go/testing" authorizationapi "k8s.io/kubernetes/pkg/apis/authorization" - "k8s.io/kubernetes/pkg/client/testing/core" ) func (c *FakeSelfSubjectAccessReviews) Create(sar *authorizationapi.SelfSubjectAccessReview) (result *authorizationapi.SelfSubjectAccessReview, err error) { diff --git a/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/fake/fake_subjectaccessreview_expansion.go b/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/fake/fake_subjectaccessreview_expansion.go index 54eed3652d4..c1a99992317 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/fake/fake_subjectaccessreview_expansion.go +++ b/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/fake/fake_subjectaccessreview_expansion.go @@ -19,7 +19,7 @@ package fake import ( authorizationapi "k8s.io/kubernetes/pkg/apis/authorization" - "k8s.io/kubernetes/pkg/client/testing/core" + core "k8s.io/client-go/testing" ) func (c *FakeSubjectAccessReviews) Create(sar *authorizationapi.SubjectAccessReview) (result *authorizationapi.SubjectAccessReview, err error) { diff --git a/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/fake/BUILD b/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/fake/BUILD index 115fa61d113..1cfbf216176 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/fake/BUILD +++ b/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/fake/BUILD @@ -18,13 +18,13 @@ go_library( deps = [ "//pkg/apis/autoscaling:go_default_library", "//pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion:go_default_library", - "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/testing", ], ) diff --git a/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/fake/fake_autoscaling_client.go b/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/fake/fake_autoscaling_client.go index e427da90bc8..a6098274bcd 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/fake/fake_autoscaling_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/fake/fake_autoscaling_client.go @@ -18,12 +18,12 @@ package fake import ( rest "k8s.io/client-go/rest" + testing "k8s.io/client-go/testing" internalversion "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion" - core "k8s.io/kubernetes/pkg/client/testing/core" ) type FakeAutoscaling struct { - *core.Fake + *testing.Fake } func (c *FakeAutoscaling) HorizontalPodAutoscalers(namespace string) internalversion.HorizontalPodAutoscalerInterface { diff --git a/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/fake/fake_horizontalpodautoscaler.go b/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/fake/fake_horizontalpodautoscaler.go index e0db5c0b160..86cf91ec04a 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/fake/fake_horizontalpodautoscaler.go +++ b/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/fake/fake_horizontalpodautoscaler.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" autoscaling "k8s.io/kubernetes/pkg/apis/autoscaling" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeHorizontalPodAutoscalers implements HorizontalPodAutoscalerInterface @@ -36,7 +36,7 @@ var horizontalpodautoscalersResource = schema.GroupVersionResource{Group: "autos func (c *FakeHorizontalPodAutoscalers) Create(horizontalPodAutoscaler *autoscaling.HorizontalPodAutoscaler) (result *autoscaling.HorizontalPodAutoscaler, err error) { obj, err := c.Fake. - Invokes(core.NewCreateAction(horizontalpodautoscalersResource, c.ns, horizontalPodAutoscaler), &autoscaling.HorizontalPodAutoscaler{}) + Invokes(testing.NewCreateAction(horizontalpodautoscalersResource, c.ns, horizontalPodAutoscaler), &autoscaling.HorizontalPodAutoscaler{}) if obj == nil { return nil, err @@ -46,7 +46,7 @@ func (c *FakeHorizontalPodAutoscalers) Create(horizontalPodAutoscaler *autoscali func (c *FakeHorizontalPodAutoscalers) Update(horizontalPodAutoscaler *autoscaling.HorizontalPodAutoscaler) (result *autoscaling.HorizontalPodAutoscaler, err error) { obj, err := c.Fake. - Invokes(core.NewUpdateAction(horizontalpodautoscalersResource, c.ns, horizontalPodAutoscaler), &autoscaling.HorizontalPodAutoscaler{}) + Invokes(testing.NewUpdateAction(horizontalpodautoscalersResource, c.ns, horizontalPodAutoscaler), &autoscaling.HorizontalPodAutoscaler{}) if obj == nil { return nil, err @@ -56,7 +56,7 @@ func (c *FakeHorizontalPodAutoscalers) Update(horizontalPodAutoscaler *autoscali func (c *FakeHorizontalPodAutoscalers) UpdateStatus(horizontalPodAutoscaler *autoscaling.HorizontalPodAutoscaler) (*autoscaling.HorizontalPodAutoscaler, error) { obj, err := c.Fake. - Invokes(core.NewUpdateSubresourceAction(horizontalpodautoscalersResource, "status", c.ns, horizontalPodAutoscaler), &autoscaling.HorizontalPodAutoscaler{}) + Invokes(testing.NewUpdateSubresourceAction(horizontalpodautoscalersResource, "status", c.ns, horizontalPodAutoscaler), &autoscaling.HorizontalPodAutoscaler{}) if obj == nil { return nil, err @@ -66,13 +66,13 @@ func (c *FakeHorizontalPodAutoscalers) UpdateStatus(horizontalPodAutoscaler *aut func (c *FakeHorizontalPodAutoscalers) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewDeleteAction(horizontalpodautoscalersResource, c.ns, name), &autoscaling.HorizontalPodAutoscaler{}) + Invokes(testing.NewDeleteAction(horizontalpodautoscalersResource, c.ns, name), &autoscaling.HorizontalPodAutoscaler{}) return err } func (c *FakeHorizontalPodAutoscalers) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := core.NewDeleteCollectionAction(horizontalpodautoscalersResource, c.ns, listOptions) + action := testing.NewDeleteCollectionAction(horizontalpodautoscalersResource, c.ns, listOptions) _, err := c.Fake.Invokes(action, &autoscaling.HorizontalPodAutoscalerList{}) return err @@ -80,7 +80,7 @@ func (c *FakeHorizontalPodAutoscalers) DeleteCollection(options *v1.DeleteOption func (c *FakeHorizontalPodAutoscalers) Get(name string, options v1.GetOptions) (result *autoscaling.HorizontalPodAutoscaler, err error) { obj, err := c.Fake. - Invokes(core.NewGetAction(horizontalpodautoscalersResource, c.ns, name), &autoscaling.HorizontalPodAutoscaler{}) + Invokes(testing.NewGetAction(horizontalpodautoscalersResource, c.ns, name), &autoscaling.HorizontalPodAutoscaler{}) if obj == nil { return nil, err @@ -90,13 +90,13 @@ func (c *FakeHorizontalPodAutoscalers) Get(name string, options v1.GetOptions) ( func (c *FakeHorizontalPodAutoscalers) List(opts v1.ListOptions) (result *autoscaling.HorizontalPodAutoscalerList, err error) { obj, err := c.Fake. - Invokes(core.NewListAction(horizontalpodautoscalersResource, c.ns, opts), &autoscaling.HorizontalPodAutoscalerList{}) + Invokes(testing.NewListAction(horizontalpodautoscalersResource, c.ns, opts), &autoscaling.HorizontalPodAutoscalerList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -112,14 +112,14 @@ func (c *FakeHorizontalPodAutoscalers) List(opts v1.ListOptions) (result *autosc // Watch returns a watch.Interface that watches the requested horizontalPodAutoscalers. func (c *FakeHorizontalPodAutoscalers) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewWatchAction(horizontalpodautoscalersResource, c.ns, opts)) + InvokesWatch(testing.NewWatchAction(horizontalpodautoscalersResource, c.ns, opts)) } // Patch applies the patch and returns the patched horizontalPodAutoscaler. func (c *FakeHorizontalPodAutoscalers) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *autoscaling.HorizontalPodAutoscaler, err error) { obj, err := c.Fake. - Invokes(core.NewPatchSubresourceAction(horizontalpodautoscalersResource, c.ns, name, data, subresources...), &autoscaling.HorizontalPodAutoscaler{}) + Invokes(testing.NewPatchSubresourceAction(horizontalpodautoscalersResource, c.ns, name, data, subresources...), &autoscaling.HorizontalPodAutoscaler{}) if obj == nil { return nil, err diff --git a/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/fake/BUILD b/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/fake/BUILD index 63fe05cffe1..49cfb50802c 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/fake/BUILD +++ b/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/fake/BUILD @@ -19,13 +19,13 @@ go_library( deps = [ "//pkg/apis/batch:go_default_library", "//pkg/client/clientset_generated/internalclientset/typed/batch/internalversion:go_default_library", - "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/testing", ], ) diff --git a/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/fake/fake_batch_client.go b/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/fake/fake_batch_client.go index a1ad34c6dc8..34e3f16e40d 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/fake/fake_batch_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/fake/fake_batch_client.go @@ -18,12 +18,12 @@ package fake import ( rest "k8s.io/client-go/rest" + testing "k8s.io/client-go/testing" internalversion "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion" - core "k8s.io/kubernetes/pkg/client/testing/core" ) type FakeBatch struct { - *core.Fake + *testing.Fake } func (c *FakeBatch) CronJobs(namespace string) internalversion.CronJobInterface { diff --git a/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/fake/fake_cronjob.go b/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/fake/fake_cronjob.go index b8551c785a4..e35ecd684f5 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/fake/fake_cronjob.go +++ b/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/fake/fake_cronjob.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" batch "k8s.io/kubernetes/pkg/apis/batch" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeCronJobs implements CronJobInterface @@ -36,7 +36,7 @@ var cronjobsResource = schema.GroupVersionResource{Group: "batch", Version: "", func (c *FakeCronJobs) Create(cronJob *batch.CronJob) (result *batch.CronJob, err error) { obj, err := c.Fake. - Invokes(core.NewCreateAction(cronjobsResource, c.ns, cronJob), &batch.CronJob{}) + Invokes(testing.NewCreateAction(cronjobsResource, c.ns, cronJob), &batch.CronJob{}) if obj == nil { return nil, err @@ -46,7 +46,7 @@ func (c *FakeCronJobs) Create(cronJob *batch.CronJob) (result *batch.CronJob, er func (c *FakeCronJobs) Update(cronJob *batch.CronJob) (result *batch.CronJob, err error) { obj, err := c.Fake. - Invokes(core.NewUpdateAction(cronjobsResource, c.ns, cronJob), &batch.CronJob{}) + Invokes(testing.NewUpdateAction(cronjobsResource, c.ns, cronJob), &batch.CronJob{}) if obj == nil { return nil, err @@ -56,7 +56,7 @@ func (c *FakeCronJobs) Update(cronJob *batch.CronJob) (result *batch.CronJob, er func (c *FakeCronJobs) UpdateStatus(cronJob *batch.CronJob) (*batch.CronJob, error) { obj, err := c.Fake. - Invokes(core.NewUpdateSubresourceAction(cronjobsResource, "status", c.ns, cronJob), &batch.CronJob{}) + Invokes(testing.NewUpdateSubresourceAction(cronjobsResource, "status", c.ns, cronJob), &batch.CronJob{}) if obj == nil { return nil, err @@ -66,13 +66,13 @@ func (c *FakeCronJobs) UpdateStatus(cronJob *batch.CronJob) (*batch.CronJob, err func (c *FakeCronJobs) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewDeleteAction(cronjobsResource, c.ns, name), &batch.CronJob{}) + Invokes(testing.NewDeleteAction(cronjobsResource, c.ns, name), &batch.CronJob{}) return err } func (c *FakeCronJobs) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := core.NewDeleteCollectionAction(cronjobsResource, c.ns, listOptions) + action := testing.NewDeleteCollectionAction(cronjobsResource, c.ns, listOptions) _, err := c.Fake.Invokes(action, &batch.CronJobList{}) return err @@ -80,7 +80,7 @@ func (c *FakeCronJobs) DeleteCollection(options *v1.DeleteOptions, listOptions v func (c *FakeCronJobs) Get(name string, options v1.GetOptions) (result *batch.CronJob, err error) { obj, err := c.Fake. - Invokes(core.NewGetAction(cronjobsResource, c.ns, name), &batch.CronJob{}) + Invokes(testing.NewGetAction(cronjobsResource, c.ns, name), &batch.CronJob{}) if obj == nil { return nil, err @@ -90,13 +90,13 @@ func (c *FakeCronJobs) Get(name string, options v1.GetOptions) (result *batch.Cr func (c *FakeCronJobs) List(opts v1.ListOptions) (result *batch.CronJobList, err error) { obj, err := c.Fake. - Invokes(core.NewListAction(cronjobsResource, c.ns, opts), &batch.CronJobList{}) + Invokes(testing.NewListAction(cronjobsResource, c.ns, opts), &batch.CronJobList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -112,14 +112,14 @@ func (c *FakeCronJobs) List(opts v1.ListOptions) (result *batch.CronJobList, err // Watch returns a watch.Interface that watches the requested cronJobs. func (c *FakeCronJobs) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewWatchAction(cronjobsResource, c.ns, opts)) + InvokesWatch(testing.NewWatchAction(cronjobsResource, c.ns, opts)) } // Patch applies the patch and returns the patched cronJob. func (c *FakeCronJobs) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *batch.CronJob, err error) { obj, err := c.Fake. - Invokes(core.NewPatchSubresourceAction(cronjobsResource, c.ns, name, data, subresources...), &batch.CronJob{}) + Invokes(testing.NewPatchSubresourceAction(cronjobsResource, c.ns, name, data, subresources...), &batch.CronJob{}) if obj == nil { return nil, err diff --git a/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/fake/fake_job.go b/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/fake/fake_job.go index db3f9027a26..faad5459a03 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/fake/fake_job.go +++ b/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/fake/fake_job.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" batch "k8s.io/kubernetes/pkg/apis/batch" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeJobs implements JobInterface @@ -36,7 +36,7 @@ var jobsResource = schema.GroupVersionResource{Group: "batch", Version: "", Reso func (c *FakeJobs) Create(job *batch.Job) (result *batch.Job, err error) { obj, err := c.Fake. - Invokes(core.NewCreateAction(jobsResource, c.ns, job), &batch.Job{}) + Invokes(testing.NewCreateAction(jobsResource, c.ns, job), &batch.Job{}) if obj == nil { return nil, err @@ -46,7 +46,7 @@ func (c *FakeJobs) Create(job *batch.Job) (result *batch.Job, err error) { func (c *FakeJobs) Update(job *batch.Job) (result *batch.Job, err error) { obj, err := c.Fake. - Invokes(core.NewUpdateAction(jobsResource, c.ns, job), &batch.Job{}) + Invokes(testing.NewUpdateAction(jobsResource, c.ns, job), &batch.Job{}) if obj == nil { return nil, err @@ -56,7 +56,7 @@ func (c *FakeJobs) Update(job *batch.Job) (result *batch.Job, err error) { func (c *FakeJobs) UpdateStatus(job *batch.Job) (*batch.Job, error) { obj, err := c.Fake. - Invokes(core.NewUpdateSubresourceAction(jobsResource, "status", c.ns, job), &batch.Job{}) + Invokes(testing.NewUpdateSubresourceAction(jobsResource, "status", c.ns, job), &batch.Job{}) if obj == nil { return nil, err @@ -66,13 +66,13 @@ func (c *FakeJobs) UpdateStatus(job *batch.Job) (*batch.Job, error) { func (c *FakeJobs) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewDeleteAction(jobsResource, c.ns, name), &batch.Job{}) + Invokes(testing.NewDeleteAction(jobsResource, c.ns, name), &batch.Job{}) return err } func (c *FakeJobs) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := core.NewDeleteCollectionAction(jobsResource, c.ns, listOptions) + action := testing.NewDeleteCollectionAction(jobsResource, c.ns, listOptions) _, err := c.Fake.Invokes(action, &batch.JobList{}) return err @@ -80,7 +80,7 @@ func (c *FakeJobs) DeleteCollection(options *v1.DeleteOptions, listOptions v1.Li func (c *FakeJobs) Get(name string, options v1.GetOptions) (result *batch.Job, err error) { obj, err := c.Fake. - Invokes(core.NewGetAction(jobsResource, c.ns, name), &batch.Job{}) + Invokes(testing.NewGetAction(jobsResource, c.ns, name), &batch.Job{}) if obj == nil { return nil, err @@ -90,13 +90,13 @@ func (c *FakeJobs) Get(name string, options v1.GetOptions) (result *batch.Job, e func (c *FakeJobs) List(opts v1.ListOptions) (result *batch.JobList, err error) { obj, err := c.Fake. - Invokes(core.NewListAction(jobsResource, c.ns, opts), &batch.JobList{}) + Invokes(testing.NewListAction(jobsResource, c.ns, opts), &batch.JobList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -112,14 +112,14 @@ func (c *FakeJobs) List(opts v1.ListOptions) (result *batch.JobList, err error) // Watch returns a watch.Interface that watches the requested jobs. func (c *FakeJobs) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewWatchAction(jobsResource, c.ns, opts)) + InvokesWatch(testing.NewWatchAction(jobsResource, c.ns, opts)) } // Patch applies the patch and returns the patched job. func (c *FakeJobs) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *batch.Job, err error) { obj, err := c.Fake. - Invokes(core.NewPatchSubresourceAction(jobsResource, c.ns, name, data, subresources...), &batch.Job{}) + Invokes(testing.NewPatchSubresourceAction(jobsResource, c.ns, name, data, subresources...), &batch.Job{}) if obj == nil { return nil, err diff --git a/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/fake/BUILD b/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/fake/BUILD index 56fb98cecc7..b18e67b6bd1 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/fake/BUILD +++ b/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/fake/BUILD @@ -19,13 +19,13 @@ go_library( deps = [ "//pkg/apis/certificates:go_default_library", "//pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion:go_default_library", - "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/testing", ], ) diff --git a/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/fake/fake_certificates_client.go b/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/fake/fake_certificates_client.go index dfb1a2d8f91..e38333579cf 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/fake/fake_certificates_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/fake/fake_certificates_client.go @@ -18,12 +18,12 @@ package fake import ( rest "k8s.io/client-go/rest" + testing "k8s.io/client-go/testing" internalversion "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion" - core "k8s.io/kubernetes/pkg/client/testing/core" ) type FakeCertificates struct { - *core.Fake + *testing.Fake } func (c *FakeCertificates) CertificateSigningRequests() internalversion.CertificateSigningRequestInterface { diff --git a/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/fake/fake_certificatesigningrequest.go b/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/fake/fake_certificatesigningrequest.go index 35404ceca0f..b2aaa1ed3cb 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/fake/fake_certificatesigningrequest.go +++ b/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/fake/fake_certificatesigningrequest.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" certificates "k8s.io/kubernetes/pkg/apis/certificates" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeCertificateSigningRequests implements CertificateSigningRequestInterface @@ -35,7 +35,7 @@ var certificatesigningrequestsResource = schema.GroupVersionResource{Group: "cer func (c *FakeCertificateSigningRequests) Create(certificateSigningRequest *certificates.CertificateSigningRequest) (result *certificates.CertificateSigningRequest, err error) { obj, err := c.Fake. - Invokes(core.NewRootCreateAction(certificatesigningrequestsResource, certificateSigningRequest), &certificates.CertificateSigningRequest{}) + Invokes(testing.NewRootCreateAction(certificatesigningrequestsResource, certificateSigningRequest), &certificates.CertificateSigningRequest{}) if obj == nil { return nil, err } @@ -44,7 +44,7 @@ func (c *FakeCertificateSigningRequests) Create(certificateSigningRequest *certi func (c *FakeCertificateSigningRequests) Update(certificateSigningRequest *certificates.CertificateSigningRequest) (result *certificates.CertificateSigningRequest, err error) { obj, err := c.Fake. - Invokes(core.NewRootUpdateAction(certificatesigningrequestsResource, certificateSigningRequest), &certificates.CertificateSigningRequest{}) + Invokes(testing.NewRootUpdateAction(certificatesigningrequestsResource, certificateSigningRequest), &certificates.CertificateSigningRequest{}) if obj == nil { return nil, err } @@ -53,7 +53,7 @@ func (c *FakeCertificateSigningRequests) Update(certificateSigningRequest *certi func (c *FakeCertificateSigningRequests) UpdateStatus(certificateSigningRequest *certificates.CertificateSigningRequest) (*certificates.CertificateSigningRequest, error) { obj, err := c.Fake. - Invokes(core.NewRootUpdateSubresourceAction(certificatesigningrequestsResource, "status", certificateSigningRequest), &certificates.CertificateSigningRequest{}) + Invokes(testing.NewRootUpdateSubresourceAction(certificatesigningrequestsResource, "status", certificateSigningRequest), &certificates.CertificateSigningRequest{}) if obj == nil { return nil, err } @@ -62,12 +62,12 @@ func (c *FakeCertificateSigningRequests) UpdateStatus(certificateSigningRequest func (c *FakeCertificateSigningRequests) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewRootDeleteAction(certificatesigningrequestsResource, name), &certificates.CertificateSigningRequest{}) + Invokes(testing.NewRootDeleteAction(certificatesigningrequestsResource, name), &certificates.CertificateSigningRequest{}) return err } func (c *FakeCertificateSigningRequests) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := core.NewRootDeleteCollectionAction(certificatesigningrequestsResource, listOptions) + action := testing.NewRootDeleteCollectionAction(certificatesigningrequestsResource, listOptions) _, err := c.Fake.Invokes(action, &certificates.CertificateSigningRequestList{}) return err @@ -75,7 +75,7 @@ func (c *FakeCertificateSigningRequests) DeleteCollection(options *v1.DeleteOpti func (c *FakeCertificateSigningRequests) Get(name string, options v1.GetOptions) (result *certificates.CertificateSigningRequest, err error) { obj, err := c.Fake. - Invokes(core.NewRootGetAction(certificatesigningrequestsResource, name), &certificates.CertificateSigningRequest{}) + Invokes(testing.NewRootGetAction(certificatesigningrequestsResource, name), &certificates.CertificateSigningRequest{}) if obj == nil { return nil, err } @@ -84,12 +84,12 @@ func (c *FakeCertificateSigningRequests) Get(name string, options v1.GetOptions) func (c *FakeCertificateSigningRequests) List(opts v1.ListOptions) (result *certificates.CertificateSigningRequestList, err error) { obj, err := c.Fake. - Invokes(core.NewRootListAction(certificatesigningrequestsResource, opts), &certificates.CertificateSigningRequestList{}) + Invokes(testing.NewRootListAction(certificatesigningrequestsResource, opts), &certificates.CertificateSigningRequestList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -105,13 +105,13 @@ func (c *FakeCertificateSigningRequests) List(opts v1.ListOptions) (result *cert // Watch returns a watch.Interface that watches the requested certificateSigningRequests. func (c *FakeCertificateSigningRequests) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewRootWatchAction(certificatesigningrequestsResource, opts)) + InvokesWatch(testing.NewRootWatchAction(certificatesigningrequestsResource, opts)) } // Patch applies the patch and returns the patched certificateSigningRequest. func (c *FakeCertificateSigningRequests) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *certificates.CertificateSigningRequest, err error) { obj, err := c.Fake. - Invokes(core.NewRootPatchSubresourceAction(certificatesigningrequestsResource, name, data, subresources...), &certificates.CertificateSigningRequest{}) + Invokes(testing.NewRootPatchSubresourceAction(certificatesigningrequestsResource, name, data, subresources...), &certificates.CertificateSigningRequest{}) if obj == nil { return nil, err } diff --git a/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/fake/fake_certificatesigningrequest_expansion.go b/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/fake/fake_certificatesigningrequest_expansion.go index 6e426c08529..43607928a3f 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/fake/fake_certificatesigningrequest_expansion.go +++ b/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/fake/fake_certificatesigningrequest_expansion.go @@ -17,8 +17,8 @@ limitations under the License. package fake import ( + core "k8s.io/client-go/testing" "k8s.io/kubernetes/pkg/apis/certificates" - "k8s.io/kubernetes/pkg/client/testing/core" ) func (c *FakeCertificateSigningRequests) UpdateApproval(certificateSigningRequest *certificates.CertificateSigningRequest) (result *certificates.CertificateSigningRequest, err error) { diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/BUILD b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/BUILD index 03d34850a68..adb98de16d3 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/BUILD +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/BUILD @@ -38,7 +38,6 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/client/clientset_generated/internalclientset/typed/core/internalversion:go_default_library", - "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/fields", "//vendor:k8s.io/apimachinery/pkg/labels", @@ -47,6 +46,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/testing", ], ) diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_componentstatus.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_componentstatus.go index 25a0201622b..55f975496fa 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_componentstatus.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_componentstatus.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" api "k8s.io/kubernetes/pkg/api" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeComponentStatuses implements ComponentStatusInterface @@ -35,7 +35,7 @@ var componentstatusesResource = schema.GroupVersionResource{Group: "", Version: func (c *FakeComponentStatuses) Create(componentStatus *api.ComponentStatus) (result *api.ComponentStatus, err error) { obj, err := c.Fake. - Invokes(core.NewRootCreateAction(componentstatusesResource, componentStatus), &api.ComponentStatus{}) + Invokes(testing.NewRootCreateAction(componentstatusesResource, componentStatus), &api.ComponentStatus{}) if obj == nil { return nil, err } @@ -44,7 +44,7 @@ func (c *FakeComponentStatuses) Create(componentStatus *api.ComponentStatus) (re func (c *FakeComponentStatuses) Update(componentStatus *api.ComponentStatus) (result *api.ComponentStatus, err error) { obj, err := c.Fake. - Invokes(core.NewRootUpdateAction(componentstatusesResource, componentStatus), &api.ComponentStatus{}) + Invokes(testing.NewRootUpdateAction(componentstatusesResource, componentStatus), &api.ComponentStatus{}) if obj == nil { return nil, err } @@ -53,12 +53,12 @@ func (c *FakeComponentStatuses) Update(componentStatus *api.ComponentStatus) (re func (c *FakeComponentStatuses) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewRootDeleteAction(componentstatusesResource, name), &api.ComponentStatus{}) + Invokes(testing.NewRootDeleteAction(componentstatusesResource, name), &api.ComponentStatus{}) return err } func (c *FakeComponentStatuses) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := core.NewRootDeleteCollectionAction(componentstatusesResource, listOptions) + action := testing.NewRootDeleteCollectionAction(componentstatusesResource, listOptions) _, err := c.Fake.Invokes(action, &api.ComponentStatusList{}) return err @@ -66,7 +66,7 @@ func (c *FakeComponentStatuses) DeleteCollection(options *v1.DeleteOptions, list func (c *FakeComponentStatuses) Get(name string, options v1.GetOptions) (result *api.ComponentStatus, err error) { obj, err := c.Fake. - Invokes(core.NewRootGetAction(componentstatusesResource, name), &api.ComponentStatus{}) + Invokes(testing.NewRootGetAction(componentstatusesResource, name), &api.ComponentStatus{}) if obj == nil { return nil, err } @@ -75,12 +75,12 @@ func (c *FakeComponentStatuses) Get(name string, options v1.GetOptions) (result func (c *FakeComponentStatuses) List(opts v1.ListOptions) (result *api.ComponentStatusList, err error) { obj, err := c.Fake. - Invokes(core.NewRootListAction(componentstatusesResource, opts), &api.ComponentStatusList{}) + Invokes(testing.NewRootListAction(componentstatusesResource, opts), &api.ComponentStatusList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -96,13 +96,13 @@ func (c *FakeComponentStatuses) List(opts v1.ListOptions) (result *api.Component // Watch returns a watch.Interface that watches the requested componentStatuses. func (c *FakeComponentStatuses) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewRootWatchAction(componentstatusesResource, opts)) + InvokesWatch(testing.NewRootWatchAction(componentstatusesResource, opts)) } // Patch applies the patch and returns the patched componentStatus. func (c *FakeComponentStatuses) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *api.ComponentStatus, err error) { obj, err := c.Fake. - Invokes(core.NewRootPatchSubresourceAction(componentstatusesResource, name, data, subresources...), &api.ComponentStatus{}) + Invokes(testing.NewRootPatchSubresourceAction(componentstatusesResource, name, data, subresources...), &api.ComponentStatus{}) if obj == nil { return nil, err } diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_configmap.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_configmap.go index f4bf6710da3..ded63cc3ddb 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_configmap.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_configmap.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" api "k8s.io/kubernetes/pkg/api" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeConfigMaps implements ConfigMapInterface @@ -36,7 +36,7 @@ var configmapsResource = schema.GroupVersionResource{Group: "", Version: "", Res func (c *FakeConfigMaps) Create(configMap *api.ConfigMap) (result *api.ConfigMap, err error) { obj, err := c.Fake. - Invokes(core.NewCreateAction(configmapsResource, c.ns, configMap), &api.ConfigMap{}) + Invokes(testing.NewCreateAction(configmapsResource, c.ns, configMap), &api.ConfigMap{}) if obj == nil { return nil, err @@ -46,7 +46,7 @@ func (c *FakeConfigMaps) Create(configMap *api.ConfigMap) (result *api.ConfigMap func (c *FakeConfigMaps) Update(configMap *api.ConfigMap) (result *api.ConfigMap, err error) { obj, err := c.Fake. - Invokes(core.NewUpdateAction(configmapsResource, c.ns, configMap), &api.ConfigMap{}) + Invokes(testing.NewUpdateAction(configmapsResource, c.ns, configMap), &api.ConfigMap{}) if obj == nil { return nil, err @@ -56,13 +56,13 @@ func (c *FakeConfigMaps) Update(configMap *api.ConfigMap) (result *api.ConfigMap func (c *FakeConfigMaps) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewDeleteAction(configmapsResource, c.ns, name), &api.ConfigMap{}) + Invokes(testing.NewDeleteAction(configmapsResource, c.ns, name), &api.ConfigMap{}) return err } func (c *FakeConfigMaps) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := core.NewDeleteCollectionAction(configmapsResource, c.ns, listOptions) + action := testing.NewDeleteCollectionAction(configmapsResource, c.ns, listOptions) _, err := c.Fake.Invokes(action, &api.ConfigMapList{}) return err @@ -70,7 +70,7 @@ func (c *FakeConfigMaps) DeleteCollection(options *v1.DeleteOptions, listOptions func (c *FakeConfigMaps) Get(name string, options v1.GetOptions) (result *api.ConfigMap, err error) { obj, err := c.Fake. - Invokes(core.NewGetAction(configmapsResource, c.ns, name), &api.ConfigMap{}) + Invokes(testing.NewGetAction(configmapsResource, c.ns, name), &api.ConfigMap{}) if obj == nil { return nil, err @@ -80,13 +80,13 @@ func (c *FakeConfigMaps) Get(name string, options v1.GetOptions) (result *api.Co func (c *FakeConfigMaps) List(opts v1.ListOptions) (result *api.ConfigMapList, err error) { obj, err := c.Fake. - Invokes(core.NewListAction(configmapsResource, c.ns, opts), &api.ConfigMapList{}) + Invokes(testing.NewListAction(configmapsResource, c.ns, opts), &api.ConfigMapList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -102,14 +102,14 @@ func (c *FakeConfigMaps) List(opts v1.ListOptions) (result *api.ConfigMapList, e // Watch returns a watch.Interface that watches the requested configMaps. func (c *FakeConfigMaps) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewWatchAction(configmapsResource, c.ns, opts)) + InvokesWatch(testing.NewWatchAction(configmapsResource, c.ns, opts)) } // Patch applies the patch and returns the patched configMap. func (c *FakeConfigMaps) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *api.ConfigMap, err error) { obj, err := c.Fake. - Invokes(core.NewPatchSubresourceAction(configmapsResource, c.ns, name, data, subresources...), &api.ConfigMap{}) + Invokes(testing.NewPatchSubresourceAction(configmapsResource, c.ns, name, data, subresources...), &api.ConfigMap{}) if obj == nil { return nil, err diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_core_client.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_core_client.go index da9719b5fe1..511cb36dbd1 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_core_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_core_client.go @@ -18,12 +18,12 @@ package fake import ( rest "k8s.io/client-go/rest" + testing "k8s.io/client-go/testing" internalversion "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" - core "k8s.io/kubernetes/pkg/client/testing/core" ) type FakeCore struct { - *core.Fake + *testing.Fake } func (c *FakeCore) ComponentStatuses() internalversion.ComponentStatusInterface { diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_endpoints.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_endpoints.go index 432add053d3..729b402dd80 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_endpoints.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_endpoints.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" api "k8s.io/kubernetes/pkg/api" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeEndpoints implements EndpointsInterface @@ -36,7 +36,7 @@ var endpointsResource = schema.GroupVersionResource{Group: "", Version: "", Reso func (c *FakeEndpoints) Create(endpoints *api.Endpoints) (result *api.Endpoints, err error) { obj, err := c.Fake. - Invokes(core.NewCreateAction(endpointsResource, c.ns, endpoints), &api.Endpoints{}) + Invokes(testing.NewCreateAction(endpointsResource, c.ns, endpoints), &api.Endpoints{}) if obj == nil { return nil, err @@ -46,7 +46,7 @@ func (c *FakeEndpoints) Create(endpoints *api.Endpoints) (result *api.Endpoints, func (c *FakeEndpoints) Update(endpoints *api.Endpoints) (result *api.Endpoints, err error) { obj, err := c.Fake. - Invokes(core.NewUpdateAction(endpointsResource, c.ns, endpoints), &api.Endpoints{}) + Invokes(testing.NewUpdateAction(endpointsResource, c.ns, endpoints), &api.Endpoints{}) if obj == nil { return nil, err @@ -56,13 +56,13 @@ func (c *FakeEndpoints) Update(endpoints *api.Endpoints) (result *api.Endpoints, func (c *FakeEndpoints) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewDeleteAction(endpointsResource, c.ns, name), &api.Endpoints{}) + Invokes(testing.NewDeleteAction(endpointsResource, c.ns, name), &api.Endpoints{}) return err } func (c *FakeEndpoints) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := core.NewDeleteCollectionAction(endpointsResource, c.ns, listOptions) + action := testing.NewDeleteCollectionAction(endpointsResource, c.ns, listOptions) _, err := c.Fake.Invokes(action, &api.EndpointsList{}) return err @@ -70,7 +70,7 @@ func (c *FakeEndpoints) DeleteCollection(options *v1.DeleteOptions, listOptions func (c *FakeEndpoints) Get(name string, options v1.GetOptions) (result *api.Endpoints, err error) { obj, err := c.Fake. - Invokes(core.NewGetAction(endpointsResource, c.ns, name), &api.Endpoints{}) + Invokes(testing.NewGetAction(endpointsResource, c.ns, name), &api.Endpoints{}) if obj == nil { return nil, err @@ -80,13 +80,13 @@ func (c *FakeEndpoints) Get(name string, options v1.GetOptions) (result *api.End func (c *FakeEndpoints) List(opts v1.ListOptions) (result *api.EndpointsList, err error) { obj, err := c.Fake. - Invokes(core.NewListAction(endpointsResource, c.ns, opts), &api.EndpointsList{}) + Invokes(testing.NewListAction(endpointsResource, c.ns, opts), &api.EndpointsList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -102,14 +102,14 @@ func (c *FakeEndpoints) List(opts v1.ListOptions) (result *api.EndpointsList, er // Watch returns a watch.Interface that watches the requested endpoints. func (c *FakeEndpoints) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewWatchAction(endpointsResource, c.ns, opts)) + InvokesWatch(testing.NewWatchAction(endpointsResource, c.ns, opts)) } // Patch applies the patch and returns the patched endpoints. func (c *FakeEndpoints) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *api.Endpoints, err error) { obj, err := c.Fake. - Invokes(core.NewPatchSubresourceAction(endpointsResource, c.ns, name, data, subresources...), &api.Endpoints{}) + Invokes(testing.NewPatchSubresourceAction(endpointsResource, c.ns, name, data, subresources...), &api.Endpoints{}) if obj == nil { return nil, err diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_event.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_event.go index 78f526f8791..f551ba46dfd 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_event.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_event.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" api "k8s.io/kubernetes/pkg/api" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeEvents implements EventInterface @@ -36,7 +36,7 @@ var eventsResource = schema.GroupVersionResource{Group: "", Version: "", Resourc func (c *FakeEvents) Create(event *api.Event) (result *api.Event, err error) { obj, err := c.Fake. - Invokes(core.NewCreateAction(eventsResource, c.ns, event), &api.Event{}) + Invokes(testing.NewCreateAction(eventsResource, c.ns, event), &api.Event{}) if obj == nil { return nil, err @@ -46,7 +46,7 @@ func (c *FakeEvents) Create(event *api.Event) (result *api.Event, err error) { func (c *FakeEvents) Update(event *api.Event) (result *api.Event, err error) { obj, err := c.Fake. - Invokes(core.NewUpdateAction(eventsResource, c.ns, event), &api.Event{}) + Invokes(testing.NewUpdateAction(eventsResource, c.ns, event), &api.Event{}) if obj == nil { return nil, err @@ -56,13 +56,13 @@ func (c *FakeEvents) Update(event *api.Event) (result *api.Event, err error) { func (c *FakeEvents) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewDeleteAction(eventsResource, c.ns, name), &api.Event{}) + Invokes(testing.NewDeleteAction(eventsResource, c.ns, name), &api.Event{}) return err } func (c *FakeEvents) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := core.NewDeleteCollectionAction(eventsResource, c.ns, listOptions) + action := testing.NewDeleteCollectionAction(eventsResource, c.ns, listOptions) _, err := c.Fake.Invokes(action, &api.EventList{}) return err @@ -70,7 +70,7 @@ func (c *FakeEvents) DeleteCollection(options *v1.DeleteOptions, listOptions v1. func (c *FakeEvents) Get(name string, options v1.GetOptions) (result *api.Event, err error) { obj, err := c.Fake. - Invokes(core.NewGetAction(eventsResource, c.ns, name), &api.Event{}) + Invokes(testing.NewGetAction(eventsResource, c.ns, name), &api.Event{}) if obj == nil { return nil, err @@ -80,13 +80,13 @@ func (c *FakeEvents) Get(name string, options v1.GetOptions) (result *api.Event, func (c *FakeEvents) List(opts v1.ListOptions) (result *api.EventList, err error) { obj, err := c.Fake. - Invokes(core.NewListAction(eventsResource, c.ns, opts), &api.EventList{}) + Invokes(testing.NewListAction(eventsResource, c.ns, opts), &api.EventList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -102,14 +102,14 @@ func (c *FakeEvents) List(opts v1.ListOptions) (result *api.EventList, err error // Watch returns a watch.Interface that watches the requested events. func (c *FakeEvents) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewWatchAction(eventsResource, c.ns, opts)) + InvokesWatch(testing.NewWatchAction(eventsResource, c.ns, opts)) } // Patch applies the patch and returns the patched event. func (c *FakeEvents) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *api.Event, err error) { obj, err := c.Fake. - Invokes(core.NewPatchSubresourceAction(eventsResource, c.ns, name, data, subresources...), &api.Event{}) + Invokes(testing.NewPatchSubresourceAction(eventsResource, c.ns, name, data, subresources...), &api.Event{}) if obj == nil { return nil, err diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_event_expansion.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_event_expansion.go index 5d13311418b..1e0de5ff435 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_event_expansion.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_event_expansion.go @@ -20,8 +20,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/runtime" + core "k8s.io/client-go/testing" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client/testing/core" ) func (c *FakeEvents) CreateWithEventNamespace(event *api.Event) (*api.Event, error) { diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_limitrange.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_limitrange.go index 60b6436867e..c47e49753a4 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_limitrange.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_limitrange.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" api "k8s.io/kubernetes/pkg/api" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeLimitRanges implements LimitRangeInterface @@ -36,7 +36,7 @@ var limitrangesResource = schema.GroupVersionResource{Group: "", Version: "", Re func (c *FakeLimitRanges) Create(limitRange *api.LimitRange) (result *api.LimitRange, err error) { obj, err := c.Fake. - Invokes(core.NewCreateAction(limitrangesResource, c.ns, limitRange), &api.LimitRange{}) + Invokes(testing.NewCreateAction(limitrangesResource, c.ns, limitRange), &api.LimitRange{}) if obj == nil { return nil, err @@ -46,7 +46,7 @@ func (c *FakeLimitRanges) Create(limitRange *api.LimitRange) (result *api.LimitR func (c *FakeLimitRanges) Update(limitRange *api.LimitRange) (result *api.LimitRange, err error) { obj, err := c.Fake. - Invokes(core.NewUpdateAction(limitrangesResource, c.ns, limitRange), &api.LimitRange{}) + Invokes(testing.NewUpdateAction(limitrangesResource, c.ns, limitRange), &api.LimitRange{}) if obj == nil { return nil, err @@ -56,13 +56,13 @@ func (c *FakeLimitRanges) Update(limitRange *api.LimitRange) (result *api.LimitR func (c *FakeLimitRanges) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewDeleteAction(limitrangesResource, c.ns, name), &api.LimitRange{}) + Invokes(testing.NewDeleteAction(limitrangesResource, c.ns, name), &api.LimitRange{}) return err } func (c *FakeLimitRanges) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := core.NewDeleteCollectionAction(limitrangesResource, c.ns, listOptions) + action := testing.NewDeleteCollectionAction(limitrangesResource, c.ns, listOptions) _, err := c.Fake.Invokes(action, &api.LimitRangeList{}) return err @@ -70,7 +70,7 @@ func (c *FakeLimitRanges) DeleteCollection(options *v1.DeleteOptions, listOption func (c *FakeLimitRanges) Get(name string, options v1.GetOptions) (result *api.LimitRange, err error) { obj, err := c.Fake. - Invokes(core.NewGetAction(limitrangesResource, c.ns, name), &api.LimitRange{}) + Invokes(testing.NewGetAction(limitrangesResource, c.ns, name), &api.LimitRange{}) if obj == nil { return nil, err @@ -80,13 +80,13 @@ func (c *FakeLimitRanges) Get(name string, options v1.GetOptions) (result *api.L func (c *FakeLimitRanges) List(opts v1.ListOptions) (result *api.LimitRangeList, err error) { obj, err := c.Fake. - Invokes(core.NewListAction(limitrangesResource, c.ns, opts), &api.LimitRangeList{}) + Invokes(testing.NewListAction(limitrangesResource, c.ns, opts), &api.LimitRangeList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -102,14 +102,14 @@ func (c *FakeLimitRanges) List(opts v1.ListOptions) (result *api.LimitRangeList, // Watch returns a watch.Interface that watches the requested limitRanges. func (c *FakeLimitRanges) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewWatchAction(limitrangesResource, c.ns, opts)) + InvokesWatch(testing.NewWatchAction(limitrangesResource, c.ns, opts)) } // Patch applies the patch and returns the patched limitRange. func (c *FakeLimitRanges) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *api.LimitRange, err error) { obj, err := c.Fake. - Invokes(core.NewPatchSubresourceAction(limitrangesResource, c.ns, name, data, subresources...), &api.LimitRange{}) + Invokes(testing.NewPatchSubresourceAction(limitrangesResource, c.ns, name, data, subresources...), &api.LimitRange{}) if obj == nil { return nil, err diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_namespace.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_namespace.go index d56a744ad03..d93b73ac161 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_namespace.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_namespace.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" api "k8s.io/kubernetes/pkg/api" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeNamespaces implements NamespaceInterface @@ -35,7 +35,7 @@ var namespacesResource = schema.GroupVersionResource{Group: "", Version: "", Res func (c *FakeNamespaces) Create(namespace *api.Namespace) (result *api.Namespace, err error) { obj, err := c.Fake. - Invokes(core.NewRootCreateAction(namespacesResource, namespace), &api.Namespace{}) + Invokes(testing.NewRootCreateAction(namespacesResource, namespace), &api.Namespace{}) if obj == nil { return nil, err } @@ -44,7 +44,7 @@ func (c *FakeNamespaces) Create(namespace *api.Namespace) (result *api.Namespace func (c *FakeNamespaces) Update(namespace *api.Namespace) (result *api.Namespace, err error) { obj, err := c.Fake. - Invokes(core.NewRootUpdateAction(namespacesResource, namespace), &api.Namespace{}) + Invokes(testing.NewRootUpdateAction(namespacesResource, namespace), &api.Namespace{}) if obj == nil { return nil, err } @@ -53,7 +53,7 @@ func (c *FakeNamespaces) Update(namespace *api.Namespace) (result *api.Namespace func (c *FakeNamespaces) UpdateStatus(namespace *api.Namespace) (*api.Namespace, error) { obj, err := c.Fake. - Invokes(core.NewRootUpdateSubresourceAction(namespacesResource, "status", namespace), &api.Namespace{}) + Invokes(testing.NewRootUpdateSubresourceAction(namespacesResource, "status", namespace), &api.Namespace{}) if obj == nil { return nil, err } @@ -62,12 +62,12 @@ func (c *FakeNamespaces) UpdateStatus(namespace *api.Namespace) (*api.Namespace, func (c *FakeNamespaces) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewRootDeleteAction(namespacesResource, name), &api.Namespace{}) + Invokes(testing.NewRootDeleteAction(namespacesResource, name), &api.Namespace{}) return err } func (c *FakeNamespaces) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := core.NewRootDeleteCollectionAction(namespacesResource, listOptions) + action := testing.NewRootDeleteCollectionAction(namespacesResource, listOptions) _, err := c.Fake.Invokes(action, &api.NamespaceList{}) return err @@ -75,7 +75,7 @@ func (c *FakeNamespaces) DeleteCollection(options *v1.DeleteOptions, listOptions func (c *FakeNamespaces) Get(name string, options v1.GetOptions) (result *api.Namespace, err error) { obj, err := c.Fake. - Invokes(core.NewRootGetAction(namespacesResource, name), &api.Namespace{}) + Invokes(testing.NewRootGetAction(namespacesResource, name), &api.Namespace{}) if obj == nil { return nil, err } @@ -84,12 +84,12 @@ func (c *FakeNamespaces) Get(name string, options v1.GetOptions) (result *api.Na func (c *FakeNamespaces) List(opts v1.ListOptions) (result *api.NamespaceList, err error) { obj, err := c.Fake. - Invokes(core.NewRootListAction(namespacesResource, opts), &api.NamespaceList{}) + Invokes(testing.NewRootListAction(namespacesResource, opts), &api.NamespaceList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -105,13 +105,13 @@ func (c *FakeNamespaces) List(opts v1.ListOptions) (result *api.NamespaceList, e // Watch returns a watch.Interface that watches the requested namespaces. func (c *FakeNamespaces) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewRootWatchAction(namespacesResource, opts)) + InvokesWatch(testing.NewRootWatchAction(namespacesResource, opts)) } // Patch applies the patch and returns the patched namespace. func (c *FakeNamespaces) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *api.Namespace, err error) { obj, err := c.Fake. - Invokes(core.NewRootPatchSubresourceAction(namespacesResource, name, data, subresources...), &api.Namespace{}) + Invokes(testing.NewRootPatchSubresourceAction(namespacesResource, name, data, subresources...), &api.Namespace{}) if obj == nil { return nil, err } diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_namespace_expansion.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_namespace_expansion.go index 41eb343e026..dd425cf8c12 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_namespace_expansion.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_namespace_expansion.go @@ -17,8 +17,8 @@ limitations under the License. package fake import ( + core "k8s.io/client-go/testing" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client/testing/core" ) func (c *FakeNamespaces) Finalize(namespace *api.Namespace) (*api.Namespace, error) { diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_node.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_node.go index 92b76c939d5..e6d71fce146 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_node.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_node.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" api "k8s.io/kubernetes/pkg/api" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeNodes implements NodeInterface @@ -35,7 +35,7 @@ var nodesResource = schema.GroupVersionResource{Group: "", Version: "", Resource func (c *FakeNodes) Create(node *api.Node) (result *api.Node, err error) { obj, err := c.Fake. - Invokes(core.NewRootCreateAction(nodesResource, node), &api.Node{}) + Invokes(testing.NewRootCreateAction(nodesResource, node), &api.Node{}) if obj == nil { return nil, err } @@ -44,7 +44,7 @@ func (c *FakeNodes) Create(node *api.Node) (result *api.Node, err error) { func (c *FakeNodes) Update(node *api.Node) (result *api.Node, err error) { obj, err := c.Fake. - Invokes(core.NewRootUpdateAction(nodesResource, node), &api.Node{}) + Invokes(testing.NewRootUpdateAction(nodesResource, node), &api.Node{}) if obj == nil { return nil, err } @@ -53,7 +53,7 @@ func (c *FakeNodes) Update(node *api.Node) (result *api.Node, err error) { func (c *FakeNodes) UpdateStatus(node *api.Node) (*api.Node, error) { obj, err := c.Fake. - Invokes(core.NewRootUpdateSubresourceAction(nodesResource, "status", node), &api.Node{}) + Invokes(testing.NewRootUpdateSubresourceAction(nodesResource, "status", node), &api.Node{}) if obj == nil { return nil, err } @@ -62,12 +62,12 @@ func (c *FakeNodes) UpdateStatus(node *api.Node) (*api.Node, error) { func (c *FakeNodes) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewRootDeleteAction(nodesResource, name), &api.Node{}) + Invokes(testing.NewRootDeleteAction(nodesResource, name), &api.Node{}) return err } func (c *FakeNodes) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := core.NewRootDeleteCollectionAction(nodesResource, listOptions) + action := testing.NewRootDeleteCollectionAction(nodesResource, listOptions) _, err := c.Fake.Invokes(action, &api.NodeList{}) return err @@ -75,7 +75,7 @@ func (c *FakeNodes) DeleteCollection(options *v1.DeleteOptions, listOptions v1.L func (c *FakeNodes) Get(name string, options v1.GetOptions) (result *api.Node, err error) { obj, err := c.Fake. - Invokes(core.NewRootGetAction(nodesResource, name), &api.Node{}) + Invokes(testing.NewRootGetAction(nodesResource, name), &api.Node{}) if obj == nil { return nil, err } @@ -84,12 +84,12 @@ func (c *FakeNodes) Get(name string, options v1.GetOptions) (result *api.Node, e func (c *FakeNodes) List(opts v1.ListOptions) (result *api.NodeList, err error) { obj, err := c.Fake. - Invokes(core.NewRootListAction(nodesResource, opts), &api.NodeList{}) + Invokes(testing.NewRootListAction(nodesResource, opts), &api.NodeList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -105,13 +105,13 @@ func (c *FakeNodes) List(opts v1.ListOptions) (result *api.NodeList, err error) // Watch returns a watch.Interface that watches the requested nodes. func (c *FakeNodes) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewRootWatchAction(nodesResource, opts)) + InvokesWatch(testing.NewRootWatchAction(nodesResource, opts)) } // Patch applies the patch and returns the patched node. func (c *FakeNodes) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *api.Node, err error) { obj, err := c.Fake. - Invokes(core.NewRootPatchSubresourceAction(nodesResource, name, data, subresources...), &api.Node{}) + Invokes(testing.NewRootPatchSubresourceAction(nodesResource, name, data, subresources...), &api.Node{}) if obj == nil { return nil, err } diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_node_expansion.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_node_expansion.go index 09ddd846765..d119e95a454 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_node_expansion.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_node_expansion.go @@ -17,8 +17,8 @@ limitations under the License. package fake import ( + core "k8s.io/client-go/testing" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client/testing/core" ) func (c *FakeNodes) PatchStatus(nodeName string, data []byte) (*api.Node, error) { diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_persistentvolume.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_persistentvolume.go index 7bd7d4d1479..bc36c777311 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_persistentvolume.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_persistentvolume.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" api "k8s.io/kubernetes/pkg/api" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakePersistentVolumes implements PersistentVolumeInterface @@ -35,7 +35,7 @@ var persistentvolumesResource = schema.GroupVersionResource{Group: "", Version: func (c *FakePersistentVolumes) Create(persistentVolume *api.PersistentVolume) (result *api.PersistentVolume, err error) { obj, err := c.Fake. - Invokes(core.NewRootCreateAction(persistentvolumesResource, persistentVolume), &api.PersistentVolume{}) + Invokes(testing.NewRootCreateAction(persistentvolumesResource, persistentVolume), &api.PersistentVolume{}) if obj == nil { return nil, err } @@ -44,7 +44,7 @@ func (c *FakePersistentVolumes) Create(persistentVolume *api.PersistentVolume) ( func (c *FakePersistentVolumes) Update(persistentVolume *api.PersistentVolume) (result *api.PersistentVolume, err error) { obj, err := c.Fake. - Invokes(core.NewRootUpdateAction(persistentvolumesResource, persistentVolume), &api.PersistentVolume{}) + Invokes(testing.NewRootUpdateAction(persistentvolumesResource, persistentVolume), &api.PersistentVolume{}) if obj == nil { return nil, err } @@ -53,7 +53,7 @@ func (c *FakePersistentVolumes) Update(persistentVolume *api.PersistentVolume) ( func (c *FakePersistentVolumes) UpdateStatus(persistentVolume *api.PersistentVolume) (*api.PersistentVolume, error) { obj, err := c.Fake. - Invokes(core.NewRootUpdateSubresourceAction(persistentvolumesResource, "status", persistentVolume), &api.PersistentVolume{}) + Invokes(testing.NewRootUpdateSubresourceAction(persistentvolumesResource, "status", persistentVolume), &api.PersistentVolume{}) if obj == nil { return nil, err } @@ -62,12 +62,12 @@ func (c *FakePersistentVolumes) UpdateStatus(persistentVolume *api.PersistentVol func (c *FakePersistentVolumes) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewRootDeleteAction(persistentvolumesResource, name), &api.PersistentVolume{}) + Invokes(testing.NewRootDeleteAction(persistentvolumesResource, name), &api.PersistentVolume{}) return err } func (c *FakePersistentVolumes) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := core.NewRootDeleteCollectionAction(persistentvolumesResource, listOptions) + action := testing.NewRootDeleteCollectionAction(persistentvolumesResource, listOptions) _, err := c.Fake.Invokes(action, &api.PersistentVolumeList{}) return err @@ -75,7 +75,7 @@ func (c *FakePersistentVolumes) DeleteCollection(options *v1.DeleteOptions, list func (c *FakePersistentVolumes) Get(name string, options v1.GetOptions) (result *api.PersistentVolume, err error) { obj, err := c.Fake. - Invokes(core.NewRootGetAction(persistentvolumesResource, name), &api.PersistentVolume{}) + Invokes(testing.NewRootGetAction(persistentvolumesResource, name), &api.PersistentVolume{}) if obj == nil { return nil, err } @@ -84,12 +84,12 @@ func (c *FakePersistentVolumes) Get(name string, options v1.GetOptions) (result func (c *FakePersistentVolumes) List(opts v1.ListOptions) (result *api.PersistentVolumeList, err error) { obj, err := c.Fake. - Invokes(core.NewRootListAction(persistentvolumesResource, opts), &api.PersistentVolumeList{}) + Invokes(testing.NewRootListAction(persistentvolumesResource, opts), &api.PersistentVolumeList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -105,13 +105,13 @@ func (c *FakePersistentVolumes) List(opts v1.ListOptions) (result *api.Persisten // Watch returns a watch.Interface that watches the requested persistentVolumes. func (c *FakePersistentVolumes) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewRootWatchAction(persistentvolumesResource, opts)) + InvokesWatch(testing.NewRootWatchAction(persistentvolumesResource, opts)) } // Patch applies the patch and returns the patched persistentVolume. func (c *FakePersistentVolumes) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *api.PersistentVolume, err error) { obj, err := c.Fake. - Invokes(core.NewRootPatchSubresourceAction(persistentvolumesResource, name, data, subresources...), &api.PersistentVolume{}) + Invokes(testing.NewRootPatchSubresourceAction(persistentvolumesResource, name, data, subresources...), &api.PersistentVolume{}) if obj == nil { return nil, err } diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_persistentvolumeclaim.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_persistentvolumeclaim.go index a759e734ecc..527fc2e1f3f 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_persistentvolumeclaim.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_persistentvolumeclaim.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" api "k8s.io/kubernetes/pkg/api" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakePersistentVolumeClaims implements PersistentVolumeClaimInterface @@ -36,7 +36,7 @@ var persistentvolumeclaimsResource = schema.GroupVersionResource{Group: "", Vers func (c *FakePersistentVolumeClaims) Create(persistentVolumeClaim *api.PersistentVolumeClaim) (result *api.PersistentVolumeClaim, err error) { obj, err := c.Fake. - Invokes(core.NewCreateAction(persistentvolumeclaimsResource, c.ns, persistentVolumeClaim), &api.PersistentVolumeClaim{}) + Invokes(testing.NewCreateAction(persistentvolumeclaimsResource, c.ns, persistentVolumeClaim), &api.PersistentVolumeClaim{}) if obj == nil { return nil, err @@ -46,7 +46,7 @@ func (c *FakePersistentVolumeClaims) Create(persistentVolumeClaim *api.Persisten func (c *FakePersistentVolumeClaims) Update(persistentVolumeClaim *api.PersistentVolumeClaim) (result *api.PersistentVolumeClaim, err error) { obj, err := c.Fake. - Invokes(core.NewUpdateAction(persistentvolumeclaimsResource, c.ns, persistentVolumeClaim), &api.PersistentVolumeClaim{}) + Invokes(testing.NewUpdateAction(persistentvolumeclaimsResource, c.ns, persistentVolumeClaim), &api.PersistentVolumeClaim{}) if obj == nil { return nil, err @@ -56,7 +56,7 @@ func (c *FakePersistentVolumeClaims) Update(persistentVolumeClaim *api.Persisten func (c *FakePersistentVolumeClaims) UpdateStatus(persistentVolumeClaim *api.PersistentVolumeClaim) (*api.PersistentVolumeClaim, error) { obj, err := c.Fake. - Invokes(core.NewUpdateSubresourceAction(persistentvolumeclaimsResource, "status", c.ns, persistentVolumeClaim), &api.PersistentVolumeClaim{}) + Invokes(testing.NewUpdateSubresourceAction(persistentvolumeclaimsResource, "status", c.ns, persistentVolumeClaim), &api.PersistentVolumeClaim{}) if obj == nil { return nil, err @@ -66,13 +66,13 @@ func (c *FakePersistentVolumeClaims) UpdateStatus(persistentVolumeClaim *api.Per func (c *FakePersistentVolumeClaims) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewDeleteAction(persistentvolumeclaimsResource, c.ns, name), &api.PersistentVolumeClaim{}) + Invokes(testing.NewDeleteAction(persistentvolumeclaimsResource, c.ns, name), &api.PersistentVolumeClaim{}) return err } func (c *FakePersistentVolumeClaims) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := core.NewDeleteCollectionAction(persistentvolumeclaimsResource, c.ns, listOptions) + action := testing.NewDeleteCollectionAction(persistentvolumeclaimsResource, c.ns, listOptions) _, err := c.Fake.Invokes(action, &api.PersistentVolumeClaimList{}) return err @@ -80,7 +80,7 @@ func (c *FakePersistentVolumeClaims) DeleteCollection(options *v1.DeleteOptions, func (c *FakePersistentVolumeClaims) Get(name string, options v1.GetOptions) (result *api.PersistentVolumeClaim, err error) { obj, err := c.Fake. - Invokes(core.NewGetAction(persistentvolumeclaimsResource, c.ns, name), &api.PersistentVolumeClaim{}) + Invokes(testing.NewGetAction(persistentvolumeclaimsResource, c.ns, name), &api.PersistentVolumeClaim{}) if obj == nil { return nil, err @@ -90,13 +90,13 @@ func (c *FakePersistentVolumeClaims) Get(name string, options v1.GetOptions) (re func (c *FakePersistentVolumeClaims) List(opts v1.ListOptions) (result *api.PersistentVolumeClaimList, err error) { obj, err := c.Fake. - Invokes(core.NewListAction(persistentvolumeclaimsResource, c.ns, opts), &api.PersistentVolumeClaimList{}) + Invokes(testing.NewListAction(persistentvolumeclaimsResource, c.ns, opts), &api.PersistentVolumeClaimList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -112,14 +112,14 @@ func (c *FakePersistentVolumeClaims) List(opts v1.ListOptions) (result *api.Pers // Watch returns a watch.Interface that watches the requested persistentVolumeClaims. func (c *FakePersistentVolumeClaims) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewWatchAction(persistentvolumeclaimsResource, c.ns, opts)) + InvokesWatch(testing.NewWatchAction(persistentvolumeclaimsResource, c.ns, opts)) } // Patch applies the patch and returns the patched persistentVolumeClaim. func (c *FakePersistentVolumeClaims) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *api.PersistentVolumeClaim, err error) { obj, err := c.Fake. - Invokes(core.NewPatchSubresourceAction(persistentvolumeclaimsResource, c.ns, name, data, subresources...), &api.PersistentVolumeClaim{}) + Invokes(testing.NewPatchSubresourceAction(persistentvolumeclaimsResource, c.ns, name, data, subresources...), &api.PersistentVolumeClaim{}) if obj == nil { return nil, err diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_pod.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_pod.go index a37ed8f2213..1e46cc08749 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_pod.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_pod.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" api "k8s.io/kubernetes/pkg/api" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakePods implements PodInterface @@ -36,7 +36,7 @@ var podsResource = schema.GroupVersionResource{Group: "", Version: "", Resource: func (c *FakePods) Create(pod *api.Pod) (result *api.Pod, err error) { obj, err := c.Fake. - Invokes(core.NewCreateAction(podsResource, c.ns, pod), &api.Pod{}) + Invokes(testing.NewCreateAction(podsResource, c.ns, pod), &api.Pod{}) if obj == nil { return nil, err @@ -46,7 +46,7 @@ func (c *FakePods) Create(pod *api.Pod) (result *api.Pod, err error) { func (c *FakePods) Update(pod *api.Pod) (result *api.Pod, err error) { obj, err := c.Fake. - Invokes(core.NewUpdateAction(podsResource, c.ns, pod), &api.Pod{}) + Invokes(testing.NewUpdateAction(podsResource, c.ns, pod), &api.Pod{}) if obj == nil { return nil, err @@ -56,7 +56,7 @@ func (c *FakePods) Update(pod *api.Pod) (result *api.Pod, err error) { func (c *FakePods) UpdateStatus(pod *api.Pod) (*api.Pod, error) { obj, err := c.Fake. - Invokes(core.NewUpdateSubresourceAction(podsResource, "status", c.ns, pod), &api.Pod{}) + Invokes(testing.NewUpdateSubresourceAction(podsResource, "status", c.ns, pod), &api.Pod{}) if obj == nil { return nil, err @@ -66,13 +66,13 @@ func (c *FakePods) UpdateStatus(pod *api.Pod) (*api.Pod, error) { func (c *FakePods) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewDeleteAction(podsResource, c.ns, name), &api.Pod{}) + Invokes(testing.NewDeleteAction(podsResource, c.ns, name), &api.Pod{}) return err } func (c *FakePods) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := core.NewDeleteCollectionAction(podsResource, c.ns, listOptions) + action := testing.NewDeleteCollectionAction(podsResource, c.ns, listOptions) _, err := c.Fake.Invokes(action, &api.PodList{}) return err @@ -80,7 +80,7 @@ func (c *FakePods) DeleteCollection(options *v1.DeleteOptions, listOptions v1.Li func (c *FakePods) Get(name string, options v1.GetOptions) (result *api.Pod, err error) { obj, err := c.Fake. - Invokes(core.NewGetAction(podsResource, c.ns, name), &api.Pod{}) + Invokes(testing.NewGetAction(podsResource, c.ns, name), &api.Pod{}) if obj == nil { return nil, err @@ -90,13 +90,13 @@ func (c *FakePods) Get(name string, options v1.GetOptions) (result *api.Pod, err func (c *FakePods) List(opts v1.ListOptions) (result *api.PodList, err error) { obj, err := c.Fake. - Invokes(core.NewListAction(podsResource, c.ns, opts), &api.PodList{}) + Invokes(testing.NewListAction(podsResource, c.ns, opts), &api.PodList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -112,14 +112,14 @@ func (c *FakePods) List(opts v1.ListOptions) (result *api.PodList, err error) { // Watch returns a watch.Interface that watches the requested pods. func (c *FakePods) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewWatchAction(podsResource, c.ns, opts)) + InvokesWatch(testing.NewWatchAction(podsResource, c.ns, opts)) } // Patch applies the patch and returns the patched pod. func (c *FakePods) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *api.Pod, err error) { obj, err := c.Fake. - Invokes(core.NewPatchSubresourceAction(podsResource, c.ns, name, data, subresources...), &api.Pod{}) + Invokes(testing.NewPatchSubresourceAction(podsResource, c.ns, name, data, subresources...), &api.Pod{}) if obj == nil { return nil, err diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_pod_expansion.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_pod_expansion.go index 9ae5c27e2d1..8e94319ea8d 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_pod_expansion.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_pod_expansion.go @@ -18,8 +18,8 @@ package fake import ( restclient "k8s.io/client-go/rest" + core "k8s.io/client-go/testing" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client/testing/core" ) func (c *FakePods) Bind(binding *api.Binding) error { diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_podtemplate.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_podtemplate.go index 6849279c407..937bb8effcf 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_podtemplate.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_podtemplate.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" api "k8s.io/kubernetes/pkg/api" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakePodTemplates implements PodTemplateInterface @@ -36,7 +36,7 @@ var podtemplatesResource = schema.GroupVersionResource{Group: "", Version: "", R func (c *FakePodTemplates) Create(podTemplate *api.PodTemplate) (result *api.PodTemplate, err error) { obj, err := c.Fake. - Invokes(core.NewCreateAction(podtemplatesResource, c.ns, podTemplate), &api.PodTemplate{}) + Invokes(testing.NewCreateAction(podtemplatesResource, c.ns, podTemplate), &api.PodTemplate{}) if obj == nil { return nil, err @@ -46,7 +46,7 @@ func (c *FakePodTemplates) Create(podTemplate *api.PodTemplate) (result *api.Pod func (c *FakePodTemplates) Update(podTemplate *api.PodTemplate) (result *api.PodTemplate, err error) { obj, err := c.Fake. - Invokes(core.NewUpdateAction(podtemplatesResource, c.ns, podTemplate), &api.PodTemplate{}) + Invokes(testing.NewUpdateAction(podtemplatesResource, c.ns, podTemplate), &api.PodTemplate{}) if obj == nil { return nil, err @@ -56,13 +56,13 @@ func (c *FakePodTemplates) Update(podTemplate *api.PodTemplate) (result *api.Pod func (c *FakePodTemplates) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewDeleteAction(podtemplatesResource, c.ns, name), &api.PodTemplate{}) + Invokes(testing.NewDeleteAction(podtemplatesResource, c.ns, name), &api.PodTemplate{}) return err } func (c *FakePodTemplates) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := core.NewDeleteCollectionAction(podtemplatesResource, c.ns, listOptions) + action := testing.NewDeleteCollectionAction(podtemplatesResource, c.ns, listOptions) _, err := c.Fake.Invokes(action, &api.PodTemplateList{}) return err @@ -70,7 +70,7 @@ func (c *FakePodTemplates) DeleteCollection(options *v1.DeleteOptions, listOptio func (c *FakePodTemplates) Get(name string, options v1.GetOptions) (result *api.PodTemplate, err error) { obj, err := c.Fake. - Invokes(core.NewGetAction(podtemplatesResource, c.ns, name), &api.PodTemplate{}) + Invokes(testing.NewGetAction(podtemplatesResource, c.ns, name), &api.PodTemplate{}) if obj == nil { return nil, err @@ -80,13 +80,13 @@ func (c *FakePodTemplates) Get(name string, options v1.GetOptions) (result *api. func (c *FakePodTemplates) List(opts v1.ListOptions) (result *api.PodTemplateList, err error) { obj, err := c.Fake. - Invokes(core.NewListAction(podtemplatesResource, c.ns, opts), &api.PodTemplateList{}) + Invokes(testing.NewListAction(podtemplatesResource, c.ns, opts), &api.PodTemplateList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -102,14 +102,14 @@ func (c *FakePodTemplates) List(opts v1.ListOptions) (result *api.PodTemplateLis // Watch returns a watch.Interface that watches the requested podTemplates. func (c *FakePodTemplates) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewWatchAction(podtemplatesResource, c.ns, opts)) + InvokesWatch(testing.NewWatchAction(podtemplatesResource, c.ns, opts)) } // Patch applies the patch and returns the patched podTemplate. func (c *FakePodTemplates) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *api.PodTemplate, err error) { obj, err := c.Fake. - Invokes(core.NewPatchSubresourceAction(podtemplatesResource, c.ns, name, data, subresources...), &api.PodTemplate{}) + Invokes(testing.NewPatchSubresourceAction(podtemplatesResource, c.ns, name, data, subresources...), &api.PodTemplate{}) if obj == nil { return nil, err diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_replicationcontroller.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_replicationcontroller.go index 219f05f0c47..e7dddbf7976 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_replicationcontroller.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_replicationcontroller.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" api "k8s.io/kubernetes/pkg/api" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeReplicationControllers implements ReplicationControllerInterface @@ -36,7 +36,7 @@ var replicationcontrollersResource = schema.GroupVersionResource{Group: "", Vers func (c *FakeReplicationControllers) Create(replicationController *api.ReplicationController) (result *api.ReplicationController, err error) { obj, err := c.Fake. - Invokes(core.NewCreateAction(replicationcontrollersResource, c.ns, replicationController), &api.ReplicationController{}) + Invokes(testing.NewCreateAction(replicationcontrollersResource, c.ns, replicationController), &api.ReplicationController{}) if obj == nil { return nil, err @@ -46,7 +46,7 @@ func (c *FakeReplicationControllers) Create(replicationController *api.Replicati func (c *FakeReplicationControllers) Update(replicationController *api.ReplicationController) (result *api.ReplicationController, err error) { obj, err := c.Fake. - Invokes(core.NewUpdateAction(replicationcontrollersResource, c.ns, replicationController), &api.ReplicationController{}) + Invokes(testing.NewUpdateAction(replicationcontrollersResource, c.ns, replicationController), &api.ReplicationController{}) if obj == nil { return nil, err @@ -56,7 +56,7 @@ func (c *FakeReplicationControllers) Update(replicationController *api.Replicati func (c *FakeReplicationControllers) UpdateStatus(replicationController *api.ReplicationController) (*api.ReplicationController, error) { obj, err := c.Fake. - Invokes(core.NewUpdateSubresourceAction(replicationcontrollersResource, "status", c.ns, replicationController), &api.ReplicationController{}) + Invokes(testing.NewUpdateSubresourceAction(replicationcontrollersResource, "status", c.ns, replicationController), &api.ReplicationController{}) if obj == nil { return nil, err @@ -66,13 +66,13 @@ func (c *FakeReplicationControllers) UpdateStatus(replicationController *api.Rep func (c *FakeReplicationControllers) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewDeleteAction(replicationcontrollersResource, c.ns, name), &api.ReplicationController{}) + Invokes(testing.NewDeleteAction(replicationcontrollersResource, c.ns, name), &api.ReplicationController{}) return err } func (c *FakeReplicationControllers) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := core.NewDeleteCollectionAction(replicationcontrollersResource, c.ns, listOptions) + action := testing.NewDeleteCollectionAction(replicationcontrollersResource, c.ns, listOptions) _, err := c.Fake.Invokes(action, &api.ReplicationControllerList{}) return err @@ -80,7 +80,7 @@ func (c *FakeReplicationControllers) DeleteCollection(options *v1.DeleteOptions, func (c *FakeReplicationControllers) Get(name string, options v1.GetOptions) (result *api.ReplicationController, err error) { obj, err := c.Fake. - Invokes(core.NewGetAction(replicationcontrollersResource, c.ns, name), &api.ReplicationController{}) + Invokes(testing.NewGetAction(replicationcontrollersResource, c.ns, name), &api.ReplicationController{}) if obj == nil { return nil, err @@ -90,13 +90,13 @@ func (c *FakeReplicationControllers) Get(name string, options v1.GetOptions) (re func (c *FakeReplicationControllers) List(opts v1.ListOptions) (result *api.ReplicationControllerList, err error) { obj, err := c.Fake. - Invokes(core.NewListAction(replicationcontrollersResource, c.ns, opts), &api.ReplicationControllerList{}) + Invokes(testing.NewListAction(replicationcontrollersResource, c.ns, opts), &api.ReplicationControllerList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -112,14 +112,14 @@ func (c *FakeReplicationControllers) List(opts v1.ListOptions) (result *api.Repl // Watch returns a watch.Interface that watches the requested replicationControllers. func (c *FakeReplicationControllers) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewWatchAction(replicationcontrollersResource, c.ns, opts)) + InvokesWatch(testing.NewWatchAction(replicationcontrollersResource, c.ns, opts)) } // Patch applies the patch and returns the patched replicationController. func (c *FakeReplicationControllers) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *api.ReplicationController, err error) { obj, err := c.Fake. - Invokes(core.NewPatchSubresourceAction(replicationcontrollersResource, c.ns, name, data, subresources...), &api.ReplicationController{}) + Invokes(testing.NewPatchSubresourceAction(replicationcontrollersResource, c.ns, name, data, subresources...), &api.ReplicationController{}) if obj == nil { return nil, err diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_resourcequota.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_resourcequota.go index 8b43ed6df29..9d0e4dda220 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_resourcequota.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_resourcequota.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" api "k8s.io/kubernetes/pkg/api" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeResourceQuotas implements ResourceQuotaInterface @@ -36,7 +36,7 @@ var resourcequotasResource = schema.GroupVersionResource{Group: "", Version: "", func (c *FakeResourceQuotas) Create(resourceQuota *api.ResourceQuota) (result *api.ResourceQuota, err error) { obj, err := c.Fake. - Invokes(core.NewCreateAction(resourcequotasResource, c.ns, resourceQuota), &api.ResourceQuota{}) + Invokes(testing.NewCreateAction(resourcequotasResource, c.ns, resourceQuota), &api.ResourceQuota{}) if obj == nil { return nil, err @@ -46,7 +46,7 @@ func (c *FakeResourceQuotas) Create(resourceQuota *api.ResourceQuota) (result *a func (c *FakeResourceQuotas) Update(resourceQuota *api.ResourceQuota) (result *api.ResourceQuota, err error) { obj, err := c.Fake. - Invokes(core.NewUpdateAction(resourcequotasResource, c.ns, resourceQuota), &api.ResourceQuota{}) + Invokes(testing.NewUpdateAction(resourcequotasResource, c.ns, resourceQuota), &api.ResourceQuota{}) if obj == nil { return nil, err @@ -56,7 +56,7 @@ func (c *FakeResourceQuotas) Update(resourceQuota *api.ResourceQuota) (result *a func (c *FakeResourceQuotas) UpdateStatus(resourceQuota *api.ResourceQuota) (*api.ResourceQuota, error) { obj, err := c.Fake. - Invokes(core.NewUpdateSubresourceAction(resourcequotasResource, "status", c.ns, resourceQuota), &api.ResourceQuota{}) + Invokes(testing.NewUpdateSubresourceAction(resourcequotasResource, "status", c.ns, resourceQuota), &api.ResourceQuota{}) if obj == nil { return nil, err @@ -66,13 +66,13 @@ func (c *FakeResourceQuotas) UpdateStatus(resourceQuota *api.ResourceQuota) (*ap func (c *FakeResourceQuotas) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewDeleteAction(resourcequotasResource, c.ns, name), &api.ResourceQuota{}) + Invokes(testing.NewDeleteAction(resourcequotasResource, c.ns, name), &api.ResourceQuota{}) return err } func (c *FakeResourceQuotas) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := core.NewDeleteCollectionAction(resourcequotasResource, c.ns, listOptions) + action := testing.NewDeleteCollectionAction(resourcequotasResource, c.ns, listOptions) _, err := c.Fake.Invokes(action, &api.ResourceQuotaList{}) return err @@ -80,7 +80,7 @@ func (c *FakeResourceQuotas) DeleteCollection(options *v1.DeleteOptions, listOpt func (c *FakeResourceQuotas) Get(name string, options v1.GetOptions) (result *api.ResourceQuota, err error) { obj, err := c.Fake. - Invokes(core.NewGetAction(resourcequotasResource, c.ns, name), &api.ResourceQuota{}) + Invokes(testing.NewGetAction(resourcequotasResource, c.ns, name), &api.ResourceQuota{}) if obj == nil { return nil, err @@ -90,13 +90,13 @@ func (c *FakeResourceQuotas) Get(name string, options v1.GetOptions) (result *ap func (c *FakeResourceQuotas) List(opts v1.ListOptions) (result *api.ResourceQuotaList, err error) { obj, err := c.Fake. - Invokes(core.NewListAction(resourcequotasResource, c.ns, opts), &api.ResourceQuotaList{}) + Invokes(testing.NewListAction(resourcequotasResource, c.ns, opts), &api.ResourceQuotaList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -112,14 +112,14 @@ func (c *FakeResourceQuotas) List(opts v1.ListOptions) (result *api.ResourceQuot // Watch returns a watch.Interface that watches the requested resourceQuotas. func (c *FakeResourceQuotas) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewWatchAction(resourcequotasResource, c.ns, opts)) + InvokesWatch(testing.NewWatchAction(resourcequotasResource, c.ns, opts)) } // Patch applies the patch and returns the patched resourceQuota. func (c *FakeResourceQuotas) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *api.ResourceQuota, err error) { obj, err := c.Fake. - Invokes(core.NewPatchSubresourceAction(resourcequotasResource, c.ns, name, data, subresources...), &api.ResourceQuota{}) + Invokes(testing.NewPatchSubresourceAction(resourcequotasResource, c.ns, name, data, subresources...), &api.ResourceQuota{}) if obj == nil { return nil, err diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_secret.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_secret.go index 76600c49c56..da86133226f 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_secret.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_secret.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" api "k8s.io/kubernetes/pkg/api" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeSecrets implements SecretInterface @@ -36,7 +36,7 @@ var secretsResource = schema.GroupVersionResource{Group: "", Version: "", Resour func (c *FakeSecrets) Create(secret *api.Secret) (result *api.Secret, err error) { obj, err := c.Fake. - Invokes(core.NewCreateAction(secretsResource, c.ns, secret), &api.Secret{}) + Invokes(testing.NewCreateAction(secretsResource, c.ns, secret), &api.Secret{}) if obj == nil { return nil, err @@ -46,7 +46,7 @@ func (c *FakeSecrets) Create(secret *api.Secret) (result *api.Secret, err error) func (c *FakeSecrets) Update(secret *api.Secret) (result *api.Secret, err error) { obj, err := c.Fake. - Invokes(core.NewUpdateAction(secretsResource, c.ns, secret), &api.Secret{}) + Invokes(testing.NewUpdateAction(secretsResource, c.ns, secret), &api.Secret{}) if obj == nil { return nil, err @@ -56,13 +56,13 @@ func (c *FakeSecrets) Update(secret *api.Secret) (result *api.Secret, err error) func (c *FakeSecrets) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewDeleteAction(secretsResource, c.ns, name), &api.Secret{}) + Invokes(testing.NewDeleteAction(secretsResource, c.ns, name), &api.Secret{}) return err } func (c *FakeSecrets) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := core.NewDeleteCollectionAction(secretsResource, c.ns, listOptions) + action := testing.NewDeleteCollectionAction(secretsResource, c.ns, listOptions) _, err := c.Fake.Invokes(action, &api.SecretList{}) return err @@ -70,7 +70,7 @@ func (c *FakeSecrets) DeleteCollection(options *v1.DeleteOptions, listOptions v1 func (c *FakeSecrets) Get(name string, options v1.GetOptions) (result *api.Secret, err error) { obj, err := c.Fake. - Invokes(core.NewGetAction(secretsResource, c.ns, name), &api.Secret{}) + Invokes(testing.NewGetAction(secretsResource, c.ns, name), &api.Secret{}) if obj == nil { return nil, err @@ -80,13 +80,13 @@ func (c *FakeSecrets) Get(name string, options v1.GetOptions) (result *api.Secre func (c *FakeSecrets) List(opts v1.ListOptions) (result *api.SecretList, err error) { obj, err := c.Fake. - Invokes(core.NewListAction(secretsResource, c.ns, opts), &api.SecretList{}) + Invokes(testing.NewListAction(secretsResource, c.ns, opts), &api.SecretList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -102,14 +102,14 @@ func (c *FakeSecrets) List(opts v1.ListOptions) (result *api.SecretList, err err // Watch returns a watch.Interface that watches the requested secrets. func (c *FakeSecrets) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewWatchAction(secretsResource, c.ns, opts)) + InvokesWatch(testing.NewWatchAction(secretsResource, c.ns, opts)) } // Patch applies the patch and returns the patched secret. func (c *FakeSecrets) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *api.Secret, err error) { obj, err := c.Fake. - Invokes(core.NewPatchSubresourceAction(secretsResource, c.ns, name, data, subresources...), &api.Secret{}) + Invokes(testing.NewPatchSubresourceAction(secretsResource, c.ns, name, data, subresources...), &api.Secret{}) if obj == nil { return nil, err diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_service.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_service.go index 8e98d16bd41..e9ccf3b463e 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_service.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_service.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" api "k8s.io/kubernetes/pkg/api" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeServices implements ServiceInterface @@ -36,7 +36,7 @@ var servicesResource = schema.GroupVersionResource{Group: "", Version: "", Resou func (c *FakeServices) Create(service *api.Service) (result *api.Service, err error) { obj, err := c.Fake. - Invokes(core.NewCreateAction(servicesResource, c.ns, service), &api.Service{}) + Invokes(testing.NewCreateAction(servicesResource, c.ns, service), &api.Service{}) if obj == nil { return nil, err @@ -46,7 +46,7 @@ func (c *FakeServices) Create(service *api.Service) (result *api.Service, err er func (c *FakeServices) Update(service *api.Service) (result *api.Service, err error) { obj, err := c.Fake. - Invokes(core.NewUpdateAction(servicesResource, c.ns, service), &api.Service{}) + Invokes(testing.NewUpdateAction(servicesResource, c.ns, service), &api.Service{}) if obj == nil { return nil, err @@ -56,7 +56,7 @@ func (c *FakeServices) Update(service *api.Service) (result *api.Service, err er func (c *FakeServices) UpdateStatus(service *api.Service) (*api.Service, error) { obj, err := c.Fake. - Invokes(core.NewUpdateSubresourceAction(servicesResource, "status", c.ns, service), &api.Service{}) + Invokes(testing.NewUpdateSubresourceAction(servicesResource, "status", c.ns, service), &api.Service{}) if obj == nil { return nil, err @@ -66,13 +66,13 @@ func (c *FakeServices) UpdateStatus(service *api.Service) (*api.Service, error) func (c *FakeServices) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewDeleteAction(servicesResource, c.ns, name), &api.Service{}) + Invokes(testing.NewDeleteAction(servicesResource, c.ns, name), &api.Service{}) return err } func (c *FakeServices) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := core.NewDeleteCollectionAction(servicesResource, c.ns, listOptions) + action := testing.NewDeleteCollectionAction(servicesResource, c.ns, listOptions) _, err := c.Fake.Invokes(action, &api.ServiceList{}) return err @@ -80,7 +80,7 @@ func (c *FakeServices) DeleteCollection(options *v1.DeleteOptions, listOptions v func (c *FakeServices) Get(name string, options v1.GetOptions) (result *api.Service, err error) { obj, err := c.Fake. - Invokes(core.NewGetAction(servicesResource, c.ns, name), &api.Service{}) + Invokes(testing.NewGetAction(servicesResource, c.ns, name), &api.Service{}) if obj == nil { return nil, err @@ -90,13 +90,13 @@ func (c *FakeServices) Get(name string, options v1.GetOptions) (result *api.Serv func (c *FakeServices) List(opts v1.ListOptions) (result *api.ServiceList, err error) { obj, err := c.Fake. - Invokes(core.NewListAction(servicesResource, c.ns, opts), &api.ServiceList{}) + Invokes(testing.NewListAction(servicesResource, c.ns, opts), &api.ServiceList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -112,14 +112,14 @@ func (c *FakeServices) List(opts v1.ListOptions) (result *api.ServiceList, err e // Watch returns a watch.Interface that watches the requested services. func (c *FakeServices) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewWatchAction(servicesResource, c.ns, opts)) + InvokesWatch(testing.NewWatchAction(servicesResource, c.ns, opts)) } // Patch applies the patch and returns the patched service. func (c *FakeServices) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *api.Service, err error) { obj, err := c.Fake. - Invokes(core.NewPatchSubresourceAction(servicesResource, c.ns, name, data, subresources...), &api.Service{}) + Invokes(testing.NewPatchSubresourceAction(servicesResource, c.ns, name, data, subresources...), &api.Service{}) if obj == nil { return nil, err diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_service_expansion.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_service_expansion.go index 51d6fa8d3fd..92e4930d711 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_service_expansion.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_service_expansion.go @@ -18,7 +18,7 @@ package fake import ( restclient "k8s.io/client-go/rest" - "k8s.io/kubernetes/pkg/client/testing/core" + core "k8s.io/client-go/testing" ) func (c *FakeServices) ProxyGet(scheme, name, port, path string, params map[string]string) restclient.ResponseWrapper { diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_serviceaccount.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_serviceaccount.go index 06e58703c0d..2d912abb5e1 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_serviceaccount.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_serviceaccount.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" api "k8s.io/kubernetes/pkg/api" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeServiceAccounts implements ServiceAccountInterface @@ -36,7 +36,7 @@ var serviceaccountsResource = schema.GroupVersionResource{Group: "", Version: "" func (c *FakeServiceAccounts) Create(serviceAccount *api.ServiceAccount) (result *api.ServiceAccount, err error) { obj, err := c.Fake. - Invokes(core.NewCreateAction(serviceaccountsResource, c.ns, serviceAccount), &api.ServiceAccount{}) + Invokes(testing.NewCreateAction(serviceaccountsResource, c.ns, serviceAccount), &api.ServiceAccount{}) if obj == nil { return nil, err @@ -46,7 +46,7 @@ func (c *FakeServiceAccounts) Create(serviceAccount *api.ServiceAccount) (result func (c *FakeServiceAccounts) Update(serviceAccount *api.ServiceAccount) (result *api.ServiceAccount, err error) { obj, err := c.Fake. - Invokes(core.NewUpdateAction(serviceaccountsResource, c.ns, serviceAccount), &api.ServiceAccount{}) + Invokes(testing.NewUpdateAction(serviceaccountsResource, c.ns, serviceAccount), &api.ServiceAccount{}) if obj == nil { return nil, err @@ -56,13 +56,13 @@ func (c *FakeServiceAccounts) Update(serviceAccount *api.ServiceAccount) (result func (c *FakeServiceAccounts) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewDeleteAction(serviceaccountsResource, c.ns, name), &api.ServiceAccount{}) + Invokes(testing.NewDeleteAction(serviceaccountsResource, c.ns, name), &api.ServiceAccount{}) return err } func (c *FakeServiceAccounts) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := core.NewDeleteCollectionAction(serviceaccountsResource, c.ns, listOptions) + action := testing.NewDeleteCollectionAction(serviceaccountsResource, c.ns, listOptions) _, err := c.Fake.Invokes(action, &api.ServiceAccountList{}) return err @@ -70,7 +70,7 @@ func (c *FakeServiceAccounts) DeleteCollection(options *v1.DeleteOptions, listOp func (c *FakeServiceAccounts) Get(name string, options v1.GetOptions) (result *api.ServiceAccount, err error) { obj, err := c.Fake. - Invokes(core.NewGetAction(serviceaccountsResource, c.ns, name), &api.ServiceAccount{}) + Invokes(testing.NewGetAction(serviceaccountsResource, c.ns, name), &api.ServiceAccount{}) if obj == nil { return nil, err @@ -80,13 +80,13 @@ func (c *FakeServiceAccounts) Get(name string, options v1.GetOptions) (result *a func (c *FakeServiceAccounts) List(opts v1.ListOptions) (result *api.ServiceAccountList, err error) { obj, err := c.Fake. - Invokes(core.NewListAction(serviceaccountsResource, c.ns, opts), &api.ServiceAccountList{}) + Invokes(testing.NewListAction(serviceaccountsResource, c.ns, opts), &api.ServiceAccountList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -102,14 +102,14 @@ func (c *FakeServiceAccounts) List(opts v1.ListOptions) (result *api.ServiceAcco // Watch returns a watch.Interface that watches the requested serviceAccounts. func (c *FakeServiceAccounts) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewWatchAction(serviceaccountsResource, c.ns, opts)) + InvokesWatch(testing.NewWatchAction(serviceaccountsResource, c.ns, opts)) } // Patch applies the patch and returns the patched serviceAccount. func (c *FakeServiceAccounts) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *api.ServiceAccount, err error) { obj, err := c.Fake. - Invokes(core.NewPatchSubresourceAction(serviceaccountsResource, c.ns, name, data, subresources...), &api.ServiceAccount{}) + Invokes(testing.NewPatchSubresourceAction(serviceaccountsResource, c.ns, name, data, subresources...), &api.ServiceAccount{}) if obj == nil { return nil, err diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/BUILD b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/BUILD index d5c37a39d96..6c437a39fd5 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/BUILD +++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/BUILD @@ -27,13 +27,13 @@ go_library( deps = [ "//pkg/apis/extensions:go_default_library", "//pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion:go_default_library", - "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/testing", ], ) diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_daemonset.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_daemonset.go index 9235189848a..54abeb4ed99 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_daemonset.go +++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_daemonset.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" extensions "k8s.io/kubernetes/pkg/apis/extensions" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeDaemonSets implements DaemonSetInterface @@ -36,7 +36,7 @@ var daemonsetsResource = schema.GroupVersionResource{Group: "extensions", Versio func (c *FakeDaemonSets) Create(daemonSet *extensions.DaemonSet) (result *extensions.DaemonSet, err error) { obj, err := c.Fake. - Invokes(core.NewCreateAction(daemonsetsResource, c.ns, daemonSet), &extensions.DaemonSet{}) + Invokes(testing.NewCreateAction(daemonsetsResource, c.ns, daemonSet), &extensions.DaemonSet{}) if obj == nil { return nil, err @@ -46,7 +46,7 @@ func (c *FakeDaemonSets) Create(daemonSet *extensions.DaemonSet) (result *extens func (c *FakeDaemonSets) Update(daemonSet *extensions.DaemonSet) (result *extensions.DaemonSet, err error) { obj, err := c.Fake. - Invokes(core.NewUpdateAction(daemonsetsResource, c.ns, daemonSet), &extensions.DaemonSet{}) + Invokes(testing.NewUpdateAction(daemonsetsResource, c.ns, daemonSet), &extensions.DaemonSet{}) if obj == nil { return nil, err @@ -56,7 +56,7 @@ func (c *FakeDaemonSets) Update(daemonSet *extensions.DaemonSet) (result *extens func (c *FakeDaemonSets) UpdateStatus(daemonSet *extensions.DaemonSet) (*extensions.DaemonSet, error) { obj, err := c.Fake. - Invokes(core.NewUpdateSubresourceAction(daemonsetsResource, "status", c.ns, daemonSet), &extensions.DaemonSet{}) + Invokes(testing.NewUpdateSubresourceAction(daemonsetsResource, "status", c.ns, daemonSet), &extensions.DaemonSet{}) if obj == nil { return nil, err @@ -66,13 +66,13 @@ func (c *FakeDaemonSets) UpdateStatus(daemonSet *extensions.DaemonSet) (*extensi func (c *FakeDaemonSets) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewDeleteAction(daemonsetsResource, c.ns, name), &extensions.DaemonSet{}) + Invokes(testing.NewDeleteAction(daemonsetsResource, c.ns, name), &extensions.DaemonSet{}) return err } func (c *FakeDaemonSets) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := core.NewDeleteCollectionAction(daemonsetsResource, c.ns, listOptions) + action := testing.NewDeleteCollectionAction(daemonsetsResource, c.ns, listOptions) _, err := c.Fake.Invokes(action, &extensions.DaemonSetList{}) return err @@ -80,7 +80,7 @@ func (c *FakeDaemonSets) DeleteCollection(options *v1.DeleteOptions, listOptions func (c *FakeDaemonSets) Get(name string, options v1.GetOptions) (result *extensions.DaemonSet, err error) { obj, err := c.Fake. - Invokes(core.NewGetAction(daemonsetsResource, c.ns, name), &extensions.DaemonSet{}) + Invokes(testing.NewGetAction(daemonsetsResource, c.ns, name), &extensions.DaemonSet{}) if obj == nil { return nil, err @@ -90,13 +90,13 @@ func (c *FakeDaemonSets) Get(name string, options v1.GetOptions) (result *extens func (c *FakeDaemonSets) List(opts v1.ListOptions) (result *extensions.DaemonSetList, err error) { obj, err := c.Fake. - Invokes(core.NewListAction(daemonsetsResource, c.ns, opts), &extensions.DaemonSetList{}) + Invokes(testing.NewListAction(daemonsetsResource, c.ns, opts), &extensions.DaemonSetList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -112,14 +112,14 @@ func (c *FakeDaemonSets) List(opts v1.ListOptions) (result *extensions.DaemonSet // Watch returns a watch.Interface that watches the requested daemonSets. func (c *FakeDaemonSets) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewWatchAction(daemonsetsResource, c.ns, opts)) + InvokesWatch(testing.NewWatchAction(daemonsetsResource, c.ns, opts)) } // Patch applies the patch and returns the patched daemonSet. func (c *FakeDaemonSets) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *extensions.DaemonSet, err error) { obj, err := c.Fake. - Invokes(core.NewPatchSubresourceAction(daemonsetsResource, c.ns, name, data, subresources...), &extensions.DaemonSet{}) + Invokes(testing.NewPatchSubresourceAction(daemonsetsResource, c.ns, name, data, subresources...), &extensions.DaemonSet{}) if obj == nil { return nil, err diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_deployment.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_deployment.go index 0155cff36b3..32de2c1f934 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_deployment.go +++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_deployment.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" extensions "k8s.io/kubernetes/pkg/apis/extensions" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeDeployments implements DeploymentInterface @@ -36,7 +36,7 @@ var deploymentsResource = schema.GroupVersionResource{Group: "extensions", Versi func (c *FakeDeployments) Create(deployment *extensions.Deployment) (result *extensions.Deployment, err error) { obj, err := c.Fake. - Invokes(core.NewCreateAction(deploymentsResource, c.ns, deployment), &extensions.Deployment{}) + Invokes(testing.NewCreateAction(deploymentsResource, c.ns, deployment), &extensions.Deployment{}) if obj == nil { return nil, err @@ -46,7 +46,7 @@ func (c *FakeDeployments) Create(deployment *extensions.Deployment) (result *ext func (c *FakeDeployments) Update(deployment *extensions.Deployment) (result *extensions.Deployment, err error) { obj, err := c.Fake. - Invokes(core.NewUpdateAction(deploymentsResource, c.ns, deployment), &extensions.Deployment{}) + Invokes(testing.NewUpdateAction(deploymentsResource, c.ns, deployment), &extensions.Deployment{}) if obj == nil { return nil, err @@ -56,7 +56,7 @@ func (c *FakeDeployments) Update(deployment *extensions.Deployment) (result *ext func (c *FakeDeployments) UpdateStatus(deployment *extensions.Deployment) (*extensions.Deployment, error) { obj, err := c.Fake. - Invokes(core.NewUpdateSubresourceAction(deploymentsResource, "status", c.ns, deployment), &extensions.Deployment{}) + Invokes(testing.NewUpdateSubresourceAction(deploymentsResource, "status", c.ns, deployment), &extensions.Deployment{}) if obj == nil { return nil, err @@ -66,13 +66,13 @@ func (c *FakeDeployments) UpdateStatus(deployment *extensions.Deployment) (*exte func (c *FakeDeployments) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewDeleteAction(deploymentsResource, c.ns, name), &extensions.Deployment{}) + Invokes(testing.NewDeleteAction(deploymentsResource, c.ns, name), &extensions.Deployment{}) return err } func (c *FakeDeployments) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := core.NewDeleteCollectionAction(deploymentsResource, c.ns, listOptions) + action := testing.NewDeleteCollectionAction(deploymentsResource, c.ns, listOptions) _, err := c.Fake.Invokes(action, &extensions.DeploymentList{}) return err @@ -80,7 +80,7 @@ func (c *FakeDeployments) DeleteCollection(options *v1.DeleteOptions, listOption func (c *FakeDeployments) Get(name string, options v1.GetOptions) (result *extensions.Deployment, err error) { obj, err := c.Fake. - Invokes(core.NewGetAction(deploymentsResource, c.ns, name), &extensions.Deployment{}) + Invokes(testing.NewGetAction(deploymentsResource, c.ns, name), &extensions.Deployment{}) if obj == nil { return nil, err @@ -90,13 +90,13 @@ func (c *FakeDeployments) Get(name string, options v1.GetOptions) (result *exten func (c *FakeDeployments) List(opts v1.ListOptions) (result *extensions.DeploymentList, err error) { obj, err := c.Fake. - Invokes(core.NewListAction(deploymentsResource, c.ns, opts), &extensions.DeploymentList{}) + Invokes(testing.NewListAction(deploymentsResource, c.ns, opts), &extensions.DeploymentList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -112,14 +112,14 @@ func (c *FakeDeployments) List(opts v1.ListOptions) (result *extensions.Deployme // Watch returns a watch.Interface that watches the requested deployments. func (c *FakeDeployments) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewWatchAction(deploymentsResource, c.ns, opts)) + InvokesWatch(testing.NewWatchAction(deploymentsResource, c.ns, opts)) } // Patch applies the patch and returns the patched deployment. func (c *FakeDeployments) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *extensions.Deployment, err error) { obj, err := c.Fake. - Invokes(core.NewPatchSubresourceAction(deploymentsResource, c.ns, name, data, subresources...), &extensions.Deployment{}) + Invokes(testing.NewPatchSubresourceAction(deploymentsResource, c.ns, name, data, subresources...), &extensions.Deployment{}) if obj == nil { return nil, err diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_deployment_expansion.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_deployment_expansion.go index 8b73f41073f..eec9d55d952 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_deployment_expansion.go +++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_deployment_expansion.go @@ -17,8 +17,8 @@ limitations under the License. package fake import ( + core "k8s.io/client-go/testing" "k8s.io/kubernetes/pkg/apis/extensions" - "k8s.io/kubernetes/pkg/client/testing/core" ) func (c *FakeDeployments) Rollback(deploymentRollback *extensions.DeploymentRollback) error { diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_extensions_client.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_extensions_client.go index b8577c43c75..252399db4bb 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_extensions_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_extensions_client.go @@ -18,12 +18,12 @@ package fake import ( rest "k8s.io/client-go/rest" + testing "k8s.io/client-go/testing" internalversion "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion" - core "k8s.io/kubernetes/pkg/client/testing/core" ) type FakeExtensions struct { - *core.Fake + *testing.Fake } func (c *FakeExtensions) DaemonSets(namespace string) internalversion.DaemonSetInterface { diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_ingress.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_ingress.go index 7521342ecd4..5d475f15dd0 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_ingress.go +++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_ingress.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" extensions "k8s.io/kubernetes/pkg/apis/extensions" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeIngresses implements IngressInterface @@ -36,7 +36,7 @@ var ingressesResource = schema.GroupVersionResource{Group: "extensions", Version func (c *FakeIngresses) Create(ingress *extensions.Ingress) (result *extensions.Ingress, err error) { obj, err := c.Fake. - Invokes(core.NewCreateAction(ingressesResource, c.ns, ingress), &extensions.Ingress{}) + Invokes(testing.NewCreateAction(ingressesResource, c.ns, ingress), &extensions.Ingress{}) if obj == nil { return nil, err @@ -46,7 +46,7 @@ func (c *FakeIngresses) Create(ingress *extensions.Ingress) (result *extensions. func (c *FakeIngresses) Update(ingress *extensions.Ingress) (result *extensions.Ingress, err error) { obj, err := c.Fake. - Invokes(core.NewUpdateAction(ingressesResource, c.ns, ingress), &extensions.Ingress{}) + Invokes(testing.NewUpdateAction(ingressesResource, c.ns, ingress), &extensions.Ingress{}) if obj == nil { return nil, err @@ -56,7 +56,7 @@ func (c *FakeIngresses) Update(ingress *extensions.Ingress) (result *extensions. func (c *FakeIngresses) UpdateStatus(ingress *extensions.Ingress) (*extensions.Ingress, error) { obj, err := c.Fake. - Invokes(core.NewUpdateSubresourceAction(ingressesResource, "status", c.ns, ingress), &extensions.Ingress{}) + Invokes(testing.NewUpdateSubresourceAction(ingressesResource, "status", c.ns, ingress), &extensions.Ingress{}) if obj == nil { return nil, err @@ -66,13 +66,13 @@ func (c *FakeIngresses) UpdateStatus(ingress *extensions.Ingress) (*extensions.I func (c *FakeIngresses) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewDeleteAction(ingressesResource, c.ns, name), &extensions.Ingress{}) + Invokes(testing.NewDeleteAction(ingressesResource, c.ns, name), &extensions.Ingress{}) return err } func (c *FakeIngresses) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := core.NewDeleteCollectionAction(ingressesResource, c.ns, listOptions) + action := testing.NewDeleteCollectionAction(ingressesResource, c.ns, listOptions) _, err := c.Fake.Invokes(action, &extensions.IngressList{}) return err @@ -80,7 +80,7 @@ func (c *FakeIngresses) DeleteCollection(options *v1.DeleteOptions, listOptions func (c *FakeIngresses) Get(name string, options v1.GetOptions) (result *extensions.Ingress, err error) { obj, err := c.Fake. - Invokes(core.NewGetAction(ingressesResource, c.ns, name), &extensions.Ingress{}) + Invokes(testing.NewGetAction(ingressesResource, c.ns, name), &extensions.Ingress{}) if obj == nil { return nil, err @@ -90,13 +90,13 @@ func (c *FakeIngresses) Get(name string, options v1.GetOptions) (result *extensi func (c *FakeIngresses) List(opts v1.ListOptions) (result *extensions.IngressList, err error) { obj, err := c.Fake. - Invokes(core.NewListAction(ingressesResource, c.ns, opts), &extensions.IngressList{}) + Invokes(testing.NewListAction(ingressesResource, c.ns, opts), &extensions.IngressList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -112,14 +112,14 @@ func (c *FakeIngresses) List(opts v1.ListOptions) (result *extensions.IngressLis // Watch returns a watch.Interface that watches the requested ingresses. func (c *FakeIngresses) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewWatchAction(ingressesResource, c.ns, opts)) + InvokesWatch(testing.NewWatchAction(ingressesResource, c.ns, opts)) } // Patch applies the patch and returns the patched ingress. func (c *FakeIngresses) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *extensions.Ingress, err error) { obj, err := c.Fake. - Invokes(core.NewPatchSubresourceAction(ingressesResource, c.ns, name, data, subresources...), &extensions.Ingress{}) + Invokes(testing.NewPatchSubresourceAction(ingressesResource, c.ns, name, data, subresources...), &extensions.Ingress{}) if obj == nil { return nil, err diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_networkpolicy.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_networkpolicy.go index cbf45badd95..058400014f9 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_networkpolicy.go +++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_networkpolicy.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" extensions "k8s.io/kubernetes/pkg/apis/extensions" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeNetworkPolicies implements NetworkPolicyInterface @@ -36,7 +36,7 @@ var networkpoliciesResource = schema.GroupVersionResource{Group: "extensions", V func (c *FakeNetworkPolicies) Create(networkPolicy *extensions.NetworkPolicy) (result *extensions.NetworkPolicy, err error) { obj, err := c.Fake. - Invokes(core.NewCreateAction(networkpoliciesResource, c.ns, networkPolicy), &extensions.NetworkPolicy{}) + Invokes(testing.NewCreateAction(networkpoliciesResource, c.ns, networkPolicy), &extensions.NetworkPolicy{}) if obj == nil { return nil, err @@ -46,7 +46,7 @@ func (c *FakeNetworkPolicies) Create(networkPolicy *extensions.NetworkPolicy) (r func (c *FakeNetworkPolicies) Update(networkPolicy *extensions.NetworkPolicy) (result *extensions.NetworkPolicy, err error) { obj, err := c.Fake. - Invokes(core.NewUpdateAction(networkpoliciesResource, c.ns, networkPolicy), &extensions.NetworkPolicy{}) + Invokes(testing.NewUpdateAction(networkpoliciesResource, c.ns, networkPolicy), &extensions.NetworkPolicy{}) if obj == nil { return nil, err @@ -56,13 +56,13 @@ func (c *FakeNetworkPolicies) Update(networkPolicy *extensions.NetworkPolicy) (r func (c *FakeNetworkPolicies) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewDeleteAction(networkpoliciesResource, c.ns, name), &extensions.NetworkPolicy{}) + Invokes(testing.NewDeleteAction(networkpoliciesResource, c.ns, name), &extensions.NetworkPolicy{}) return err } func (c *FakeNetworkPolicies) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := core.NewDeleteCollectionAction(networkpoliciesResource, c.ns, listOptions) + action := testing.NewDeleteCollectionAction(networkpoliciesResource, c.ns, listOptions) _, err := c.Fake.Invokes(action, &extensions.NetworkPolicyList{}) return err @@ -70,7 +70,7 @@ func (c *FakeNetworkPolicies) DeleteCollection(options *v1.DeleteOptions, listOp func (c *FakeNetworkPolicies) Get(name string, options v1.GetOptions) (result *extensions.NetworkPolicy, err error) { obj, err := c.Fake. - Invokes(core.NewGetAction(networkpoliciesResource, c.ns, name), &extensions.NetworkPolicy{}) + Invokes(testing.NewGetAction(networkpoliciesResource, c.ns, name), &extensions.NetworkPolicy{}) if obj == nil { return nil, err @@ -80,13 +80,13 @@ func (c *FakeNetworkPolicies) Get(name string, options v1.GetOptions) (result *e func (c *FakeNetworkPolicies) List(opts v1.ListOptions) (result *extensions.NetworkPolicyList, err error) { obj, err := c.Fake. - Invokes(core.NewListAction(networkpoliciesResource, c.ns, opts), &extensions.NetworkPolicyList{}) + Invokes(testing.NewListAction(networkpoliciesResource, c.ns, opts), &extensions.NetworkPolicyList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -102,14 +102,14 @@ func (c *FakeNetworkPolicies) List(opts v1.ListOptions) (result *extensions.Netw // Watch returns a watch.Interface that watches the requested networkPolicies. func (c *FakeNetworkPolicies) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewWatchAction(networkpoliciesResource, c.ns, opts)) + InvokesWatch(testing.NewWatchAction(networkpoliciesResource, c.ns, opts)) } // Patch applies the patch and returns the patched networkPolicy. func (c *FakeNetworkPolicies) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *extensions.NetworkPolicy, err error) { obj, err := c.Fake. - Invokes(core.NewPatchSubresourceAction(networkpoliciesResource, c.ns, name, data, subresources...), &extensions.NetworkPolicy{}) + Invokes(testing.NewPatchSubresourceAction(networkpoliciesResource, c.ns, name, data, subresources...), &extensions.NetworkPolicy{}) if obj == nil { return nil, err diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_podsecuritypolicy.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_podsecuritypolicy.go index 59850bf94b6..ba10aa7685d 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_podsecuritypolicy.go +++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_podsecuritypolicy.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" extensions "k8s.io/kubernetes/pkg/apis/extensions" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakePodSecurityPolicies implements PodSecurityPolicyInterface @@ -35,7 +35,7 @@ var podsecuritypoliciesResource = schema.GroupVersionResource{Group: "extensions func (c *FakePodSecurityPolicies) Create(podSecurityPolicy *extensions.PodSecurityPolicy) (result *extensions.PodSecurityPolicy, err error) { obj, err := c.Fake. - Invokes(core.NewRootCreateAction(podsecuritypoliciesResource, podSecurityPolicy), &extensions.PodSecurityPolicy{}) + Invokes(testing.NewRootCreateAction(podsecuritypoliciesResource, podSecurityPolicy), &extensions.PodSecurityPolicy{}) if obj == nil { return nil, err } @@ -44,7 +44,7 @@ func (c *FakePodSecurityPolicies) Create(podSecurityPolicy *extensions.PodSecuri func (c *FakePodSecurityPolicies) Update(podSecurityPolicy *extensions.PodSecurityPolicy) (result *extensions.PodSecurityPolicy, err error) { obj, err := c.Fake. - Invokes(core.NewRootUpdateAction(podsecuritypoliciesResource, podSecurityPolicy), &extensions.PodSecurityPolicy{}) + Invokes(testing.NewRootUpdateAction(podsecuritypoliciesResource, podSecurityPolicy), &extensions.PodSecurityPolicy{}) if obj == nil { return nil, err } @@ -53,12 +53,12 @@ func (c *FakePodSecurityPolicies) Update(podSecurityPolicy *extensions.PodSecuri func (c *FakePodSecurityPolicies) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewRootDeleteAction(podsecuritypoliciesResource, name), &extensions.PodSecurityPolicy{}) + Invokes(testing.NewRootDeleteAction(podsecuritypoliciesResource, name), &extensions.PodSecurityPolicy{}) return err } func (c *FakePodSecurityPolicies) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := core.NewRootDeleteCollectionAction(podsecuritypoliciesResource, listOptions) + action := testing.NewRootDeleteCollectionAction(podsecuritypoliciesResource, listOptions) _, err := c.Fake.Invokes(action, &extensions.PodSecurityPolicyList{}) return err @@ -66,7 +66,7 @@ func (c *FakePodSecurityPolicies) DeleteCollection(options *v1.DeleteOptions, li func (c *FakePodSecurityPolicies) Get(name string, options v1.GetOptions) (result *extensions.PodSecurityPolicy, err error) { obj, err := c.Fake. - Invokes(core.NewRootGetAction(podsecuritypoliciesResource, name), &extensions.PodSecurityPolicy{}) + Invokes(testing.NewRootGetAction(podsecuritypoliciesResource, name), &extensions.PodSecurityPolicy{}) if obj == nil { return nil, err } @@ -75,12 +75,12 @@ func (c *FakePodSecurityPolicies) Get(name string, options v1.GetOptions) (resul func (c *FakePodSecurityPolicies) List(opts v1.ListOptions) (result *extensions.PodSecurityPolicyList, err error) { obj, err := c.Fake. - Invokes(core.NewRootListAction(podsecuritypoliciesResource, opts), &extensions.PodSecurityPolicyList{}) + Invokes(testing.NewRootListAction(podsecuritypoliciesResource, opts), &extensions.PodSecurityPolicyList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -96,13 +96,13 @@ func (c *FakePodSecurityPolicies) List(opts v1.ListOptions) (result *extensions. // Watch returns a watch.Interface that watches the requested podSecurityPolicies. func (c *FakePodSecurityPolicies) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewRootWatchAction(podsecuritypoliciesResource, opts)) + InvokesWatch(testing.NewRootWatchAction(podsecuritypoliciesResource, opts)) } // Patch applies the patch and returns the patched podSecurityPolicy. func (c *FakePodSecurityPolicies) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *extensions.PodSecurityPolicy, err error) { obj, err := c.Fake. - Invokes(core.NewRootPatchSubresourceAction(podsecuritypoliciesResource, name, data, subresources...), &extensions.PodSecurityPolicy{}) + Invokes(testing.NewRootPatchSubresourceAction(podsecuritypoliciesResource, name, data, subresources...), &extensions.PodSecurityPolicy{}) if obj == nil { return nil, err } diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_replicaset.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_replicaset.go index 3fe846e605e..d329869fc97 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_replicaset.go +++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_replicaset.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" extensions "k8s.io/kubernetes/pkg/apis/extensions" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeReplicaSets implements ReplicaSetInterface @@ -36,7 +36,7 @@ var replicasetsResource = schema.GroupVersionResource{Group: "extensions", Versi func (c *FakeReplicaSets) Create(replicaSet *extensions.ReplicaSet) (result *extensions.ReplicaSet, err error) { obj, err := c.Fake. - Invokes(core.NewCreateAction(replicasetsResource, c.ns, replicaSet), &extensions.ReplicaSet{}) + Invokes(testing.NewCreateAction(replicasetsResource, c.ns, replicaSet), &extensions.ReplicaSet{}) if obj == nil { return nil, err @@ -46,7 +46,7 @@ func (c *FakeReplicaSets) Create(replicaSet *extensions.ReplicaSet) (result *ext func (c *FakeReplicaSets) Update(replicaSet *extensions.ReplicaSet) (result *extensions.ReplicaSet, err error) { obj, err := c.Fake. - Invokes(core.NewUpdateAction(replicasetsResource, c.ns, replicaSet), &extensions.ReplicaSet{}) + Invokes(testing.NewUpdateAction(replicasetsResource, c.ns, replicaSet), &extensions.ReplicaSet{}) if obj == nil { return nil, err @@ -56,7 +56,7 @@ func (c *FakeReplicaSets) Update(replicaSet *extensions.ReplicaSet) (result *ext func (c *FakeReplicaSets) UpdateStatus(replicaSet *extensions.ReplicaSet) (*extensions.ReplicaSet, error) { obj, err := c.Fake. - Invokes(core.NewUpdateSubresourceAction(replicasetsResource, "status", c.ns, replicaSet), &extensions.ReplicaSet{}) + Invokes(testing.NewUpdateSubresourceAction(replicasetsResource, "status", c.ns, replicaSet), &extensions.ReplicaSet{}) if obj == nil { return nil, err @@ -66,13 +66,13 @@ func (c *FakeReplicaSets) UpdateStatus(replicaSet *extensions.ReplicaSet) (*exte func (c *FakeReplicaSets) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewDeleteAction(replicasetsResource, c.ns, name), &extensions.ReplicaSet{}) + Invokes(testing.NewDeleteAction(replicasetsResource, c.ns, name), &extensions.ReplicaSet{}) return err } func (c *FakeReplicaSets) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := core.NewDeleteCollectionAction(replicasetsResource, c.ns, listOptions) + action := testing.NewDeleteCollectionAction(replicasetsResource, c.ns, listOptions) _, err := c.Fake.Invokes(action, &extensions.ReplicaSetList{}) return err @@ -80,7 +80,7 @@ func (c *FakeReplicaSets) DeleteCollection(options *v1.DeleteOptions, listOption func (c *FakeReplicaSets) Get(name string, options v1.GetOptions) (result *extensions.ReplicaSet, err error) { obj, err := c.Fake. - Invokes(core.NewGetAction(replicasetsResource, c.ns, name), &extensions.ReplicaSet{}) + Invokes(testing.NewGetAction(replicasetsResource, c.ns, name), &extensions.ReplicaSet{}) if obj == nil { return nil, err @@ -90,13 +90,13 @@ func (c *FakeReplicaSets) Get(name string, options v1.GetOptions) (result *exten func (c *FakeReplicaSets) List(opts v1.ListOptions) (result *extensions.ReplicaSetList, err error) { obj, err := c.Fake. - Invokes(core.NewListAction(replicasetsResource, c.ns, opts), &extensions.ReplicaSetList{}) + Invokes(testing.NewListAction(replicasetsResource, c.ns, opts), &extensions.ReplicaSetList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -112,14 +112,14 @@ func (c *FakeReplicaSets) List(opts v1.ListOptions) (result *extensions.ReplicaS // Watch returns a watch.Interface that watches the requested replicaSets. func (c *FakeReplicaSets) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewWatchAction(replicasetsResource, c.ns, opts)) + InvokesWatch(testing.NewWatchAction(replicasetsResource, c.ns, opts)) } // Patch applies the patch and returns the patched replicaSet. func (c *FakeReplicaSets) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *extensions.ReplicaSet, err error) { obj, err := c.Fake. - Invokes(core.NewPatchSubresourceAction(replicasetsResource, c.ns, name, data, subresources...), &extensions.ReplicaSet{}) + Invokes(testing.NewPatchSubresourceAction(replicasetsResource, c.ns, name, data, subresources...), &extensions.ReplicaSet{}) if obj == nil { return nil, err diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_scale_expansion.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_scale_expansion.go index 6163e9f8586..4b9413322a0 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_scale_expansion.go +++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_scale_expansion.go @@ -18,8 +18,8 @@ package fake import ( "k8s.io/apimachinery/pkg/runtime/schema" + core "k8s.io/client-go/testing" "k8s.io/kubernetes/pkg/apis/extensions" - "k8s.io/kubernetes/pkg/client/testing/core" ) func (c *FakeScales) Get(kind string, name string) (result *extensions.Scale, err error) { diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_thirdpartyresource.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_thirdpartyresource.go index 56452a829c7..b01714dff2b 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_thirdpartyresource.go +++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_thirdpartyresource.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" extensions "k8s.io/kubernetes/pkg/apis/extensions" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeThirdPartyResources implements ThirdPartyResourceInterface @@ -35,7 +35,7 @@ var thirdpartyresourcesResource = schema.GroupVersionResource{Group: "extensions func (c *FakeThirdPartyResources) Create(thirdPartyResource *extensions.ThirdPartyResource) (result *extensions.ThirdPartyResource, err error) { obj, err := c.Fake. - Invokes(core.NewRootCreateAction(thirdpartyresourcesResource, thirdPartyResource), &extensions.ThirdPartyResource{}) + Invokes(testing.NewRootCreateAction(thirdpartyresourcesResource, thirdPartyResource), &extensions.ThirdPartyResource{}) if obj == nil { return nil, err } @@ -44,7 +44,7 @@ func (c *FakeThirdPartyResources) Create(thirdPartyResource *extensions.ThirdPar func (c *FakeThirdPartyResources) Update(thirdPartyResource *extensions.ThirdPartyResource) (result *extensions.ThirdPartyResource, err error) { obj, err := c.Fake. - Invokes(core.NewRootUpdateAction(thirdpartyresourcesResource, thirdPartyResource), &extensions.ThirdPartyResource{}) + Invokes(testing.NewRootUpdateAction(thirdpartyresourcesResource, thirdPartyResource), &extensions.ThirdPartyResource{}) if obj == nil { return nil, err } @@ -53,12 +53,12 @@ func (c *FakeThirdPartyResources) Update(thirdPartyResource *extensions.ThirdPar func (c *FakeThirdPartyResources) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewRootDeleteAction(thirdpartyresourcesResource, name), &extensions.ThirdPartyResource{}) + Invokes(testing.NewRootDeleteAction(thirdpartyresourcesResource, name), &extensions.ThirdPartyResource{}) return err } func (c *FakeThirdPartyResources) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := core.NewRootDeleteCollectionAction(thirdpartyresourcesResource, listOptions) + action := testing.NewRootDeleteCollectionAction(thirdpartyresourcesResource, listOptions) _, err := c.Fake.Invokes(action, &extensions.ThirdPartyResourceList{}) return err @@ -66,7 +66,7 @@ func (c *FakeThirdPartyResources) DeleteCollection(options *v1.DeleteOptions, li func (c *FakeThirdPartyResources) Get(name string, options v1.GetOptions) (result *extensions.ThirdPartyResource, err error) { obj, err := c.Fake. - Invokes(core.NewRootGetAction(thirdpartyresourcesResource, name), &extensions.ThirdPartyResource{}) + Invokes(testing.NewRootGetAction(thirdpartyresourcesResource, name), &extensions.ThirdPartyResource{}) if obj == nil { return nil, err } @@ -75,12 +75,12 @@ func (c *FakeThirdPartyResources) Get(name string, options v1.GetOptions) (resul func (c *FakeThirdPartyResources) List(opts v1.ListOptions) (result *extensions.ThirdPartyResourceList, err error) { obj, err := c.Fake. - Invokes(core.NewRootListAction(thirdpartyresourcesResource, opts), &extensions.ThirdPartyResourceList{}) + Invokes(testing.NewRootListAction(thirdpartyresourcesResource, opts), &extensions.ThirdPartyResourceList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -96,13 +96,13 @@ func (c *FakeThirdPartyResources) List(opts v1.ListOptions) (result *extensions. // Watch returns a watch.Interface that watches the requested thirdPartyResources. func (c *FakeThirdPartyResources) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewRootWatchAction(thirdpartyresourcesResource, opts)) + InvokesWatch(testing.NewRootWatchAction(thirdpartyresourcesResource, opts)) } // Patch applies the patch and returns the patched thirdPartyResource. func (c *FakeThirdPartyResources) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *extensions.ThirdPartyResource, err error) { obj, err := c.Fake. - Invokes(core.NewRootPatchSubresourceAction(thirdpartyresourcesResource, name, data, subresources...), &extensions.ThirdPartyResource{}) + Invokes(testing.NewRootPatchSubresourceAction(thirdpartyresourcesResource, name, data, subresources...), &extensions.ThirdPartyResource{}) if obj == nil { return nil, err } diff --git a/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/fake/BUILD b/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/fake/BUILD index f8dc49c6504..628443605ee 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/fake/BUILD +++ b/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/fake/BUILD @@ -20,13 +20,13 @@ go_library( deps = [ "//pkg/apis/policy:go_default_library", "//pkg/client/clientset_generated/internalclientset/typed/policy/internalversion:go_default_library", - "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/testing", ], ) diff --git a/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/fake/fake_eviction_expansion.go b/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/fake/fake_eviction_expansion.go index 0d45f20baad..fae6df35061 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/fake/fake_eviction_expansion.go +++ b/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/fake/fake_eviction_expansion.go @@ -18,8 +18,8 @@ package fake import ( "k8s.io/apimachinery/pkg/runtime/schema" + core "k8s.io/client-go/testing" policy "k8s.io/kubernetes/pkg/apis/policy" - core "k8s.io/kubernetes/pkg/client/testing/core" ) func (c *FakeEvictions) Evict(eviction *policy.Eviction) error { diff --git a/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/fake/fake_poddisruptionbudget.go b/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/fake/fake_poddisruptionbudget.go index 1f197c83a9c..2ede16a4e73 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/fake/fake_poddisruptionbudget.go +++ b/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/fake/fake_poddisruptionbudget.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" policy "k8s.io/kubernetes/pkg/apis/policy" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakePodDisruptionBudgets implements PodDisruptionBudgetInterface @@ -36,7 +36,7 @@ var poddisruptionbudgetsResource = schema.GroupVersionResource{Group: "policy", func (c *FakePodDisruptionBudgets) Create(podDisruptionBudget *policy.PodDisruptionBudget) (result *policy.PodDisruptionBudget, err error) { obj, err := c.Fake. - Invokes(core.NewCreateAction(poddisruptionbudgetsResource, c.ns, podDisruptionBudget), &policy.PodDisruptionBudget{}) + Invokes(testing.NewCreateAction(poddisruptionbudgetsResource, c.ns, podDisruptionBudget), &policy.PodDisruptionBudget{}) if obj == nil { return nil, err @@ -46,7 +46,7 @@ func (c *FakePodDisruptionBudgets) Create(podDisruptionBudget *policy.PodDisrupt func (c *FakePodDisruptionBudgets) Update(podDisruptionBudget *policy.PodDisruptionBudget) (result *policy.PodDisruptionBudget, err error) { obj, err := c.Fake. - Invokes(core.NewUpdateAction(poddisruptionbudgetsResource, c.ns, podDisruptionBudget), &policy.PodDisruptionBudget{}) + Invokes(testing.NewUpdateAction(poddisruptionbudgetsResource, c.ns, podDisruptionBudget), &policy.PodDisruptionBudget{}) if obj == nil { return nil, err @@ -56,7 +56,7 @@ func (c *FakePodDisruptionBudgets) Update(podDisruptionBudget *policy.PodDisrupt func (c *FakePodDisruptionBudgets) UpdateStatus(podDisruptionBudget *policy.PodDisruptionBudget) (*policy.PodDisruptionBudget, error) { obj, err := c.Fake. - Invokes(core.NewUpdateSubresourceAction(poddisruptionbudgetsResource, "status", c.ns, podDisruptionBudget), &policy.PodDisruptionBudget{}) + Invokes(testing.NewUpdateSubresourceAction(poddisruptionbudgetsResource, "status", c.ns, podDisruptionBudget), &policy.PodDisruptionBudget{}) if obj == nil { return nil, err @@ -66,13 +66,13 @@ func (c *FakePodDisruptionBudgets) UpdateStatus(podDisruptionBudget *policy.PodD func (c *FakePodDisruptionBudgets) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewDeleteAction(poddisruptionbudgetsResource, c.ns, name), &policy.PodDisruptionBudget{}) + Invokes(testing.NewDeleteAction(poddisruptionbudgetsResource, c.ns, name), &policy.PodDisruptionBudget{}) return err } func (c *FakePodDisruptionBudgets) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := core.NewDeleteCollectionAction(poddisruptionbudgetsResource, c.ns, listOptions) + action := testing.NewDeleteCollectionAction(poddisruptionbudgetsResource, c.ns, listOptions) _, err := c.Fake.Invokes(action, &policy.PodDisruptionBudgetList{}) return err @@ -80,7 +80,7 @@ func (c *FakePodDisruptionBudgets) DeleteCollection(options *v1.DeleteOptions, l func (c *FakePodDisruptionBudgets) Get(name string, options v1.GetOptions) (result *policy.PodDisruptionBudget, err error) { obj, err := c.Fake. - Invokes(core.NewGetAction(poddisruptionbudgetsResource, c.ns, name), &policy.PodDisruptionBudget{}) + Invokes(testing.NewGetAction(poddisruptionbudgetsResource, c.ns, name), &policy.PodDisruptionBudget{}) if obj == nil { return nil, err @@ -90,13 +90,13 @@ func (c *FakePodDisruptionBudgets) Get(name string, options v1.GetOptions) (resu func (c *FakePodDisruptionBudgets) List(opts v1.ListOptions) (result *policy.PodDisruptionBudgetList, err error) { obj, err := c.Fake. - Invokes(core.NewListAction(poddisruptionbudgetsResource, c.ns, opts), &policy.PodDisruptionBudgetList{}) + Invokes(testing.NewListAction(poddisruptionbudgetsResource, c.ns, opts), &policy.PodDisruptionBudgetList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -112,14 +112,14 @@ func (c *FakePodDisruptionBudgets) List(opts v1.ListOptions) (result *policy.Pod // Watch returns a watch.Interface that watches the requested podDisruptionBudgets. func (c *FakePodDisruptionBudgets) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewWatchAction(poddisruptionbudgetsResource, c.ns, opts)) + InvokesWatch(testing.NewWatchAction(poddisruptionbudgetsResource, c.ns, opts)) } // Patch applies the patch and returns the patched podDisruptionBudget. func (c *FakePodDisruptionBudgets) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *policy.PodDisruptionBudget, err error) { obj, err := c.Fake. - Invokes(core.NewPatchSubresourceAction(poddisruptionbudgetsResource, c.ns, name, data, subresources...), &policy.PodDisruptionBudget{}) + Invokes(testing.NewPatchSubresourceAction(poddisruptionbudgetsResource, c.ns, name, data, subresources...), &policy.PodDisruptionBudget{}) if obj == nil { return nil, err diff --git a/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/fake/fake_policy_client.go b/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/fake/fake_policy_client.go index 7f8a472b69c..75012322141 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/fake/fake_policy_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/fake/fake_policy_client.go @@ -18,12 +18,12 @@ package fake import ( rest "k8s.io/client-go/rest" + testing "k8s.io/client-go/testing" internalversion "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion" - core "k8s.io/kubernetes/pkg/client/testing/core" ) type FakePolicy struct { - *core.Fake + *testing.Fake } func (c *FakePolicy) Evictions(namespace string) internalversion.EvictionInterface { diff --git a/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake/BUILD b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake/BUILD index eabec14c1fd..cdf7a997be5 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake/BUILD +++ b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake/BUILD @@ -21,13 +21,13 @@ go_library( deps = [ "//pkg/apis/rbac:go_default_library", "//pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion:go_default_library", - "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/testing", ], ) diff --git a/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake/fake_clusterrole.go b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake/fake_clusterrole.go index 40a2591de8e..b66fb4cbbe8 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake/fake_clusterrole.go +++ b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake/fake_clusterrole.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" rbac "k8s.io/kubernetes/pkg/apis/rbac" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeClusterRoles implements ClusterRoleInterface @@ -35,7 +35,7 @@ var clusterrolesResource = schema.GroupVersionResource{Group: "rbac.authorizatio func (c *FakeClusterRoles) Create(clusterRole *rbac.ClusterRole) (result *rbac.ClusterRole, err error) { obj, err := c.Fake. - Invokes(core.NewRootCreateAction(clusterrolesResource, clusterRole), &rbac.ClusterRole{}) + Invokes(testing.NewRootCreateAction(clusterrolesResource, clusterRole), &rbac.ClusterRole{}) if obj == nil { return nil, err } @@ -44,7 +44,7 @@ func (c *FakeClusterRoles) Create(clusterRole *rbac.ClusterRole) (result *rbac.C func (c *FakeClusterRoles) Update(clusterRole *rbac.ClusterRole) (result *rbac.ClusterRole, err error) { obj, err := c.Fake. - Invokes(core.NewRootUpdateAction(clusterrolesResource, clusterRole), &rbac.ClusterRole{}) + Invokes(testing.NewRootUpdateAction(clusterrolesResource, clusterRole), &rbac.ClusterRole{}) if obj == nil { return nil, err } @@ -53,12 +53,12 @@ func (c *FakeClusterRoles) Update(clusterRole *rbac.ClusterRole) (result *rbac.C func (c *FakeClusterRoles) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewRootDeleteAction(clusterrolesResource, name), &rbac.ClusterRole{}) + Invokes(testing.NewRootDeleteAction(clusterrolesResource, name), &rbac.ClusterRole{}) return err } func (c *FakeClusterRoles) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := core.NewRootDeleteCollectionAction(clusterrolesResource, listOptions) + action := testing.NewRootDeleteCollectionAction(clusterrolesResource, listOptions) _, err := c.Fake.Invokes(action, &rbac.ClusterRoleList{}) return err @@ -66,7 +66,7 @@ func (c *FakeClusterRoles) DeleteCollection(options *v1.DeleteOptions, listOptio func (c *FakeClusterRoles) Get(name string, options v1.GetOptions) (result *rbac.ClusterRole, err error) { obj, err := c.Fake. - Invokes(core.NewRootGetAction(clusterrolesResource, name), &rbac.ClusterRole{}) + Invokes(testing.NewRootGetAction(clusterrolesResource, name), &rbac.ClusterRole{}) if obj == nil { return nil, err } @@ -75,12 +75,12 @@ func (c *FakeClusterRoles) Get(name string, options v1.GetOptions) (result *rbac func (c *FakeClusterRoles) List(opts v1.ListOptions) (result *rbac.ClusterRoleList, err error) { obj, err := c.Fake. - Invokes(core.NewRootListAction(clusterrolesResource, opts), &rbac.ClusterRoleList{}) + Invokes(testing.NewRootListAction(clusterrolesResource, opts), &rbac.ClusterRoleList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -96,13 +96,13 @@ func (c *FakeClusterRoles) List(opts v1.ListOptions) (result *rbac.ClusterRoleLi // Watch returns a watch.Interface that watches the requested clusterRoles. func (c *FakeClusterRoles) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewRootWatchAction(clusterrolesResource, opts)) + InvokesWatch(testing.NewRootWatchAction(clusterrolesResource, opts)) } // Patch applies the patch and returns the patched clusterRole. func (c *FakeClusterRoles) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *rbac.ClusterRole, err error) { obj, err := c.Fake. - Invokes(core.NewRootPatchSubresourceAction(clusterrolesResource, name, data, subresources...), &rbac.ClusterRole{}) + Invokes(testing.NewRootPatchSubresourceAction(clusterrolesResource, name, data, subresources...), &rbac.ClusterRole{}) if obj == nil { return nil, err } diff --git a/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake/fake_clusterrolebinding.go b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake/fake_clusterrolebinding.go index 8be09c5b603..5d8d10ea390 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake/fake_clusterrolebinding.go +++ b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake/fake_clusterrolebinding.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" rbac "k8s.io/kubernetes/pkg/apis/rbac" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeClusterRoleBindings implements ClusterRoleBindingInterface @@ -35,7 +35,7 @@ var clusterrolebindingsResource = schema.GroupVersionResource{Group: "rbac.autho func (c *FakeClusterRoleBindings) Create(clusterRoleBinding *rbac.ClusterRoleBinding) (result *rbac.ClusterRoleBinding, err error) { obj, err := c.Fake. - Invokes(core.NewRootCreateAction(clusterrolebindingsResource, clusterRoleBinding), &rbac.ClusterRoleBinding{}) + Invokes(testing.NewRootCreateAction(clusterrolebindingsResource, clusterRoleBinding), &rbac.ClusterRoleBinding{}) if obj == nil { return nil, err } @@ -44,7 +44,7 @@ func (c *FakeClusterRoleBindings) Create(clusterRoleBinding *rbac.ClusterRoleBin func (c *FakeClusterRoleBindings) Update(clusterRoleBinding *rbac.ClusterRoleBinding) (result *rbac.ClusterRoleBinding, err error) { obj, err := c.Fake. - Invokes(core.NewRootUpdateAction(clusterrolebindingsResource, clusterRoleBinding), &rbac.ClusterRoleBinding{}) + Invokes(testing.NewRootUpdateAction(clusterrolebindingsResource, clusterRoleBinding), &rbac.ClusterRoleBinding{}) if obj == nil { return nil, err } @@ -53,12 +53,12 @@ func (c *FakeClusterRoleBindings) Update(clusterRoleBinding *rbac.ClusterRoleBin func (c *FakeClusterRoleBindings) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewRootDeleteAction(clusterrolebindingsResource, name), &rbac.ClusterRoleBinding{}) + Invokes(testing.NewRootDeleteAction(clusterrolebindingsResource, name), &rbac.ClusterRoleBinding{}) return err } func (c *FakeClusterRoleBindings) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := core.NewRootDeleteCollectionAction(clusterrolebindingsResource, listOptions) + action := testing.NewRootDeleteCollectionAction(clusterrolebindingsResource, listOptions) _, err := c.Fake.Invokes(action, &rbac.ClusterRoleBindingList{}) return err @@ -66,7 +66,7 @@ func (c *FakeClusterRoleBindings) DeleteCollection(options *v1.DeleteOptions, li func (c *FakeClusterRoleBindings) Get(name string, options v1.GetOptions) (result *rbac.ClusterRoleBinding, err error) { obj, err := c.Fake. - Invokes(core.NewRootGetAction(clusterrolebindingsResource, name), &rbac.ClusterRoleBinding{}) + Invokes(testing.NewRootGetAction(clusterrolebindingsResource, name), &rbac.ClusterRoleBinding{}) if obj == nil { return nil, err } @@ -75,12 +75,12 @@ func (c *FakeClusterRoleBindings) Get(name string, options v1.GetOptions) (resul func (c *FakeClusterRoleBindings) List(opts v1.ListOptions) (result *rbac.ClusterRoleBindingList, err error) { obj, err := c.Fake. - Invokes(core.NewRootListAction(clusterrolebindingsResource, opts), &rbac.ClusterRoleBindingList{}) + Invokes(testing.NewRootListAction(clusterrolebindingsResource, opts), &rbac.ClusterRoleBindingList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -96,13 +96,13 @@ func (c *FakeClusterRoleBindings) List(opts v1.ListOptions) (result *rbac.Cluste // Watch returns a watch.Interface that watches the requested clusterRoleBindings. func (c *FakeClusterRoleBindings) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewRootWatchAction(clusterrolebindingsResource, opts)) + InvokesWatch(testing.NewRootWatchAction(clusterrolebindingsResource, opts)) } // Patch applies the patch and returns the patched clusterRoleBinding. func (c *FakeClusterRoleBindings) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *rbac.ClusterRoleBinding, err error) { obj, err := c.Fake. - Invokes(core.NewRootPatchSubresourceAction(clusterrolebindingsResource, name, data, subresources...), &rbac.ClusterRoleBinding{}) + Invokes(testing.NewRootPatchSubresourceAction(clusterrolebindingsResource, name, data, subresources...), &rbac.ClusterRoleBinding{}) if obj == nil { return nil, err } diff --git a/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake/fake_rbac_client.go b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake/fake_rbac_client.go index 0e94ed91fcb..ab1f8b30a86 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake/fake_rbac_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake/fake_rbac_client.go @@ -18,12 +18,12 @@ package fake import ( rest "k8s.io/client-go/rest" + testing "k8s.io/client-go/testing" internalversion "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion" - core "k8s.io/kubernetes/pkg/client/testing/core" ) type FakeRbac struct { - *core.Fake + *testing.Fake } func (c *FakeRbac) ClusterRoles() internalversion.ClusterRoleInterface { diff --git a/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake/fake_role.go b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake/fake_role.go index eb6eae7a2dd..0ef13d481a8 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake/fake_role.go +++ b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake/fake_role.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" rbac "k8s.io/kubernetes/pkg/apis/rbac" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeRoles implements RoleInterface @@ -36,7 +36,7 @@ var rolesResource = schema.GroupVersionResource{Group: "rbac.authorization.k8s.i func (c *FakeRoles) Create(role *rbac.Role) (result *rbac.Role, err error) { obj, err := c.Fake. - Invokes(core.NewCreateAction(rolesResource, c.ns, role), &rbac.Role{}) + Invokes(testing.NewCreateAction(rolesResource, c.ns, role), &rbac.Role{}) if obj == nil { return nil, err @@ -46,7 +46,7 @@ func (c *FakeRoles) Create(role *rbac.Role) (result *rbac.Role, err error) { func (c *FakeRoles) Update(role *rbac.Role) (result *rbac.Role, err error) { obj, err := c.Fake. - Invokes(core.NewUpdateAction(rolesResource, c.ns, role), &rbac.Role{}) + Invokes(testing.NewUpdateAction(rolesResource, c.ns, role), &rbac.Role{}) if obj == nil { return nil, err @@ -56,13 +56,13 @@ func (c *FakeRoles) Update(role *rbac.Role) (result *rbac.Role, err error) { func (c *FakeRoles) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewDeleteAction(rolesResource, c.ns, name), &rbac.Role{}) + Invokes(testing.NewDeleteAction(rolesResource, c.ns, name), &rbac.Role{}) return err } func (c *FakeRoles) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := core.NewDeleteCollectionAction(rolesResource, c.ns, listOptions) + action := testing.NewDeleteCollectionAction(rolesResource, c.ns, listOptions) _, err := c.Fake.Invokes(action, &rbac.RoleList{}) return err @@ -70,7 +70,7 @@ func (c *FakeRoles) DeleteCollection(options *v1.DeleteOptions, listOptions v1.L func (c *FakeRoles) Get(name string, options v1.GetOptions) (result *rbac.Role, err error) { obj, err := c.Fake. - Invokes(core.NewGetAction(rolesResource, c.ns, name), &rbac.Role{}) + Invokes(testing.NewGetAction(rolesResource, c.ns, name), &rbac.Role{}) if obj == nil { return nil, err @@ -80,13 +80,13 @@ func (c *FakeRoles) Get(name string, options v1.GetOptions) (result *rbac.Role, func (c *FakeRoles) List(opts v1.ListOptions) (result *rbac.RoleList, err error) { obj, err := c.Fake. - Invokes(core.NewListAction(rolesResource, c.ns, opts), &rbac.RoleList{}) + Invokes(testing.NewListAction(rolesResource, c.ns, opts), &rbac.RoleList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -102,14 +102,14 @@ func (c *FakeRoles) List(opts v1.ListOptions) (result *rbac.RoleList, err error) // Watch returns a watch.Interface that watches the requested roles. func (c *FakeRoles) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewWatchAction(rolesResource, c.ns, opts)) + InvokesWatch(testing.NewWatchAction(rolesResource, c.ns, opts)) } // Patch applies the patch and returns the patched role. func (c *FakeRoles) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *rbac.Role, err error) { obj, err := c.Fake. - Invokes(core.NewPatchSubresourceAction(rolesResource, c.ns, name, data, subresources...), &rbac.Role{}) + Invokes(testing.NewPatchSubresourceAction(rolesResource, c.ns, name, data, subresources...), &rbac.Role{}) if obj == nil { return nil, err diff --git a/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake/fake_rolebinding.go b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake/fake_rolebinding.go index a163f7febf1..d9d1d097421 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake/fake_rolebinding.go +++ b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake/fake_rolebinding.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" rbac "k8s.io/kubernetes/pkg/apis/rbac" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeRoleBindings implements RoleBindingInterface @@ -36,7 +36,7 @@ var rolebindingsResource = schema.GroupVersionResource{Group: "rbac.authorizatio func (c *FakeRoleBindings) Create(roleBinding *rbac.RoleBinding) (result *rbac.RoleBinding, err error) { obj, err := c.Fake. - Invokes(core.NewCreateAction(rolebindingsResource, c.ns, roleBinding), &rbac.RoleBinding{}) + Invokes(testing.NewCreateAction(rolebindingsResource, c.ns, roleBinding), &rbac.RoleBinding{}) if obj == nil { return nil, err @@ -46,7 +46,7 @@ func (c *FakeRoleBindings) Create(roleBinding *rbac.RoleBinding) (result *rbac.R func (c *FakeRoleBindings) Update(roleBinding *rbac.RoleBinding) (result *rbac.RoleBinding, err error) { obj, err := c.Fake. - Invokes(core.NewUpdateAction(rolebindingsResource, c.ns, roleBinding), &rbac.RoleBinding{}) + Invokes(testing.NewUpdateAction(rolebindingsResource, c.ns, roleBinding), &rbac.RoleBinding{}) if obj == nil { return nil, err @@ -56,13 +56,13 @@ func (c *FakeRoleBindings) Update(roleBinding *rbac.RoleBinding) (result *rbac.R func (c *FakeRoleBindings) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewDeleteAction(rolebindingsResource, c.ns, name), &rbac.RoleBinding{}) + Invokes(testing.NewDeleteAction(rolebindingsResource, c.ns, name), &rbac.RoleBinding{}) return err } func (c *FakeRoleBindings) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := core.NewDeleteCollectionAction(rolebindingsResource, c.ns, listOptions) + action := testing.NewDeleteCollectionAction(rolebindingsResource, c.ns, listOptions) _, err := c.Fake.Invokes(action, &rbac.RoleBindingList{}) return err @@ -70,7 +70,7 @@ func (c *FakeRoleBindings) DeleteCollection(options *v1.DeleteOptions, listOptio func (c *FakeRoleBindings) Get(name string, options v1.GetOptions) (result *rbac.RoleBinding, err error) { obj, err := c.Fake. - Invokes(core.NewGetAction(rolebindingsResource, c.ns, name), &rbac.RoleBinding{}) + Invokes(testing.NewGetAction(rolebindingsResource, c.ns, name), &rbac.RoleBinding{}) if obj == nil { return nil, err @@ -80,13 +80,13 @@ func (c *FakeRoleBindings) Get(name string, options v1.GetOptions) (result *rbac func (c *FakeRoleBindings) List(opts v1.ListOptions) (result *rbac.RoleBindingList, err error) { obj, err := c.Fake. - Invokes(core.NewListAction(rolebindingsResource, c.ns, opts), &rbac.RoleBindingList{}) + Invokes(testing.NewListAction(rolebindingsResource, c.ns, opts), &rbac.RoleBindingList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -102,14 +102,14 @@ func (c *FakeRoleBindings) List(opts v1.ListOptions) (result *rbac.RoleBindingLi // Watch returns a watch.Interface that watches the requested roleBindings. func (c *FakeRoleBindings) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewWatchAction(rolebindingsResource, c.ns, opts)) + InvokesWatch(testing.NewWatchAction(rolebindingsResource, c.ns, opts)) } // Patch applies the patch and returns the patched roleBinding. func (c *FakeRoleBindings) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *rbac.RoleBinding, err error) { obj, err := c.Fake. - Invokes(core.NewPatchSubresourceAction(rolebindingsResource, c.ns, name, data, subresources...), &rbac.RoleBinding{}) + Invokes(testing.NewPatchSubresourceAction(rolebindingsResource, c.ns, name, data, subresources...), &rbac.RoleBinding{}) if obj == nil { return nil, err diff --git a/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/fake/BUILD b/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/fake/BUILD index 8429f81793c..5c05b958b5d 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/fake/BUILD +++ b/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/fake/BUILD @@ -18,13 +18,13 @@ go_library( deps = [ "//pkg/apis/storage:go_default_library", "//pkg/client/clientset_generated/internalclientset/typed/storage/internalversion:go_default_library", - "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/testing", ], ) diff --git a/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/fake/fake_storage_client.go b/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/fake/fake_storage_client.go index 7abe6f4f9b1..2bccdbd249d 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/fake/fake_storage_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/fake/fake_storage_client.go @@ -18,12 +18,12 @@ package fake import ( rest "k8s.io/client-go/rest" + testing "k8s.io/client-go/testing" internalversion "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion" - core "k8s.io/kubernetes/pkg/client/testing/core" ) type FakeStorage struct { - *core.Fake + *testing.Fake } func (c *FakeStorage) StorageClasses() internalversion.StorageClassInterface { diff --git a/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/fake/fake_storageclass.go b/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/fake/fake_storageclass.go index e1ba9c579ce..741b0a82b5d 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/fake/fake_storageclass.go +++ b/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/fake/fake_storageclass.go @@ -22,8 +22,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" storage "k8s.io/kubernetes/pkg/apis/storage" - core "k8s.io/kubernetes/pkg/client/testing/core" ) // FakeStorageClasses implements StorageClassInterface @@ -35,7 +35,7 @@ var storageclassesResource = schema.GroupVersionResource{Group: "storage.k8s.io" func (c *FakeStorageClasses) Create(storageClass *storage.StorageClass) (result *storage.StorageClass, err error) { obj, err := c.Fake. - Invokes(core.NewRootCreateAction(storageclassesResource, storageClass), &storage.StorageClass{}) + Invokes(testing.NewRootCreateAction(storageclassesResource, storageClass), &storage.StorageClass{}) if obj == nil { return nil, err } @@ -44,7 +44,7 @@ func (c *FakeStorageClasses) Create(storageClass *storage.StorageClass) (result func (c *FakeStorageClasses) Update(storageClass *storage.StorageClass) (result *storage.StorageClass, err error) { obj, err := c.Fake. - Invokes(core.NewRootUpdateAction(storageclassesResource, storageClass), &storage.StorageClass{}) + Invokes(testing.NewRootUpdateAction(storageclassesResource, storageClass), &storage.StorageClass{}) if obj == nil { return nil, err } @@ -53,12 +53,12 @@ func (c *FakeStorageClasses) Update(storageClass *storage.StorageClass) (result func (c *FakeStorageClasses) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewRootDeleteAction(storageclassesResource, name), &storage.StorageClass{}) + Invokes(testing.NewRootDeleteAction(storageclassesResource, name), &storage.StorageClass{}) return err } func (c *FakeStorageClasses) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := core.NewRootDeleteCollectionAction(storageclassesResource, listOptions) + action := testing.NewRootDeleteCollectionAction(storageclassesResource, listOptions) _, err := c.Fake.Invokes(action, &storage.StorageClassList{}) return err @@ -66,7 +66,7 @@ func (c *FakeStorageClasses) DeleteCollection(options *v1.DeleteOptions, listOpt func (c *FakeStorageClasses) Get(name string, options v1.GetOptions) (result *storage.StorageClass, err error) { obj, err := c.Fake. - Invokes(core.NewRootGetAction(storageclassesResource, name), &storage.StorageClass{}) + Invokes(testing.NewRootGetAction(storageclassesResource, name), &storage.StorageClass{}) if obj == nil { return nil, err } @@ -75,12 +75,12 @@ func (c *FakeStorageClasses) Get(name string, options v1.GetOptions) (result *st func (c *FakeStorageClasses) List(opts v1.ListOptions) (result *storage.StorageClassList, err error) { obj, err := c.Fake. - Invokes(core.NewRootListAction(storageclassesResource, opts), &storage.StorageClassList{}) + Invokes(testing.NewRootListAction(storageclassesResource, opts), &storage.StorageClassList{}) if obj == nil { return nil, err } - label, _, _ := core.ExtractFromListOptions(opts) + label, _, _ := testing.ExtractFromListOptions(opts) if label == nil { label = labels.Everything() } @@ -96,13 +96,13 @@ func (c *FakeStorageClasses) List(opts v1.ListOptions) (result *storage.StorageC // Watch returns a watch.Interface that watches the requested storageClasses. func (c *FakeStorageClasses) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(core.NewRootWatchAction(storageclassesResource, opts)) + InvokesWatch(testing.NewRootWatchAction(storageclassesResource, opts)) } // Patch applies the patch and returns the patched storageClass. func (c *FakeStorageClasses) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *storage.StorageClass, err error) { obj, err := c.Fake. - Invokes(core.NewRootPatchSubresourceAction(storageclassesResource, name, data, subresources...), &storage.StorageClass{}) + Invokes(testing.NewRootPatchSubresourceAction(storageclassesResource, name, data, subresources...), &storage.StorageClass{}) if obj == nil { return nil, err } diff --git a/pkg/client/leaderelection/BUILD b/pkg/client/leaderelection/BUILD index 198430d5a21..36ec8e074ed 100644 --- a/pkg/client/leaderelection/BUILD +++ b/pkg/client/leaderelection/BUILD @@ -34,10 +34,10 @@ go_test( "//pkg/client/clientset_generated/clientset/fake:go_default_library", "//pkg/client/leaderelection/resourcelock:go_default_library", "//pkg/client/record:go_default_library", - "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/client-go/testing", ], ) diff --git a/pkg/client/leaderelection/leaderelection_test.go b/pkg/client/leaderelection/leaderelection_test.go index 4dfe81a05b7..b4387d66461 100644 --- a/pkg/client/leaderelection/leaderelection_test.go +++ b/pkg/client/leaderelection/leaderelection_test.go @@ -29,11 +29,11 @@ import ( "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + core "k8s.io/client-go/testing" "k8s.io/kubernetes/pkg/api/v1" fakeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" rl "k8s.io/kubernetes/pkg/client/leaderelection/resourcelock" "k8s.io/kubernetes/pkg/client/record" - "k8s.io/kubernetes/pkg/client/testing/core" ) func TestTryAcquireOrRenew(t *testing.T) { diff --git a/pkg/client/testing/OWNERS b/pkg/client/testing/OWNERS deleted file mode 100755 index a43e89e8ba9..00000000000 --- a/pkg/client/testing/OWNERS +++ /dev/null @@ -1,11 +0,0 @@ -reviewers: -- smarterclayton -- wojtek-t -- caesarxuchao -- mikedanese -- pmorie -- saad-ali -- krousey -- '249043822' -- lixiaobing10051267 -- goltermann diff --git a/pkg/client/testing/core/BUILD b/pkg/client/testing/core/BUILD deleted file mode 100644 index eec5a62d229..00000000000 --- a/pkg/client/testing/core/BUILD +++ /dev/null @@ -1,57 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", - "go_test", -) - -go_library( - name = "go_default_library", - srcs = [ - "actions.go", - "fake.go", - "fixture.go", - ], - tags = ["automanaged"], - deps = [ - "//pkg/api:go_default_library", - "//pkg/version:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/api/errors", - "//vendor:k8s.io/apimachinery/pkg/api/meta", - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/fields", - "//vendor:k8s.io/apimachinery/pkg/labels", - "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apimachinery/pkg/runtime/schema", - "//vendor:k8s.io/apimachinery/pkg/version", - "//vendor:k8s.io/apimachinery/pkg/watch", - "//vendor:k8s.io/client-go/rest", - ], -) - -go_test( - name = "go_default_xtest", - srcs = ["fake_test.go"], - tags = ["automanaged"], - deps = [ - "//pkg/api:go_default_library", - "//pkg/client/clientset_generated/internalclientset/fake:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], -) diff --git a/pkg/client/testing/core/actions.go b/pkg/client/testing/core/actions.go deleted file mode 100644 index a16c75ec080..00000000000 --- a/pkg/client/testing/core/actions.go +++ /dev/null @@ -1,471 +0,0 @@ -/* -Copyright 2015 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package core - -import ( - "fmt" - "path" - "strings" - - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/fields" - "k8s.io/apimachinery/pkg/labels" - "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apimachinery/pkg/runtime/schema" -) - -func NewRootGetAction(resource schema.GroupVersionResource, name string) GetActionImpl { - action := GetActionImpl{} - action.Verb = "get" - action.Resource = resource - action.Name = name - - return action -} - -func NewGetAction(resource schema.GroupVersionResource, namespace, name string) GetActionImpl { - action := GetActionImpl{} - action.Verb = "get" - action.Resource = resource - action.Namespace = namespace - action.Name = name - - return action -} - -func NewRootListAction(resource schema.GroupVersionResource, opts interface{}) ListActionImpl { - action := ListActionImpl{} - action.Verb = "list" - action.Resource = resource - labelSelector, fieldSelector, _ := ExtractFromListOptions(opts) - action.ListRestrictions = ListRestrictions{labelSelector, fieldSelector} - - return action -} - -func NewListAction(resource schema.GroupVersionResource, namespace string, opts interface{}) ListActionImpl { - action := ListActionImpl{} - action.Verb = "list" - action.Resource = resource - action.Namespace = namespace - labelSelector, fieldSelector, _ := ExtractFromListOptions(opts) - action.ListRestrictions = ListRestrictions{labelSelector, fieldSelector} - - return action -} - -func NewRootCreateAction(resource schema.GroupVersionResource, object runtime.Object) CreateActionImpl { - action := CreateActionImpl{} - action.Verb = "create" - action.Resource = resource - action.Object = object - - return action -} - -func NewCreateAction(resource schema.GroupVersionResource, namespace string, object runtime.Object) CreateActionImpl { - action := CreateActionImpl{} - action.Verb = "create" - action.Resource = resource - action.Namespace = namespace - action.Object = object - - return action -} - -func NewRootUpdateAction(resource schema.GroupVersionResource, object runtime.Object) UpdateActionImpl { - action := UpdateActionImpl{} - action.Verb = "update" - action.Resource = resource - action.Object = object - - return action -} - -func NewUpdateAction(resource schema.GroupVersionResource, namespace string, object runtime.Object) UpdateActionImpl { - action := UpdateActionImpl{} - action.Verb = "update" - action.Resource = resource - action.Namespace = namespace - action.Object = object - - return action -} - -func NewRootPatchAction(resource schema.GroupVersionResource, name string, patch []byte) PatchActionImpl { - action := PatchActionImpl{} - action.Verb = "patch" - action.Resource = resource - action.Name = name - action.Patch = patch - - return action -} - -func NewPatchAction(resource schema.GroupVersionResource, namespace string, name string, patch []byte) PatchActionImpl { - action := PatchActionImpl{} - action.Verb = "patch" - action.Resource = resource - action.Namespace = namespace - action.Name = name - action.Patch = patch - - return action -} - -func NewRootPatchSubresourceAction(resource schema.GroupVersionResource, name string, patch []byte, subresources ...string) PatchActionImpl { - action := PatchActionImpl{} - action.Verb = "patch" - action.Resource = resource - action.Subresource = path.Join(subresources...) - action.Name = name - action.Patch = patch - - return action -} - -func NewPatchSubresourceAction(resource schema.GroupVersionResource, namespace, name string, patch []byte, subresources ...string) PatchActionImpl { - action := PatchActionImpl{} - action.Verb = "patch" - action.Resource = resource - action.Subresource = path.Join(subresources...) - action.Namespace = namespace - action.Name = name - action.Patch = patch - - return action -} - -func NewRootUpdateSubresourceAction(resource schema.GroupVersionResource, subresource string, object runtime.Object) UpdateActionImpl { - action := UpdateActionImpl{} - action.Verb = "update" - action.Resource = resource - action.Subresource = subresource - action.Object = object - - return action -} -func NewUpdateSubresourceAction(resource schema.GroupVersionResource, subresource string, namespace string, object runtime.Object) UpdateActionImpl { - action := UpdateActionImpl{} - action.Verb = "update" - action.Resource = resource - action.Subresource = subresource - action.Namespace = namespace - action.Object = object - - return action -} - -func NewRootDeleteAction(resource schema.GroupVersionResource, name string) DeleteActionImpl { - action := DeleteActionImpl{} - action.Verb = "delete" - action.Resource = resource - action.Name = name - - return action -} - -func NewDeleteAction(resource schema.GroupVersionResource, namespace, name string) DeleteActionImpl { - action := DeleteActionImpl{} - action.Verb = "delete" - action.Resource = resource - action.Namespace = namespace - action.Name = name - - return action -} - -func NewRootDeleteCollectionAction(resource schema.GroupVersionResource, opts interface{}) DeleteCollectionActionImpl { - action := DeleteCollectionActionImpl{} - action.Verb = "delete-collection" - action.Resource = resource - labelSelector, fieldSelector, _ := ExtractFromListOptions(opts) - action.ListRestrictions = ListRestrictions{labelSelector, fieldSelector} - - return action -} - -func NewDeleteCollectionAction(resource schema.GroupVersionResource, namespace string, opts interface{}) DeleteCollectionActionImpl { - action := DeleteCollectionActionImpl{} - action.Verb = "delete-collection" - action.Resource = resource - action.Namespace = namespace - labelSelector, fieldSelector, _ := ExtractFromListOptions(opts) - action.ListRestrictions = ListRestrictions{labelSelector, fieldSelector} - - return action -} - -func NewRootWatchAction(resource schema.GroupVersionResource, opts interface{}) WatchActionImpl { - action := WatchActionImpl{} - action.Verb = "watch" - action.Resource = resource - labelSelector, fieldSelector, resourceVersion := ExtractFromListOptions(opts) - action.WatchRestrictions = WatchRestrictions{labelSelector, fieldSelector, resourceVersion} - - return action -} - -func ExtractFromListOptions(opts interface{}) (labelSelector labels.Selector, fieldSelector fields.Selector, resourceVersion string) { - var err error - switch t := opts.(type) { - case metav1.ListOptions: - labelSelector, err = labels.Parse(t.LabelSelector) - if err != nil { - panic(fmt.Errorf("invalid selector %q: %v", t.LabelSelector, err)) - } - fieldSelector, err = fields.ParseSelector(t.FieldSelector) - if err != nil { - panic(fmt.Errorf("invalid selector %q: %v", t.FieldSelector, err)) - } - resourceVersion = t.ResourceVersion - default: - panic(fmt.Errorf("expect a ListOptions %T", opts)) - } - if labelSelector == nil { - labelSelector = labels.Everything() - } - if fieldSelector == nil { - fieldSelector = fields.Everything() - } - return labelSelector, fieldSelector, resourceVersion -} - -func NewWatchAction(resource schema.GroupVersionResource, namespace string, opts interface{}) WatchActionImpl { - action := WatchActionImpl{} - action.Verb = "watch" - action.Resource = resource - action.Namespace = namespace - labelSelector, fieldSelector, resourceVersion := ExtractFromListOptions(opts) - action.WatchRestrictions = WatchRestrictions{labelSelector, fieldSelector, resourceVersion} - - return action -} - -func NewProxyGetAction(resource schema.GroupVersionResource, namespace, scheme, name, port, path string, params map[string]string) ProxyGetActionImpl { - action := ProxyGetActionImpl{} - action.Verb = "get" - action.Resource = resource - action.Namespace = namespace - action.Scheme = scheme - action.Name = name - action.Port = port - action.Path = path - action.Params = params - return action -} - -type ListRestrictions struct { - Labels labels.Selector - Fields fields.Selector -} -type WatchRestrictions struct { - Labels labels.Selector - Fields fields.Selector - ResourceVersion string -} - -type Action interface { - GetNamespace() string - GetVerb() string - GetResource() schema.GroupVersionResource - GetSubresource() string - Matches(verb, resource string) bool -} - -type GenericAction interface { - Action - GetValue() interface{} -} - -type GetAction interface { - Action - GetName() string -} - -type ListAction interface { - Action - GetListRestrictions() ListRestrictions -} - -type CreateAction interface { - Action - GetObject() runtime.Object -} - -type UpdateAction interface { - Action - GetObject() runtime.Object -} - -type DeleteAction interface { - Action - GetName() string -} - -type WatchAction interface { - Action - GetWatchRestrictions() WatchRestrictions -} - -type ProxyGetAction interface { - Action - GetScheme() string - GetName() string - GetPort() string - GetPath() string - GetParams() map[string]string -} - -type ActionImpl struct { - Namespace string - Verb string - Resource schema.GroupVersionResource - Subresource string -} - -func (a ActionImpl) GetNamespace() string { - return a.Namespace -} -func (a ActionImpl) GetVerb() string { - return a.Verb -} -func (a ActionImpl) GetResource() schema.GroupVersionResource { - return a.Resource -} -func (a ActionImpl) GetSubresource() string { - return a.Subresource -} -func (a ActionImpl) Matches(verb, resource string) bool { - return strings.ToLower(verb) == strings.ToLower(a.Verb) && - strings.ToLower(resource) == strings.ToLower(a.Resource.Resource) -} - -type GenericActionImpl struct { - ActionImpl - Value interface{} -} - -func (a GenericActionImpl) GetValue() interface{} { - return a.Value -} - -type GetActionImpl struct { - ActionImpl - Name string -} - -func (a GetActionImpl) GetName() string { - return a.Name -} - -type ListActionImpl struct { - ActionImpl - ListRestrictions ListRestrictions -} - -func (a ListActionImpl) GetListRestrictions() ListRestrictions { - return a.ListRestrictions -} - -type CreateActionImpl struct { - ActionImpl - Object runtime.Object -} - -func (a CreateActionImpl) GetObject() runtime.Object { - return a.Object -} - -type UpdateActionImpl struct { - ActionImpl - Object runtime.Object -} - -func (a UpdateActionImpl) GetObject() runtime.Object { - return a.Object -} - -type PatchActionImpl struct { - ActionImpl - Name string - Patch []byte -} - -func (a PatchActionImpl) GetName() string { - return a.Name -} - -func (a PatchActionImpl) GetPatch() []byte { - return a.Patch -} - -type DeleteActionImpl struct { - ActionImpl - Name string -} - -func (a DeleteActionImpl) GetName() string { - return a.Name -} - -type DeleteCollectionActionImpl struct { - ActionImpl - ListRestrictions ListRestrictions -} - -func (a DeleteCollectionActionImpl) GetListRestrictions() ListRestrictions { - return a.ListRestrictions -} - -type WatchActionImpl struct { - ActionImpl - WatchRestrictions WatchRestrictions -} - -func (a WatchActionImpl) GetWatchRestrictions() WatchRestrictions { - return a.WatchRestrictions -} - -type ProxyGetActionImpl struct { - ActionImpl - Scheme string - Name string - Port string - Path string - Params map[string]string -} - -func (a ProxyGetActionImpl) GetScheme() string { - return a.Scheme -} - -func (a ProxyGetActionImpl) GetName() string { - return a.Name -} - -func (a ProxyGetActionImpl) GetPort() string { - return a.Port -} - -func (a ProxyGetActionImpl) GetPath() string { - return a.Path -} - -func (a ProxyGetActionImpl) GetParams() map[string]string { - return a.Params -} diff --git a/pkg/client/testing/core/fake.go b/pkg/client/testing/core/fake.go deleted file mode 100644 index 75adc857bc8..00000000000 --- a/pkg/client/testing/core/fake.go +++ /dev/null @@ -1,259 +0,0 @@ -/* -Copyright 2016 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package core - -import ( - "fmt" - "sync" - - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apimachinery/pkg/runtime/schema" - "k8s.io/apimachinery/pkg/version" - "k8s.io/apimachinery/pkg/watch" - restclient "k8s.io/client-go/rest" - kubeversion "k8s.io/kubernetes/pkg/version" -) - -// Fake implements client.Interface. Meant to be embedded into a struct to get -// a default implementation. This makes faking out just the method you want to -// test easier. -type Fake struct { - sync.RWMutex - actions []Action // these may be castable to other types, but "Action" is the minimum - - // ReactionChain is the list of reactors that will be attempted for every - // request in the order they are tried. - ReactionChain []Reactor - // WatchReactionChain is the list of watch reactors that will be attempted - // for every request in the order they are tried. - WatchReactionChain []WatchReactor - // ProxyReactionChain is the list of proxy reactors that will be attempted - // for every request in the order they are tried. - ProxyReactionChain []ProxyReactor - - Resources []*metav1.APIResourceList -} - -// Reactor is an interface to allow the composition of reaction functions. -type Reactor interface { - // Handles indicates whether or not this Reactor deals with a given - // action. - Handles(action Action) bool - // React handles the action and returns results. It may choose to - // delegate by indicated handled=false. - React(action Action) (handled bool, ret runtime.Object, err error) -} - -// WatchReactor is an interface to allow the composition of watch functions. -type WatchReactor interface { - // Handles indicates whether or not this Reactor deals with a given - // action. - Handles(action Action) bool - // React handles a watch action and returns results. It may choose to - // delegate by indicating handled=false. - React(action Action) (handled bool, ret watch.Interface, err error) -} - -// ProxyReactor is an interface to allow the composition of proxy get -// functions. -type ProxyReactor interface { - // Handles indicates whether or not this Reactor deals with a given - // action. - Handles(action Action) bool - // React handles a watch action and returns results. It may choose to - // delegate by indicating handled=false. - React(action Action) (handled bool, ret restclient.ResponseWrapper, err error) -} - -// ReactionFunc is a function that returns an object or error for a given -// Action. If "handled" is false, then the test client will ignore the -// results and continue to the next ReactionFunc. A ReactionFunc can describe -// reactions on subresources by testing the result of the action's -// GetSubresource() method. -type ReactionFunc func(action Action) (handled bool, ret runtime.Object, err error) - -// WatchReactionFunc is a function that returns a watch interface. If -// "handled" is false, then the test client will ignore the results and -// continue to the next ReactionFunc. -type WatchReactionFunc func(action Action) (handled bool, ret watch.Interface, err error) - -// ProxyReactionFunc is a function that returns a ResponseWrapper interface -// for a given Action. If "handled" is false, then the test client will -// ignore the results and continue to the next ProxyReactionFunc. -type ProxyReactionFunc func(action Action) (handled bool, ret restclient.ResponseWrapper, err error) - -// AddReactor appends a reactor to the end of the chain. -func (c *Fake) AddReactor(verb, resource string, reaction ReactionFunc) { - c.ReactionChain = append(c.ReactionChain, &SimpleReactor{verb, resource, reaction}) -} - -// PrependReactor adds a reactor to the beginning of the chain. -func (c *Fake) PrependReactor(verb, resource string, reaction ReactionFunc) { - c.ReactionChain = append([]Reactor{&SimpleReactor{verb, resource, reaction}}, c.ReactionChain...) -} - -// AddWatchReactor appends a reactor to the end of the chain. -func (c *Fake) AddWatchReactor(resource string, reaction WatchReactionFunc) { - c.WatchReactionChain = append(c.WatchReactionChain, &SimpleWatchReactor{resource, reaction}) -} - -// PrependWatchReactor adds a reactor to the beginning of the chain. -func (c *Fake) PrependWatchReactor(resource string, reaction WatchReactionFunc) { - c.WatchReactionChain = append([]WatchReactor{&SimpleWatchReactor{resource, reaction}}, c.WatchReactionChain...) -} - -// AddProxyReactor appends a reactor to the end of the chain. -func (c *Fake) AddProxyReactor(resource string, reaction ProxyReactionFunc) { - c.ProxyReactionChain = append(c.ProxyReactionChain, &SimpleProxyReactor{resource, reaction}) -} - -// PrependProxyReactor adds a reactor to the beginning of the chain. -func (c *Fake) PrependProxyReactor(resource string, reaction ProxyReactionFunc) { - c.ProxyReactionChain = append([]ProxyReactor{&SimpleProxyReactor{resource, reaction}}, c.ProxyReactionChain...) -} - -// Invokes records the provided Action and then invokes the ReactionFunc that -// handles the action if one exists. defaultReturnObj is expected to be of the -// same type a normal call would return. -func (c *Fake) Invokes(action Action, defaultReturnObj runtime.Object) (runtime.Object, error) { - c.Lock() - defer c.Unlock() - - c.actions = append(c.actions, action) - for _, reactor := range c.ReactionChain { - if !reactor.Handles(action) { - continue - } - - handled, ret, err := reactor.React(action) - if !handled { - continue - } - - return ret, err - } - - return defaultReturnObj, nil -} - -// InvokesWatch records the provided Action and then invokes the ReactionFunc -// that handles the action if one exists. -func (c *Fake) InvokesWatch(action Action) (watch.Interface, error) { - c.Lock() - defer c.Unlock() - - c.actions = append(c.actions, action) - for _, reactor := range c.WatchReactionChain { - if !reactor.Handles(action) { - continue - } - - handled, ret, err := reactor.React(action) - if !handled { - continue - } - - return ret, err - } - - return nil, fmt.Errorf("unhandled watch: %#v", action) -} - -// InvokesProxy records the provided Action and then invokes the ReactionFunc -// that handles the action if one exists. -func (c *Fake) InvokesProxy(action Action) restclient.ResponseWrapper { - c.Lock() - defer c.Unlock() - - c.actions = append(c.actions, action) - for _, reactor := range c.ProxyReactionChain { - if !reactor.Handles(action) { - continue - } - - handled, ret, err := reactor.React(action) - if !handled || err != nil { - continue - } - - return ret - } - - return nil -} - -// ClearActions clears the history of actions called on the fake client. -func (c *Fake) ClearActions() { - c.Lock() - defer c.Unlock() - - c.actions = make([]Action, 0) -} - -// Actions returns a chronologically ordered slice fake actions called on the -// fake client. -func (c *Fake) Actions() []Action { - c.RLock() - defer c.RUnlock() - fa := make([]Action, len(c.actions)) - copy(fa, c.actions) - return fa -} - -// TODO: this probably should be moved to somewhere else. -type FakeDiscovery struct { - *Fake -} - -func (c *FakeDiscovery) ServerResourcesForGroupVersion(groupVersion string) (*metav1.APIResourceList, error) { - action := ActionImpl{ - Verb: "get", - Resource: schema.GroupVersionResource{Resource: "resource"}, - } - c.Invokes(action, nil) - for _, rl := range c.Resources { - if rl.GroupVersion == groupVersion { - return rl, nil - } - } - - return nil, fmt.Errorf("GroupVersion %q not found", groupVersion) -} - -func (c *FakeDiscovery) ServerResources() ([]*metav1.APIResourceList, error) { - action := ActionImpl{ - Verb: "get", - Resource: schema.GroupVersionResource{Resource: "resource"}, - } - c.Invokes(action, nil) - return c.Resources, nil -} - -func (c *FakeDiscovery) ServerGroups() (*metav1.APIGroupList, error) { - return nil, nil -} - -func (c *FakeDiscovery) ServerVersion() (*version.Info, error) { - action := ActionImpl{} - action.Verb = "get" - action.Resource = schema.GroupVersionResource{Resource: "version"} - - c.Invokes(action, nil) - versionInfo := kubeversion.Get() - return &versionInfo, nil -} diff --git a/pkg/client/testing/core/fixture.go b/pkg/client/testing/core/fixture.go deleted file mode 100644 index 3058bdcceb9..00000000000 --- a/pkg/client/testing/core/fixture.go +++ /dev/null @@ -1,516 +0,0 @@ -/* -Copyright 2015 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package core - -import ( - "fmt" - "sync" - - "k8s.io/apimachinery/pkg/api/errors" - "k8s.io/apimachinery/pkg/api/meta" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apimachinery/pkg/runtime/schema" - "k8s.io/apimachinery/pkg/watch" - restclient "k8s.io/client-go/rest" - "k8s.io/kubernetes/pkg/api" -) - -// ObjectTracker keeps track of objects. It is intended to be used to -// fake calls to a server by returning objects based on their kind, -// namespace and name. -type ObjectTracker interface { - // Add adds an object to the tracker. If object being added - // is a list, its items are added separately. - Add(obj runtime.Object) error - - // Get retrieves the object by its kind, namespace and name. - Get(gvk schema.GroupVersionKind, ns, name string) (runtime.Object, error) - - // Create adds an object to the tracker in the specified namespace. - Create(obj runtime.Object, ns string) error - - // Update updates an existing object in the tracker in the specified namespace. - Update(obj runtime.Object, ns string) error - - // List retrieves all objects of a given kind in the given - // namespace. Only non-List kinds are accepted. - List(gvk schema.GroupVersionKind, ns string) (runtime.Object, error) - - // Delete deletes an existing object from the tracker. If object - // didn't exist in the tracker prior to deletion, Delete returns - // no error. - Delete(gvk schema.GroupVersionKind, ns, name string) error -} - -// ObjectScheme abstracts the implementation of common operations on objects. -type ObjectScheme interface { - runtime.ObjectCreater - runtime.ObjectCopier - runtime.ObjectTyper -} - -// ObjectReaction returns a ReactionFunc that applies core.Action to -// the given tracker. -func ObjectReaction(tracker ObjectTracker, mapper meta.RESTMapper) ReactionFunc { - return func(action Action) (bool, runtime.Object, error) { - ns := action.GetNamespace() - gvr := action.GetResource() - - gvk, err := mapper.KindFor(gvr) - if err != nil { - return false, nil, fmt.Errorf("error getting kind for resource %q: %s", gvr, err) - } - - // This is a temporary fix. Because there is no internal resource, so - // the caller has no way to express that it expects to get an internal - // kind back. A more proper fix will be directly specify the Kind when - // build the action. - gvk.Version = gvr.Version - if len(gvk.Version) == 0 { - gvk.Version = runtime.APIVersionInternal - } - - // Here and below we need to switch on implementation types, - // not on interfaces, as some interfaces are identical - // (e.g. UpdateAction and CreateAction), so if we use them, - // updates and creates end up matching the same case branch. - switch action := action.(type) { - - case ListActionImpl: - obj, err := tracker.List(gvk, ns) - return true, obj, err - - case GetActionImpl: - obj, err := tracker.Get(gvk, ns, action.GetName()) - return true, obj, err - - case CreateActionImpl: - objMeta, err := meta.Accessor(action.GetObject()) - if err != nil { - return true, nil, err - } - if action.GetSubresource() == "" { - err = tracker.Create(action.GetObject(), ns) - } else { - // TODO: Currently we're handling subresource creation as an update - // on the enclosing resource. This works for some subresources but - // might not be generic enough. - err = tracker.Update(action.GetObject(), ns) - } - if err != nil { - return true, nil, err - } - obj, err := tracker.Get(gvk, ns, objMeta.GetName()) - return true, obj, err - - case UpdateActionImpl: - objMeta, err := meta.Accessor(action.GetObject()) - if err != nil { - return true, nil, err - } - err = tracker.Update(action.GetObject(), ns) - if err != nil { - return true, nil, err - } - obj, err := tracker.Get(gvk, ns, objMeta.GetName()) - return true, obj, err - - case DeleteActionImpl: - err := tracker.Delete(gvk, ns, action.GetName()) - if err != nil { - return true, nil, err - } - return true, nil, nil - - default: - return false, nil, fmt.Errorf("no reaction implemented for %s", action) - } - } -} - -type tracker struct { - scheme ObjectScheme - decoder runtime.Decoder - lock sync.RWMutex - objects map[schema.GroupVersionKind][]runtime.Object -} - -var _ ObjectTracker = &tracker{} - -// NewObjectTracker returns an ObjectTracker that can be used to keep track -// of objects for the fake clientset. Mostly useful for unit tests. -func NewObjectTracker(scheme ObjectScheme, decoder runtime.Decoder) ObjectTracker { - return &tracker{ - scheme: scheme, - decoder: decoder, - objects: make(map[schema.GroupVersionKind][]runtime.Object), - } -} - -func (t *tracker) List(gvk schema.GroupVersionKind, ns string) (runtime.Object, error) { - // Heuristic for list kind: original kind + List suffix. Might - // not always be true but this tracker has a pretty limited - // understanding of the actual API model. - listGVK := gvk - listGVK.Kind = listGVK.Kind + "List" - - list, err := t.scheme.New(listGVK) - if err != nil { - return nil, err - } - - if !meta.IsListType(list) { - return nil, fmt.Errorf("%q is not a list type", listGVK.Kind) - } - - t.lock.RLock() - defer t.lock.RUnlock() - - objs, ok := t.objects[gvk] - if !ok { - return list, nil - } - - matchingObjs, err := filterByNamespaceAndName(objs, ns, "") - if err != nil { - return nil, err - } - if err := meta.SetList(list, matchingObjs); err != nil { - return nil, err - } - if list, err = t.scheme.Copy(list); err != nil { - return nil, err - } - return list, nil -} - -func (t *tracker) Get(gvk schema.GroupVersionKind, ns, name string) (runtime.Object, error) { - if err := checkNamespace(gvk, ns); err != nil { - return nil, err - } - - errNotFound := errors.NewNotFound(schema.GroupResource{Group: gvk.Group, Resource: gvk.Kind}, name) - - t.lock.RLock() - defer t.lock.RUnlock() - - objs, ok := t.objects[gvk] - if !ok { - return nil, errNotFound - } - - matchingObjs, err := filterByNamespaceAndName(objs, ns, name) - if err != nil { - return nil, err - } - if len(matchingObjs) == 0 { - return nil, errNotFound - } - if len(matchingObjs) > 1 { - return nil, fmt.Errorf("more than one object matched gvk %s, ns: %q name: %q", gvk, ns, name) - } - - // Only one object should match in the tracker if it works - // correctly, as Add/Update methods enforce kind/namespace/name - // uniqueness. - obj, err := t.scheme.Copy(matchingObjs[0]) - if err != nil { - return nil, err - } - - if status, ok := obj.(*metav1.Status); ok { - if status.Details != nil { - status.Details.Kind = gvk.Kind - } - if status.Status != metav1.StatusSuccess { - return nil, &errors.StatusError{ErrStatus: *status} - } - } - - return obj, nil -} - -func (t *tracker) Add(obj runtime.Object) error { - if meta.IsListType(obj) { - return t.addList(obj, false) - } - - objMeta, err := meta.Accessor(obj) - if err != nil { - return err - } - return t.add(obj, objMeta.GetNamespace(), false) -} - -func (t *tracker) Create(obj runtime.Object, ns string) error { - return t.add(obj, ns, false) -} - -func (t *tracker) Update(obj runtime.Object, ns string) error { - return t.add(obj, ns, true) -} - -func (t *tracker) add(obj runtime.Object, ns string, replaceExisting bool) error { - gvks, _, err := t.scheme.ObjectKinds(obj) - if err != nil { - return err - } - if len(gvks) == 0 { - return fmt.Errorf("no registered kinds for %v", obj) - } - - t.lock.Lock() - defer t.lock.Unlock() - - for _, gvk := range gvks { - gr := schema.GroupResource{Group: gvk.Group, Resource: gvk.Kind} - - // To avoid the object from being accidentally modified by caller - // after it's been added to the tracker, we always store the deep - // copy. - obj, err = t.scheme.Copy(obj) - if err != nil { - return err - } - - if status, ok := obj.(*metav1.Status); ok && status.Details != nil { - gvk.Kind = status.Details.Kind - } - - newMeta, err := meta.Accessor(obj) - if err != nil { - return err - } - - // Propagate namespace to the new object if hasn't already been set. - if len(newMeta.GetNamespace()) == 0 { - newMeta.SetNamespace(ns) - } - - if ns != newMeta.GetNamespace() { - msg := fmt.Sprintf("request namespace does not match object namespace, request: %q object: %q", ns, newMeta.GetNamespace()) - return errors.NewBadRequest(msg) - } - - if err := checkNamespace(gvk, newMeta.GetNamespace()); err != nil { - return err - } - - for i, existingObj := range t.objects[gvk] { - oldMeta, err := meta.Accessor(existingObj) - if err != nil { - return err - } - if oldMeta.GetNamespace() == newMeta.GetNamespace() && oldMeta.GetName() == newMeta.GetName() { - if replaceExisting { - t.objects[gvk][i] = obj - return nil - } - return errors.NewAlreadyExists(gr, newMeta.GetName()) - } - } - - if replaceExisting { - // Tried to update but no matching object was found. - return errors.NewNotFound(gr, newMeta.GetName()) - } - - t.objects[gvk] = append(t.objects[gvk], obj) - } - - return nil -} - -func (t *tracker) addList(obj runtime.Object, replaceExisting bool) error { - list, err := meta.ExtractList(obj) - if err != nil { - return err - } - errs := runtime.DecodeList(list, t.decoder) - if len(errs) > 0 { - return errs[0] - } - for _, obj := range list { - objMeta, err := meta.Accessor(obj) - if err != nil { - return err - } - err = t.add(obj, objMeta.GetNamespace(), replaceExisting) - if err != nil { - return err - } - } - return nil -} - -func (t *tracker) Delete(gvk schema.GroupVersionKind, ns, name string) error { - if err := checkNamespace(gvk, ns); err != nil { - return err - } - - t.lock.Lock() - defer t.lock.Unlock() - - found := false - - for i, existingObj := range t.objects[gvk] { - objMeta, err := meta.Accessor(existingObj) - if err != nil { - return err - } - if objMeta.GetNamespace() == ns && objMeta.GetName() == name { - t.objects[gvk] = append(t.objects[gvk][:i], t.objects[gvk][i+1:]...) - found = true - break - } - } - - if found { - return nil - } - - return errors.NewNotFound(schema.GroupResource{Group: gvk.Group, Resource: gvk.Kind}, name) -} - -// filterByNamespaceAndName returns all objects in the collection that -// match provided namespace and name. Empty namespace matches -// non-namespaced objects. -func filterByNamespaceAndName(objs []runtime.Object, ns, name string) ([]runtime.Object, error) { - var res []runtime.Object - - for _, obj := range objs { - acc, err := meta.Accessor(obj) - if err != nil { - return nil, err - } - if ns != "" && acc.GetNamespace() != ns { - continue - } - if name != "" && acc.GetName() != name { - continue - } - res = append(res, obj) - } - - return res, nil -} - -// checkNamespace makes sure that the scope of gvk matches ns. It -// returns an error if namespace is empty but gvk is a namespaced -// kind, or if ns is non-empty and gvk is a namespaced kind. -func checkNamespace(gvk schema.GroupVersionKind, ns string) error { - group, err := api.Registry.Group(gvk.Group) - if err != nil { - return err - } - mapping, err := group.RESTMapper.RESTMapping(gvk.GroupKind(), gvk.Version) - if err != nil { - return err - } - switch mapping.Scope.Name() { - case meta.RESTScopeNameRoot: - if ns != "" { - return fmt.Errorf("namespace specified for a non-namespaced kind %s", gvk) - } - case meta.RESTScopeNameNamespace: - if ns == "" { - // Skipping this check for Events, since - // controllers emit events that have no namespace, - // even though Event is a namespaced resource. - if gvk.Kind != "Event" { - return fmt.Errorf("no namespace specified for a namespaced kind %s", gvk) - } - } - } - - return nil -} - -func DefaultWatchReactor(watchInterface watch.Interface, err error) WatchReactionFunc { - return func(action Action) (bool, watch.Interface, error) { - return true, watchInterface, err - } -} - -// SimpleReactor is a Reactor. Each reaction function is attached to a given verb,resource tuple. "*" in either field matches everything for that value. -// For instance, *,pods matches all verbs on pods. This allows for easier composition of reaction functions -type SimpleReactor struct { - Verb string - Resource string - - Reaction ReactionFunc -} - -func (r *SimpleReactor) Handles(action Action) bool { - verbCovers := r.Verb == "*" || r.Verb == action.GetVerb() - if !verbCovers { - return false - } - resourceCovers := r.Resource == "*" || r.Resource == action.GetResource().Resource - if !resourceCovers { - return false - } - - return true -} - -func (r *SimpleReactor) React(action Action) (bool, runtime.Object, error) { - return r.Reaction(action) -} - -// SimpleWatchReactor is a WatchReactor. Each reaction function is attached to a given resource. "*" matches everything for that value. -// For instance, *,pods matches all verbs on pods. This allows for easier composition of reaction functions -type SimpleWatchReactor struct { - Resource string - - Reaction WatchReactionFunc -} - -func (r *SimpleWatchReactor) Handles(action Action) bool { - resourceCovers := r.Resource == "*" || r.Resource == action.GetResource().Resource - if !resourceCovers { - return false - } - - return true -} - -func (r *SimpleWatchReactor) React(action Action) (bool, watch.Interface, error) { - return r.Reaction(action) -} - -// SimpleProxyReactor is a ProxyReactor. Each reaction function is attached to a given resource. "*" matches everything for that value. -// For instance, *,pods matches all verbs on pods. This allows for easier composition of reaction functions. -type SimpleProxyReactor struct { - Resource string - - Reaction ProxyReactionFunc -} - -func (r *SimpleProxyReactor) Handles(action Action) bool { - resourceCovers := r.Resource == "*" || r.Resource == action.GetResource().Resource - if !resourceCovers { - return false - } - - return true -} - -func (r *SimpleProxyReactor) React(action Action) (bool, restclient.ResponseWrapper, error) { - return r.Reaction(action) -} diff --git a/pkg/client/tests/BUILD b/pkg/client/tests/BUILD index e4abe43f5ea..ef68fcb3780 100644 --- a/pkg/client/tests/BUILD +++ b/pkg/client/tests/BUILD @@ -10,18 +10,24 @@ load( go_test( name = "go_default_test", - srcs = ["listwatch_test.go"], + srcs = [ + "fake_client_test.go", + "listwatch_test.go", + ], library = ":go_default_library", tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", + "//pkg/api/install:go_default_library", "//pkg/api/testapi:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library", + "//pkg/client/clientset_generated/internalclientset/fake:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/fields", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/client-go/pkg/api/install", "//vendor:k8s.io/client-go/rest", "//vendor:k8s.io/client-go/tools/cache", "//vendor:k8s.io/client-go/util/testing", diff --git a/pkg/client/testing/core/fake_test.go b/pkg/client/tests/fake_client_test.go similarity index 98% rename from pkg/client/testing/core/fake_test.go rename to pkg/client/tests/fake_client_test.go index 07e5cb5496f..dfcb973852f 100644 --- a/pkg/client/testing/core/fake_test.go +++ b/pkg/client/tests/fake_client_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package core_test +package tests import ( "testing" @@ -22,6 +22,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api" clientsetfake "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake" + + _ "k8s.io/client-go/pkg/api/install" + _ "k8s.io/kubernetes/pkg/api/install" ) func TestFakeClientSetFiltering(t *testing.T) { diff --git a/pkg/controller/daemon/BUILD b/pkg/controller/daemon/BUILD index ababa04c3e4..435b8b699e8 100644 --- a/pkg/controller/daemon/BUILD +++ b/pkg/controller/daemon/BUILD @@ -52,13 +52,13 @@ go_test( "//pkg/api/v1:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", "//pkg/client/clientset_generated/clientset/fake:go_default_library", - "//pkg/client/testing/core:go_default_library", "//pkg/controller:go_default_library", "//pkg/controller/informers:go_default_library", "//pkg/securitycontext:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apiserver/pkg/storage/names", + "//vendor:k8s.io/client-go/testing", "//vendor:k8s.io/client-go/tools/cache", ], ) diff --git a/pkg/controller/daemon/daemoncontroller_test.go b/pkg/controller/daemon/daemoncontroller_test.go index e30c59d5ea8..42a798a6178 100644 --- a/pkg/controller/daemon/daemoncontroller_test.go +++ b/pkg/controller/daemon/daemoncontroller_test.go @@ -23,6 +23,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apiserver/pkg/storage/names" + core "k8s.io/client-go/testing" "k8s.io/client-go/tools/cache" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" @@ -30,7 +31,6 @@ import ( "k8s.io/kubernetes/pkg/api/v1" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" - "k8s.io/kubernetes/pkg/client/testing/core" "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/controller/informers" "k8s.io/kubernetes/pkg/securitycontext" diff --git a/pkg/controller/deployment/BUILD b/pkg/controller/deployment/BUILD index bd8d2db3249..fe0c1f83d94 100644 --- a/pkg/controller/deployment/BUILD +++ b/pkg/controller/deployment/BUILD @@ -62,7 +62,6 @@ go_test( "//pkg/apis/extensions/v1beta1:go_default_library", "//pkg/client/clientset_generated/clientset/fake:go_default_library", "//pkg/client/record:go_default_library", - "//pkg/client/testing/core:go_default_library", "//pkg/controller:go_default_library", "//pkg/controller/deployment/util:go_default_library", "//pkg/controller/informers:go_default_library", @@ -71,6 +70,7 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/util/uuid", + "//vendor:k8s.io/client-go/testing", ], ) diff --git a/pkg/controller/deployment/deployment_controller_test.go b/pkg/controller/deployment/deployment_controller_test.go index 7dadffae6a1..7160ef42a28 100644 --- a/pkg/controller/deployment/deployment_controller_test.go +++ b/pkg/controller/deployment/deployment_controller_test.go @@ -25,12 +25,12 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/uuid" + core "k8s.io/client-go/testing" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" "k8s.io/kubernetes/pkg/client/record" - "k8s.io/kubernetes/pkg/client/testing/core" "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/controller/deployment/util" "k8s.io/kubernetes/pkg/controller/informers" diff --git a/pkg/controller/deployment/rolling_test.go b/pkg/controller/deployment/rolling_test.go index 7ecceec0844..8d62f4b42f0 100644 --- a/pkg/controller/deployment/rolling_test.go +++ b/pkg/controller/deployment/rolling_test.go @@ -19,10 +19,10 @@ package deployment import ( "testing" + core "k8s.io/client-go/testing" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" "k8s.io/kubernetes/pkg/client/record" - "k8s.io/kubernetes/pkg/client/testing/core" "k8s.io/kubernetes/pkg/util/intstr" ) diff --git a/pkg/controller/deployment/sync_test.go b/pkg/controller/deployment/sync_test.go index 38bce1c3376..b3457816f65 100644 --- a/pkg/controller/deployment/sync_test.go +++ b/pkg/controller/deployment/sync_test.go @@ -21,10 +21,10 @@ import ( "time" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + testclient "k8s.io/client-go/testing" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" "k8s.io/kubernetes/pkg/client/record" - testclient "k8s.io/kubernetes/pkg/client/testing/core" "k8s.io/kubernetes/pkg/controller" deploymentutil "k8s.io/kubernetes/pkg/controller/deployment/util" "k8s.io/kubernetes/pkg/controller/informers" diff --git a/pkg/controller/deployment/util/BUILD b/pkg/controller/deployment/util/BUILD index a0e8a2d7b39..5518e217653 100644 --- a/pkg/controller/deployment/util/BUILD +++ b/pkg/controller/deployment/util/BUILD @@ -55,11 +55,11 @@ go_test( "//pkg/api/v1:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", "//pkg/client/clientset_generated/clientset/fake:go_default_library", - "//pkg/client/testing/core:go_default_library", "//pkg/util/intstr:go_default_library", "//vendor:github.com/stretchr/testify/assert", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/client-go/testing", ], ) diff --git a/pkg/controller/deployment/util/deployment_util_test.go b/pkg/controller/deployment/util/deployment_util_test.go index 515ec51b839..1573183f064 100644 --- a/pkg/controller/deployment/util/deployment_util_test.go +++ b/pkg/controller/deployment/util/deployment_util_test.go @@ -26,11 +26,11 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + core "k8s.io/client-go/testing" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" - "k8s.io/kubernetes/pkg/client/testing/core" "k8s.io/kubernetes/pkg/util/intstr" ) diff --git a/pkg/controller/garbagecollector/BUILD b/pkg/controller/garbagecollector/BUILD index 7364dcc75ac..1fa7fbab49f 100644 --- a/pkg/controller/garbagecollector/BUILD +++ b/pkg/controller/garbagecollector/BUILD @@ -38,6 +38,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/wait", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/client-go/dynamic", + "//vendor:k8s.io/client-go/kubernetes", "//vendor:k8s.io/client-go/tools/cache", "//vendor:k8s.io/client-go/util/clock", ], diff --git a/pkg/controller/garbagecollector/garbagecollector.go b/pkg/controller/garbagecollector/garbagecollector.go index 5511e116611..6a83a1be8a2 100644 --- a/pkg/controller/garbagecollector/garbagecollector.go +++ b/pkg/controller/garbagecollector/garbagecollector.go @@ -41,6 +41,9 @@ import ( "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/controller/garbagecollector/metaonly" "k8s.io/kubernetes/pkg/util/workqueue" + + // import known versions + _ "k8s.io/client-go/kubernetes" ) const ResourceResyncTime time.Duration = 0 diff --git a/pkg/controller/job/BUILD b/pkg/controller/job/BUILD index bcc7c322a84..983ea66268f 100644 --- a/pkg/controller/job/BUILD +++ b/pkg/controller/job/BUILD @@ -51,7 +51,6 @@ go_test( "//pkg/apis/batch/v1:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", "//pkg/client/clientset_generated/clientset/fake:go_default_library", - "//pkg/client/testing/core:go_default_library", "//pkg/controller:go_default_library", "//pkg/controller/informers:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", @@ -59,6 +58,7 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/util/wait", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/testing", "//vendor:k8s.io/client-go/tools/cache", ], ) diff --git a/pkg/controller/job/jobcontroller_test.go b/pkg/controller/job/jobcontroller_test.go index 1d5258a5fcd..42415704bb5 100644 --- a/pkg/controller/job/jobcontroller_test.go +++ b/pkg/controller/job/jobcontroller_test.go @@ -26,13 +26,13 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/watch" restclient "k8s.io/client-go/rest" + core "k8s.io/client-go/testing" "k8s.io/client-go/tools/cache" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1" batch "k8s.io/kubernetes/pkg/apis/batch/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" - "k8s.io/kubernetes/pkg/client/testing/core" "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/controller/informers" ) diff --git a/pkg/controller/namespace/BUILD b/pkg/controller/namespace/BUILD index 981d7c7a694..f68aeafb456 100644 --- a/pkg/controller/namespace/BUILD +++ b/pkg/controller/namespace/BUILD @@ -48,7 +48,6 @@ go_test( "//pkg/api/v1:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", "//pkg/client/clientset_generated/clientset/fake:go_default_library", - "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", @@ -57,6 +56,7 @@ go_test( "//vendor:k8s.io/client-go/discovery", "//vendor:k8s.io/client-go/dynamic", "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/testing", ], ) diff --git a/pkg/controller/namespace/namespace_controller_test.go b/pkg/controller/namespace/namespace_controller_test.go index c333b077c9c..8e8d5a2c930 100644 --- a/pkg/controller/namespace/namespace_controller_test.go +++ b/pkg/controller/namespace/namespace_controller_test.go @@ -33,11 +33,11 @@ import ( "k8s.io/client-go/discovery" "k8s.io/client-go/dynamic" restclient "k8s.io/client-go/rest" + core "k8s.io/client-go/testing" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" - "k8s.io/kubernetes/pkg/client/testing/core" ) func TestFinalized(t *testing.T) { diff --git a/pkg/controller/node/BUILD b/pkg/controller/node/BUILD index d8f10a157f4..f35d45bd23a 100644 --- a/pkg/controller/node/BUILD +++ b/pkg/controller/node/BUILD @@ -67,7 +67,6 @@ go_test( "//pkg/apis/extensions/v1beta1:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", "//pkg/client/clientset_generated/clientset/fake:go_default_library", - "//pkg/client/testing/core:go_default_library", "//pkg/cloudprovider:go_default_library", "//pkg/cloudprovider/providers/fake:go_default_library", "//pkg/controller:go_default_library", @@ -80,6 +79,7 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/util/diff", "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/apimachinery/pkg/util/wait", + "//vendor:k8s.io/client-go/testing", "//vendor:k8s.io/client-go/tools/cache", "//vendor:k8s.io/client-go/util/flowcontrol", ], diff --git a/pkg/controller/node/nodecontroller_test.go b/pkg/controller/node/nodecontroller_test.go index 91560c98ae4..f2cddb430d9 100644 --- a/pkg/controller/node/nodecontroller_test.go +++ b/pkg/controller/node/nodecontroller_test.go @@ -26,6 +26,7 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/diff" "k8s.io/apimachinery/pkg/util/wait" + testcore "k8s.io/client-go/testing" "k8s.io/client-go/tools/cache" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" @@ -33,7 +34,6 @@ import ( extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" - testcore "k8s.io/kubernetes/pkg/client/testing/core" "k8s.io/kubernetes/pkg/cloudprovider" fakecloud "k8s.io/kubernetes/pkg/cloudprovider/providers/fake" "k8s.io/kubernetes/pkg/controller" diff --git a/pkg/controller/podautoscaler/BUILD b/pkg/controller/podautoscaler/BUILD index 974a1be39c2..f73f7830a33 100644 --- a/pkg/controller/podautoscaler/BUILD +++ b/pkg/controller/podautoscaler/BUILD @@ -54,7 +54,6 @@ go_test( "//pkg/client/clientset_generated/clientset/fake:go_default_library", "//pkg/client/clientset_generated/clientset/typed/core/v1:go_default_library", "//pkg/client/record:go_default_library", - "//pkg/client/testing/core:go_default_library", "//pkg/controller/podautoscaler/metrics:go_default_library", "//vendor:github.com/stretchr/testify/assert", "//vendor:github.com/stretchr/testify/require", @@ -62,6 +61,7 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/testing", "//vendor:k8s.io/heapster/metrics/api/v1/types", "//vendor:k8s.io/heapster/metrics/apis/metrics/v1alpha1", ], diff --git a/pkg/controller/podautoscaler/horizontal_test.go b/pkg/controller/podautoscaler/horizontal_test.go index 60d53ddbc9c..dbbc858ebf6 100644 --- a/pkg/controller/podautoscaler/horizontal_test.go +++ b/pkg/controller/podautoscaler/horizontal_test.go @@ -31,6 +31,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" restclient "k8s.io/client-go/rest" + core "k8s.io/client-go/testing" "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/api/v1" @@ -39,7 +40,6 @@ import ( "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" v1core "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/core/v1" "k8s.io/kubernetes/pkg/client/record" - "k8s.io/kubernetes/pkg/client/testing/core" "k8s.io/kubernetes/pkg/controller/podautoscaler/metrics" heapster "k8s.io/heapster/metrics/api/v1/types" diff --git a/pkg/controller/podautoscaler/metrics/BUILD b/pkg/controller/podautoscaler/metrics/BUILD index 7f741b3ea36..73b65fe36a9 100644 --- a/pkg/controller/podautoscaler/metrics/BUILD +++ b/pkg/controller/podautoscaler/metrics/BUILD @@ -37,12 +37,12 @@ go_test( "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/client/clientset_generated/clientset/fake:go_default_library", - "//pkg/client/testing/core:go_default_library", "//vendor:github.com/stretchr/testify/assert", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/testing", "//vendor:k8s.io/heapster/metrics/api/v1/types", "//vendor:k8s.io/heapster/metrics/apis/metrics/v1alpha1", ], diff --git a/pkg/controller/podautoscaler/metrics/metrics_client_test.go b/pkg/controller/podautoscaler/metrics/metrics_client_test.go index 71d28f6579f..4cf379b42d4 100644 --- a/pkg/controller/podautoscaler/metrics/metrics_client_test.go +++ b/pkg/controller/podautoscaler/metrics/metrics_client_test.go @@ -27,11 +27,11 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" restclient "k8s.io/client-go/rest" + core "k8s.io/client-go/testing" "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" - "k8s.io/kubernetes/pkg/client/testing/core" heapster "k8s.io/heapster/metrics/api/v1/types" metricsapi "k8s.io/heapster/metrics/apis/metrics/v1alpha1" diff --git a/pkg/controller/podautoscaler/replica_calculator_test.go b/pkg/controller/podautoscaler/replica_calculator_test.go index e70decc1de4..a1c8cf6128d 100644 --- a/pkg/controller/podautoscaler/replica_calculator_test.go +++ b/pkg/controller/podautoscaler/replica_calculator_test.go @@ -28,11 +28,11 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" restclient "k8s.io/client-go/rest" + core "k8s.io/client-go/testing" "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" - "k8s.io/kubernetes/pkg/client/testing/core" "k8s.io/kubernetes/pkg/controller/podautoscaler/metrics" heapster "k8s.io/heapster/metrics/api/v1/types" diff --git a/pkg/controller/replicaset/BUILD b/pkg/controller/replicaset/BUILD index 0944eeba540..51e649cc921 100644 --- a/pkg/controller/replicaset/BUILD +++ b/pkg/controller/replicaset/BUILD @@ -54,7 +54,6 @@ go_test( "//pkg/client/clientset_generated/clientset:go_default_library", "//pkg/client/clientset_generated/clientset/fake:go_default_library", "//pkg/client/legacylisters:go_default_library", - "//pkg/client/testing/core:go_default_library", "//pkg/controller:go_default_library", "//pkg/controller/informers:go_default_library", "//pkg/securitycontext:go_default_library", @@ -65,6 +64,7 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/util/wait", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/testing", "//vendor:k8s.io/client-go/tools/cache", "//vendor:k8s.io/client-go/util/testing", ], diff --git a/pkg/controller/replicaset/replica_set_test.go b/pkg/controller/replicaset/replica_set_test.go index 18b3278edd1..739bed38b16 100644 --- a/pkg/controller/replicaset/replica_set_test.go +++ b/pkg/controller/replicaset/replica_set_test.go @@ -35,6 +35,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/watch" restclient "k8s.io/client-go/rest" + core "k8s.io/client-go/testing" "k8s.io/client-go/tools/cache" utiltesting "k8s.io/client-go/util/testing" "k8s.io/kubernetes/pkg/api" @@ -45,7 +46,6 @@ import ( "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" fakeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" "k8s.io/kubernetes/pkg/client/legacylisters" - "k8s.io/kubernetes/pkg/client/testing/core" "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/controller/informers" "k8s.io/kubernetes/pkg/securitycontext" diff --git a/pkg/controller/replication/BUILD b/pkg/controller/replication/BUILD index f8dc46ef7d1..36ec5aa4737 100644 --- a/pkg/controller/replication/BUILD +++ b/pkg/controller/replication/BUILD @@ -50,7 +50,6 @@ go_test( "//pkg/api/v1:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", "//pkg/client/clientset_generated/clientset/fake:go_default_library", - "//pkg/client/testing/core:go_default_library", "//pkg/controller:go_default_library", "//pkg/controller/informers:go_default_library", "//pkg/securitycontext:go_default_library", @@ -61,6 +60,7 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/util/wait", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/testing", "//vendor:k8s.io/client-go/tools/cache", "//vendor:k8s.io/client-go/util/testing", ], diff --git a/pkg/controller/replication/replication_controller_test.go b/pkg/controller/replication/replication_controller_test.go index a0808e45ce4..e23bdbe9f0f 100644 --- a/pkg/controller/replication/replication_controller_test.go +++ b/pkg/controller/replication/replication_controller_test.go @@ -34,6 +34,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/watch" restclient "k8s.io/client-go/rest" + core "k8s.io/client-go/testing" "k8s.io/client-go/tools/cache" utiltesting "k8s.io/client-go/util/testing" "k8s.io/kubernetes/pkg/api" @@ -42,7 +43,6 @@ import ( "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" fakeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" - "k8s.io/kubernetes/pkg/client/testing/core" "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/controller/informers" "k8s.io/kubernetes/pkg/securitycontext" diff --git a/pkg/controller/resourcequota/BUILD b/pkg/controller/resourcequota/BUILD index aebcac284c1..76718cc5618 100644 --- a/pkg/controller/resourcequota/BUILD +++ b/pkg/controller/resourcequota/BUILD @@ -51,7 +51,6 @@ go_test( "//pkg/api/resource:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/client/clientset_generated/clientset/fake:go_default_library", - "//pkg/client/testing/core:go_default_library", "//pkg/controller:go_default_library", "//pkg/quota/generic:go_default_library", "//pkg/quota/install:go_default_library", @@ -60,6 +59,7 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/util/sets", + "//vendor:k8s.io/client-go/testing", ], ) diff --git a/pkg/controller/resourcequota/resource_quota_controller_test.go b/pkg/controller/resourcequota/resource_quota_controller_test.go index d633e12ac12..fee409c70ba 100644 --- a/pkg/controller/resourcequota/resource_quota_controller_test.go +++ b/pkg/controller/resourcequota/resource_quota_controller_test.go @@ -23,11 +23,11 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/sets" + core "k8s.io/client-go/testing" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" - "k8s.io/kubernetes/pkg/client/testing/core" "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/quota/generic" "k8s.io/kubernetes/pkg/quota/install" diff --git a/pkg/controller/route/BUILD b/pkg/controller/route/BUILD index b815e14c6a0..eeba037ef78 100644 --- a/pkg/controller/route/BUILD +++ b/pkg/controller/route/BUILD @@ -42,11 +42,11 @@ go_test( deps = [ "//pkg/api/v1:go_default_library", "//pkg/client/clientset_generated/clientset/fake:go_default_library", - "//pkg/client/testing/core:go_default_library", "//pkg/cloudprovider:go_default_library", "//pkg/cloudprovider/providers/fake:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/types", + "//vendor:k8s.io/client-go/testing", ], ) diff --git a/pkg/controller/route/routecontroller_test.go b/pkg/controller/route/routecontroller_test.go index 8adb23e16b6..ba630930497 100644 --- a/pkg/controller/route/routecontroller_test.go +++ b/pkg/controller/route/routecontroller_test.go @@ -23,9 +23,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + core "k8s.io/client-go/testing" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" - "k8s.io/kubernetes/pkg/client/testing/core" "k8s.io/kubernetes/pkg/cloudprovider" fakecloud "k8s.io/kubernetes/pkg/cloudprovider/providers/fake" ) diff --git a/pkg/controller/serviceaccount/BUILD b/pkg/controller/serviceaccount/BUILD index 6380bdea155..fab47a95b66 100644 --- a/pkg/controller/serviceaccount/BUILD +++ b/pkg/controller/serviceaccount/BUILD @@ -63,7 +63,6 @@ go_test( "//pkg/api/v1:go_default_library", "//pkg/client/clientset_generated/clientset/fake:go_default_library", "//pkg/client/legacylisters:go_default_library", - "//pkg/client/testing/core:go_default_library", "//pkg/controller:go_default_library", "//pkg/controller/informers:go_default_library", "//vendor:github.com/davecgh/go-spew/spew", @@ -74,6 +73,7 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/util/rand", "//vendor:k8s.io/apimachinery/pkg/util/sets", + "//vendor:k8s.io/client-go/testing", "//vendor:k8s.io/client-go/tools/cache", ], ) diff --git a/pkg/controller/serviceaccount/serviceaccounts_controller_test.go b/pkg/controller/serviceaccount/serviceaccounts_controller_test.go index 530a9a715f1..3b0e05692cb 100644 --- a/pkg/controller/serviceaccount/serviceaccounts_controller_test.go +++ b/pkg/controller/serviceaccount/serviceaccounts_controller_test.go @@ -22,11 +22,11 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/sets" + core "k8s.io/client-go/testing" "k8s.io/client-go/tools/cache" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" "k8s.io/kubernetes/pkg/client/legacylisters" - "k8s.io/kubernetes/pkg/client/testing/core" "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/controller/informers" ) diff --git a/pkg/controller/serviceaccount/tokens_controller_test.go b/pkg/controller/serviceaccount/tokens_controller_test.go index e6c00974f7a..791d120f4b0 100644 --- a/pkg/controller/serviceaccount/tokens_controller_test.go +++ b/pkg/controller/serviceaccount/tokens_controller_test.go @@ -30,10 +30,10 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" utilrand "k8s.io/apimachinery/pkg/util/rand" + core "k8s.io/client-go/testing" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" - "k8s.io/kubernetes/pkg/client/testing/core" ) type testGenerator struct { diff --git a/pkg/controller/statefulset/BUILD b/pkg/controller/statefulset/BUILD index 4b38ffa36a3..ae9d1616dc7 100644 --- a/pkg/controller/statefulset/BUILD +++ b/pkg/controller/statefulset/BUILD @@ -67,13 +67,13 @@ go_test( "//pkg/client/clientset_generated/clientset/typed/apps/v1beta1:go_default_library", "//pkg/client/clientset_generated/clientset/typed/apps/v1beta1/fake:go_default_library", "//pkg/client/legacylisters:go_default_library", - "//pkg/client/testing/core:go_default_library", "//pkg/controller:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/errors", "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/testing", "//vendor:k8s.io/client-go/tools/cache", "//vendor:k8s.io/client-go/util/testing", ], diff --git a/pkg/controller/statefulset/statefulpod_test.go b/pkg/controller/statefulset/statefulpod_test.go index 093e99b9dfa..6ab5f898d85 100644 --- a/pkg/controller/statefulset/statefulpod_test.go +++ b/pkg/controller/statefulset/statefulpod_test.go @@ -24,13 +24,13 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" restclient "k8s.io/client-go/rest" + core "k8s.io/client-go/testing" utiltesting "k8s.io/client-go/util/testing" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" - "k8s.io/kubernetes/pkg/client/testing/core" ) func newPetClient(client *clientset.Clientset) *apiServerPetClient { diff --git a/pkg/controller/volume/attachdetach/testing/BUILD b/pkg/controller/volume/attachdetach/testing/BUILD index b4a299c079b..1a9eda3f867 100644 --- a/pkg/controller/volume/attachdetach/testing/BUILD +++ b/pkg/controller/volume/attachdetach/testing/BUILD @@ -14,12 +14,12 @@ go_library( deps = [ "//pkg/api/v1:go_default_library", "//pkg/client/clientset_generated/clientset/fake:go_default_library", - "//pkg/client/testing/core:go_default_library", "//pkg/volume:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/client-go/testing", ], ) diff --git a/pkg/controller/volume/attachdetach/testing/testvolumespec.go b/pkg/controller/volume/attachdetach/testing/testvolumespec.go index fe446d1cde2..b484cfa8ced 100644 --- a/pkg/controller/volume/attachdetach/testing/testvolumespec.go +++ b/pkg/controller/volume/attachdetach/testing/testvolumespec.go @@ -23,9 +23,9 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" + core "k8s.io/client-go/testing" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" - "k8s.io/kubernetes/pkg/client/testing/core" "k8s.io/kubernetes/pkg/volume" ) diff --git a/pkg/controller/volume/persistentvolume/BUILD b/pkg/controller/volume/persistentvolume/BUILD index a6866a3c75d..9eb061f07ee 100644 --- a/pkg/controller/volume/persistentvolume/BUILD +++ b/pkg/controller/volume/persistentvolume/BUILD @@ -68,8 +68,7 @@ go_test( "//pkg/client/clientset_generated/clientset:go_default_library", "//pkg/client/clientset_generated/clientset/fake:go_default_library", "//pkg/client/record:go_default_library", - "//pkg/client/testing/cache:go_default_library", - "//pkg/client/testing/core:go_default_library", + "//pkg/controller/volume/persistentvolume/testing:go_default_library", "//pkg/volume:go_default_library", "//vendor:github.com/golang/glog", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", @@ -77,6 +76,7 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/util/diff", "//vendor:k8s.io/apimachinery/pkg/util/wait", + "//vendor:k8s.io/client-go/testing", "//vendor:k8s.io/client-go/tools/cache", ], ) @@ -93,6 +93,7 @@ filegroup( srcs = [ ":package-srcs", "//pkg/controller/volume/persistentvolume/options:all-srcs", + "//pkg/controller/volume/persistentvolume/testing:all-srcs", ], tags = ["automanaged"], ) diff --git a/pkg/controller/volume/persistentvolume/framework_test.go b/pkg/controller/volume/persistentvolume/framework_test.go index 9369bc10833..ae2c339419d 100644 --- a/pkg/controller/volume/persistentvolume/framework_test.go +++ b/pkg/controller/volume/persistentvolume/framework_test.go @@ -34,6 +34,7 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/diff" "k8s.io/apimachinery/pkg/util/wait" + core "k8s.io/client-go/testing" "k8s.io/client-go/tools/cache" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" @@ -44,8 +45,7 @@ import ( "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" "k8s.io/kubernetes/pkg/client/record" - fcache "k8s.io/kubernetes/pkg/client/testing/cache" - "k8s.io/kubernetes/pkg/client/testing/core" + fcache "k8s.io/kubernetes/pkg/controller/volume/persistentvolume/testing" vol "k8s.io/kubernetes/pkg/volume" ) diff --git a/pkg/controller/volume/persistentvolume/pv_controller_test.go b/pkg/controller/volume/persistentvolume/pv_controller_test.go index 87fdd7f20a0..2346d036b8d 100644 --- a/pkg/controller/volume/persistentvolume/pv_controller_test.go +++ b/pkg/controller/volume/persistentvolume/pv_controller_test.go @@ -24,7 +24,7 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" - fcache "k8s.io/kubernetes/pkg/client/testing/cache" + fcache "k8s.io/kubernetes/pkg/controller/volume/persistentvolume/testing" ) // Test the real controller methods (add/update/delete claim/volume) with diff --git a/pkg/client/testing/cache/BUILD b/pkg/controller/volume/persistentvolume/testing/BUILD similarity index 100% rename from pkg/client/testing/cache/BUILD rename to pkg/controller/volume/persistentvolume/testing/BUILD index 934b93f5be2..18900281556 100644 --- a/pkg/client/testing/cache/BUILD +++ b/pkg/controller/volume/persistentvolume/testing/BUILD @@ -8,6 +8,19 @@ load( "go_test", ) +go_test( + name = "go_default_test", + srcs = ["fake_controller_source_test.go"], + library = ":go_default_library", + tags = ["automanaged"], + deps = [ + "//pkg/api:go_default_library", + "//pkg/api/v1:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/watch", + ], +) + go_library( name = "go_default_library", srcs = ["fake_controller_source.go"], @@ -23,19 +36,6 @@ go_library( ], ) -go_test( - name = "go_default_test", - srcs = ["fake_controller_source_test.go"], - library = ":go_default_library", - tags = ["automanaged"], - deps = [ - "//pkg/api:go_default_library", - "//pkg/api/v1:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/watch", - ], -) - filegroup( name = "package-srcs", srcs = glob(["**"]), diff --git a/pkg/client/testing/cache/fake_controller_source.go b/pkg/controller/volume/persistentvolume/testing/fake_controller_source.go similarity index 100% rename from pkg/client/testing/cache/fake_controller_source.go rename to pkg/controller/volume/persistentvolume/testing/fake_controller_source.go diff --git a/pkg/client/testing/cache/fake_controller_source_test.go b/pkg/controller/volume/persistentvolume/testing/fake_controller_source_test.go similarity index 100% rename from pkg/client/testing/cache/fake_controller_source_test.go rename to pkg/controller/volume/persistentvolume/testing/fake_controller_source_test.go diff --git a/pkg/kubectl/BUILD b/pkg/kubectl/BUILD index bffada69a2d..ac87b25c253 100644 --- a/pkg/kubectl/BUILD +++ b/pkg/kubectl/BUILD @@ -165,7 +165,6 @@ go_test( "//pkg/client/clientset_generated/internalclientset/typed/batch/internalversion:go_default_library", "//pkg/client/clientset_generated/internalclientset/typed/core/internalversion:go_default_library", "//pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion:go_default_library", - "//pkg/client/testing/core:go_default_library", "//pkg/controller/deployment/util:go_default_library", "//pkg/kubectl/testing:go_default_library", "//pkg/util:go_default_library", @@ -182,6 +181,7 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/client-go/rest", "//vendor:k8s.io/client-go/rest/fake", + "//vendor:k8s.io/client-go/testing", "//vendor:k8s.io/client-go/util/testing", ], ) diff --git a/pkg/kubectl/cmd/util/BUILD b/pkg/kubectl/cmd/util/BUILD index dfa6fc0a457..c95f8149813 100644 --- a/pkg/kubectl/cmd/util/BUILD +++ b/pkg/kubectl/cmd/util/BUILD @@ -40,6 +40,7 @@ go_library( "//pkg/kubectl/resource:go_default_library", "//pkg/registry/extensions/thirdpartyresourcedata:go_default_library", "//pkg/util/exec:go_default_library", + "//pkg/version:go_default_library", "//vendor:github.com/emicklei/go-restful/swagger", "//vendor:github.com/evanphx/json-patch", "//vendor:github.com/golang/glog", @@ -88,7 +89,6 @@ go_test( "//pkg/api/validation:go_default_library", "//pkg/apis/extensions:go_default_library", "//pkg/client/clientset_generated/internalclientset/fake:go_default_library", - "//pkg/client/testing/core:go_default_library", "//pkg/controller:go_default_library", "//pkg/kubectl:go_default_library", "//pkg/kubectl/resource:go_default_library", @@ -108,6 +108,7 @@ go_test( "//vendor:k8s.io/client-go/discovery", "//vendor:k8s.io/client-go/rest", "//vendor:k8s.io/client-go/rest/fake", + "//vendor:k8s.io/client-go/testing", "//vendor:k8s.io/client-go/tools/clientcmd", "//vendor:k8s.io/client-go/tools/clientcmd/api", ], diff --git a/pkg/kubectl/cmd/util/clientcache.go b/pkg/kubectl/cmd/util/clientcache.go index 2052fcc9aeb..e88e2df19a0 100644 --- a/pkg/kubectl/cmd/util/clientcache.go +++ b/pkg/kubectl/cmd/util/clientcache.go @@ -27,6 +27,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" oldclient "k8s.io/kubernetes/pkg/client/unversioned" + "k8s.io/kubernetes/pkg/version" ) func NewClientCache(loader clientcmd.ClientConfig, discoveryClientFactory DiscoveryClientFactory) *ClientCache { @@ -76,7 +77,7 @@ func (c *ClientCache) getDefaultConfig() (restclient.Config, discovery.Discovery return restclient.Config{}, nil, err } if c.matchVersion { - if err := discovery.MatchesServerVersion(discoveryClient); err != nil { + if err := discovery.MatchesServerVersion(version.Get(), discoveryClient); err != nil { return restclient.Config{}, nil, err } } diff --git a/pkg/kubectl/cmd/util/factory_test.go b/pkg/kubectl/cmd/util/factory_test.go index e5ac060bc38..36e9a1dd339 100644 --- a/pkg/kubectl/cmd/util/factory_test.go +++ b/pkg/kubectl/cmd/util/factory_test.go @@ -39,6 +39,7 @@ import ( "k8s.io/apimachinery/pkg/watch" "k8s.io/apiserver/pkg/util/flag" manualfake "k8s.io/client-go/rest/fake" + testcore "k8s.io/client-go/testing" "k8s.io/client-go/tools/clientcmd" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" "k8s.io/kubernetes/pkg/api" @@ -47,7 +48,6 @@ import ( "k8s.io/kubernetes/pkg/api/validation" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake" - testcore "k8s.io/kubernetes/pkg/client/testing/core" "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/kubectl" "k8s.io/kubernetes/pkg/kubectl/resource" diff --git a/pkg/kubectl/rolling_updater_test.go b/pkg/kubectl/rolling_updater_test.go index 63a8edadc16..145775580e7 100644 --- a/pkg/kubectl/rolling_updater_test.go +++ b/pkg/kubectl/rolling_updater_test.go @@ -33,12 +33,12 @@ import ( "k8s.io/apimachinery/pkg/util/sets" restclient "k8s.io/client-go/rest" manualfake "k8s.io/client-go/rest/fake" + testcore "k8s.io/client-go/testing" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" apitesting "k8s.io/kubernetes/pkg/api/testing" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake" - testcore "k8s.io/kubernetes/pkg/client/testing/core" "k8s.io/kubernetes/pkg/util/intstr" ) diff --git a/pkg/kubectl/scale_test.go b/pkg/kubectl/scale_test.go index 6ea2b554244..5c870a8cdc2 100644 --- a/pkg/kubectl/scale_test.go +++ b/pkg/kubectl/scale_test.go @@ -22,6 +22,7 @@ import ( kerrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + testcore "k8s.io/client-go/testing" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/batch" "k8s.io/kubernetes/pkg/apis/extensions" @@ -29,7 +30,6 @@ import ( batchclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion" coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" extensionsclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion" - testcore "k8s.io/kubernetes/pkg/client/testing/core" ) type ErrorReplicationControllers struct { diff --git a/pkg/kubectl/stop_test.go b/pkg/kubectl/stop_test.go index 6ab90d6fa58..3f45ad8b507 100644 --- a/pkg/kubectl/stop_test.go +++ b/pkg/kubectl/stop_test.go @@ -28,12 +28,12 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/watch" + testcore "k8s.io/client-go/testing" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/batch" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake" coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" - testcore "k8s.io/kubernetes/pkg/client/testing/core" deploymentutil "k8s.io/kubernetes/pkg/controller/deployment/util" ) diff --git a/pkg/kubelet/BUILD b/pkg/kubelet/BUILD index e8658366a48..ee585aa56d8 100644 --- a/pkg/kubelet/BUILD +++ b/pkg/kubelet/BUILD @@ -160,7 +160,6 @@ go_test( "//pkg/capabilities:go_default_library", "//pkg/client/clientset_generated/clientset/fake:go_default_library", "//pkg/client/record:go_default_library", - "//pkg/client/testing/core:go_default_library", "//pkg/kubelet/cadvisor/testing:go_default_library", "//pkg/kubelet/cm:go_default_library", "//pkg/kubelet/config:go_default_library", @@ -207,6 +206,7 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/util/strategicpatch", "//vendor:k8s.io/apimachinery/pkg/util/uuid", "//vendor:k8s.io/apimachinery/pkg/util/wait", + "//vendor:k8s.io/client-go/testing", "//vendor:k8s.io/client-go/util/clock", "//vendor:k8s.io/client-go/util/flowcontrol", "//vendor:k8s.io/client-go/util/testing", diff --git a/pkg/kubelet/kubelet_node_status_test.go b/pkg/kubelet/kubelet_node_status_test.go index 942507f709d..35bbb6c5f22 100644 --- a/pkg/kubelet/kubelet_node_status_test.go +++ b/pkg/kubelet/kubelet_node_status_test.go @@ -36,11 +36,11 @@ import ( "k8s.io/apimachinery/pkg/util/strategicpatch" "k8s.io/apimachinery/pkg/util/uuid" "k8s.io/apimachinery/pkg/util/wait" + core "k8s.io/client-go/testing" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" - "k8s.io/kubernetes/pkg/client/testing/core" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/util/sliceutils" "k8s.io/kubernetes/pkg/version" diff --git a/pkg/kubelet/kubelet_pods_test.go b/pkg/kubelet/kubelet_pods_test.go index b6edac3995c..091de214cd7 100644 --- a/pkg/kubelet/kubelet_pods_test.go +++ b/pkg/kubelet/kubelet_pods_test.go @@ -31,10 +31,10 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" + core "k8s.io/client-go/testing" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/v1" - "k8s.io/kubernetes/pkg/client/testing/core" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" containertest "k8s.io/kubernetes/pkg/kubelet/container/testing" "k8s.io/kubernetes/pkg/kubelet/server/remotecommand" diff --git a/pkg/kubelet/kubelet_volumes_test.go b/pkg/kubelet/kubelet_volumes_test.go index 1097c244168..bcf157dda8e 100644 --- a/pkg/kubelet/kubelet_volumes_test.go +++ b/pkg/kubelet/kubelet_volumes_test.go @@ -24,8 +24,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" + core "k8s.io/client-go/testing" "k8s.io/kubernetes/pkg/api/v1" - "k8s.io/kubernetes/pkg/client/testing/core" "k8s.io/kubernetes/pkg/volume" volumetest "k8s.io/kubernetes/pkg/volume/testing" "k8s.io/kubernetes/pkg/volume/util/volumehelper" diff --git a/pkg/kubelet/status/BUILD b/pkg/kubelet/status/BUILD index b9df40b46b0..3262346eb3e 100644 --- a/pkg/kubelet/status/BUILD +++ b/pkg/kubelet/status/BUILD @@ -46,7 +46,6 @@ go_test( "//pkg/api/v1:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", "//pkg/client/clientset_generated/clientset/fake:go_default_library", - "//pkg/client/testing/core:go_default_library", "//pkg/kubelet/container:go_default_library", "//pkg/kubelet/pod:go_default_library", "//pkg/kubelet/pod/testing:go_default_library", @@ -57,6 +56,7 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", + "//vendor:k8s.io/client-go/testing", ], ) diff --git a/pkg/kubelet/status/status_manager_test.go b/pkg/kubelet/status/status_manager_test.go index 9540a3a9d86..0ae1929c948 100644 --- a/pkg/kubelet/status/status_manager_test.go +++ b/pkg/kubelet/status/status_manager_test.go @@ -30,11 +30,11 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + core "k8s.io/client-go/testing" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" - "k8s.io/kubernetes/pkg/client/testing/core" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" kubepod "k8s.io/kubernetes/pkg/kubelet/pod" podtest "k8s.io/kubernetes/pkg/kubelet/pod/testing" diff --git a/pkg/kubelet/volumemanager/reconciler/BUILD b/pkg/kubelet/volumemanager/reconciler/BUILD index c01d0faff35..b4470d3c07c 100644 --- a/pkg/kubelet/volumemanager/reconciler/BUILD +++ b/pkg/kubelet/volumemanager/reconciler/BUILD @@ -43,7 +43,6 @@ go_test( "//pkg/api/v1:go_default_library", "//pkg/client/clientset_generated/clientset/fake:go_default_library", "//pkg/client/record:go_default_library", - "//pkg/client/testing/core:go_default_library", "//pkg/kubelet/config:go_default_library", "//pkg/kubelet/volumemanager/cache:go_default_library", "//pkg/util/mount:go_default_library", @@ -57,6 +56,7 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/apimachinery/pkg/util/wait", + "//vendor:k8s.io/client-go/testing", ], ) diff --git a/pkg/kubelet/volumemanager/reconciler/reconciler_test.go b/pkg/kubelet/volumemanager/reconciler/reconciler_test.go index 29833f19eb4..1467eb2776a 100644 --- a/pkg/kubelet/volumemanager/reconciler/reconciler_test.go +++ b/pkg/kubelet/volumemanager/reconciler/reconciler_test.go @@ -27,10 +27,10 @@ import ( k8stypes "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/wait" + core "k8s.io/client-go/testing" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" "k8s.io/kubernetes/pkg/client/record" - "k8s.io/kubernetes/pkg/client/testing/core" "k8s.io/kubernetes/pkg/kubelet/config" "k8s.io/kubernetes/pkg/kubelet/volumemanager/cache" "k8s.io/kubernetes/pkg/util/mount" diff --git a/pkg/master/BUILD b/pkg/master/BUILD index 23bf6b9bced..f7c005f21ca 100644 --- a/pkg/master/BUILD +++ b/pkg/master/BUILD @@ -113,7 +113,6 @@ go_test( "//pkg/apis/rbac:go_default_library", "//pkg/client/clientset_generated/clientset/fake:go_default_library", "//pkg/client/clientset_generated/internalclientset/fake:go_default_library", - "//pkg/client/testing/core:go_default_library", "//pkg/generated/openapi:go_default_library", "//pkg/genericapiserver/server:go_default_library", "//pkg/kubelet/client:go_default_library", @@ -133,6 +132,7 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/version", "//vendor:k8s.io/apiserver/pkg/endpoints/request", "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/testing", ], ) diff --git a/pkg/master/controller_test.go b/pkg/master/controller_test.go index 1266b9c22c9..dbb57a60741 100644 --- a/pkg/master/controller_test.go +++ b/pkg/master/controller_test.go @@ -22,9 +22,9 @@ import ( "testing" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + core "k8s.io/client-go/testing" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake" - "k8s.io/kubernetes/pkg/client/testing/core" "k8s.io/kubernetes/pkg/util/intstr" ) diff --git a/pkg/volume/glusterfs/BUILD b/pkg/volume/glusterfs/BUILD index 63ce7f8d54f..0b55fbe577c 100644 --- a/pkg/volume/glusterfs/BUILD +++ b/pkg/volume/glusterfs/BUILD @@ -49,7 +49,6 @@ go_test( deps = [ "//pkg/api/v1:go_default_library", "//pkg/client/clientset_generated/clientset/fake:go_default_library", - "//pkg/client/testing/core:go_default_library", "//pkg/util/exec:go_default_library", "//pkg/util/mount:go_default_library", "//pkg/volume:go_default_library", @@ -58,6 +57,7 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/types", + "//vendor:k8s.io/client-go/testing", "//vendor:k8s.io/client-go/util/testing", ], ) diff --git a/pkg/volume/glusterfs/glusterfs_test.go b/pkg/volume/glusterfs/glusterfs_test.go index a5fbe56f7a8..18eb03b6692 100644 --- a/pkg/volume/glusterfs/glusterfs_test.go +++ b/pkg/volume/glusterfs/glusterfs_test.go @@ -26,10 +26,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" + core "k8s.io/client-go/testing" utiltesting "k8s.io/client-go/util/testing" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" - "k8s.io/kubernetes/pkg/client/testing/core" "k8s.io/kubernetes/pkg/util/exec" "k8s.io/kubernetes/pkg/util/mount" "k8s.io/kubernetes/pkg/volume" diff --git a/plugin/pkg/admission/exec/BUILD b/plugin/pkg/admission/exec/BUILD index 824add7005b..93c733ed699 100644 --- a/plugin/pkg/admission/exec/BUILD +++ b/plugin/pkg/admission/exec/BUILD @@ -31,11 +31,11 @@ go_test( deps = [ "//pkg/api:go_default_library", "//pkg/client/clientset_generated/internalclientset/fake:go_default_library", - "//pkg/client/testing/core:go_default_library", "//pkg/genericapiserver/registry/rest:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apiserver/pkg/admission", + "//vendor:k8s.io/client-go/testing", ], ) diff --git a/plugin/pkg/admission/exec/admission_test.go b/plugin/pkg/admission/exec/admission_test.go index b77344265c3..d6dd05c01ee 100644 --- a/plugin/pkg/admission/exec/admission_test.go +++ b/plugin/pkg/admission/exec/admission_test.go @@ -22,9 +22,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apiserver/pkg/admission" + core "k8s.io/client-go/testing" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake" - "k8s.io/kubernetes/pkg/client/testing/core" "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" ) diff --git a/plugin/pkg/admission/limitranger/BUILD b/plugin/pkg/admission/limitranger/BUILD index 911f88410ec..6f071dd1aa7 100644 --- a/plugin/pkg/admission/limitranger/BUILD +++ b/plugin/pkg/admission/limitranger/BUILD @@ -42,13 +42,13 @@ go_test( "//pkg/api/resource:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library", "//pkg/client/clientset_generated/internalclientset/fake:go_default_library", - "//pkg/client/testing/core:go_default_library", "//pkg/controller/informers:go_default_library", "//pkg/kubeapiserver/admission:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/wait", "//vendor:k8s.io/apiserver/pkg/admission", + "//vendor:k8s.io/client-go/testing", ], ) diff --git a/plugin/pkg/admission/limitranger/admission_test.go b/plugin/pkg/admission/limitranger/admission_test.go index c502319e98d..37465268333 100644 --- a/plugin/pkg/admission/limitranger/admission_test.go +++ b/plugin/pkg/admission/limitranger/admission_test.go @@ -26,11 +26,11 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apiserver/pkg/admission" + core "k8s.io/client-go/testing" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake" - "k8s.io/kubernetes/pkg/client/testing/core" "k8s.io/kubernetes/pkg/controller/informers" kubeadmission "k8s.io/kubernetes/pkg/kubeapiserver/admission" ) diff --git a/plugin/pkg/admission/namespace/autoprovision/BUILD b/plugin/pkg/admission/namespace/autoprovision/BUILD index 3b0c6a6fb98..e79e6a6ff15 100644 --- a/plugin/pkg/admission/namespace/autoprovision/BUILD +++ b/plugin/pkg/admission/namespace/autoprovision/BUILD @@ -33,7 +33,6 @@ go_test( "//pkg/api:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library", "//pkg/client/clientset_generated/internalclientset/fake:go_default_library", - "//pkg/client/testing/core:go_default_library", "//pkg/controller/informers:go_default_library", "//pkg/kubeapiserver/admission:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/errors", @@ -41,6 +40,7 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/wait", "//vendor:k8s.io/apiserver/pkg/admission", + "//vendor:k8s.io/client-go/testing", ], ) diff --git a/plugin/pkg/admission/namespace/autoprovision/admission_test.go b/plugin/pkg/admission/namespace/autoprovision/admission_test.go index 46f10f3d180..a36e35a6d01 100644 --- a/plugin/pkg/admission/namespace/autoprovision/admission_test.go +++ b/plugin/pkg/admission/namespace/autoprovision/admission_test.go @@ -26,10 +26,10 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apiserver/pkg/admission" + core "k8s.io/client-go/testing" "k8s.io/kubernetes/pkg/api" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake" - "k8s.io/kubernetes/pkg/client/testing/core" "k8s.io/kubernetes/pkg/controller/informers" kubeadmission "k8s.io/kubernetes/pkg/kubeapiserver/admission" ) diff --git a/plugin/pkg/admission/namespace/exists/BUILD b/plugin/pkg/admission/namespace/exists/BUILD index d9061a6880d..e8ecbc8d0a5 100644 --- a/plugin/pkg/admission/namespace/exists/BUILD +++ b/plugin/pkg/admission/namespace/exists/BUILD @@ -33,13 +33,13 @@ go_test( "//pkg/api:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library", "//pkg/client/clientset_generated/internalclientset/fake:go_default_library", - "//pkg/client/testing/core:go_default_library", "//pkg/controller/informers:go_default_library", "//pkg/kubeapiserver/admission:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/wait", "//vendor:k8s.io/apiserver/pkg/admission", + "//vendor:k8s.io/client-go/testing", ], ) diff --git a/plugin/pkg/admission/namespace/exists/admission_test.go b/plugin/pkg/admission/namespace/exists/admission_test.go index 1423900d697..3e9dd39ae60 100644 --- a/plugin/pkg/admission/namespace/exists/admission_test.go +++ b/plugin/pkg/admission/namespace/exists/admission_test.go @@ -25,10 +25,10 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apiserver/pkg/admission" + core "k8s.io/client-go/testing" "k8s.io/kubernetes/pkg/api" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake" - "k8s.io/kubernetes/pkg/client/testing/core" "k8s.io/kubernetes/pkg/controller/informers" kubeadmission "k8s.io/kubernetes/pkg/kubeapiserver/admission" ) diff --git a/plugin/pkg/admission/namespace/lifecycle/BUILD b/plugin/pkg/admission/namespace/lifecycle/BUILD index 17c702e7687..979c78fbe13 100644 --- a/plugin/pkg/admission/namespace/lifecycle/BUILD +++ b/plugin/pkg/admission/namespace/lifecycle/BUILD @@ -37,7 +37,6 @@ go_test( "//pkg/api:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library", "//pkg/client/clientset_generated/internalclientset/fake:go_default_library", - "//pkg/client/testing/core:go_default_library", "//pkg/controller/informers:go_default_library", "//pkg/kubeapiserver/admission:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", @@ -45,6 +44,7 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/apimachinery/pkg/util/wait", "//vendor:k8s.io/apiserver/pkg/admission", + "//vendor:k8s.io/client-go/testing", "//vendor:k8s.io/client-go/util/clock", ], ) diff --git a/plugin/pkg/admission/namespace/lifecycle/admission_test.go b/plugin/pkg/admission/namespace/lifecycle/admission_test.go index d64941c79d5..b5a9cb597e3 100644 --- a/plugin/pkg/admission/namespace/lifecycle/admission_test.go +++ b/plugin/pkg/admission/namespace/lifecycle/admission_test.go @@ -26,11 +26,11 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apiserver/pkg/admission" + core "k8s.io/client-go/testing" "k8s.io/client-go/util/clock" "k8s.io/kubernetes/pkg/api" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake" - "k8s.io/kubernetes/pkg/client/testing/core" "k8s.io/kubernetes/pkg/controller/informers" kubeadmission "k8s.io/kubernetes/pkg/kubeapiserver/admission" ) diff --git a/plugin/pkg/admission/resourcequota/BUILD b/plugin/pkg/admission/resourcequota/BUILD index cb6ad3399b5..146cc14e940 100644 --- a/plugin/pkg/admission/resourcequota/BUILD +++ b/plugin/pkg/admission/resourcequota/BUILD @@ -49,7 +49,6 @@ go_test( "//pkg/api:go_default_library", "//pkg/api/resource:go_default_library", "//pkg/client/clientset_generated/internalclientset/fake:go_default_library", - "//pkg/client/testing/core:go_default_library", "//pkg/quota:go_default_library", "//pkg/quota/generic:go_default_library", "//pkg/quota/install:go_default_library", @@ -58,6 +57,7 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/apiserver/pkg/admission", + "//vendor:k8s.io/client-go/testing", "//vendor:k8s.io/client-go/tools/cache", ], ) diff --git a/plugin/pkg/admission/resourcequota/admission_test.go b/plugin/pkg/admission/resourcequota/admission_test.go index c493012231e..d6027086190 100644 --- a/plugin/pkg/admission/resourcequota/admission_test.go +++ b/plugin/pkg/admission/resourcequota/admission_test.go @@ -28,11 +28,11 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apiserver/pkg/admission" + testcore "k8s.io/client-go/testing" "k8s.io/client-go/tools/cache" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake" - testcore "k8s.io/kubernetes/pkg/client/testing/core" "k8s.io/kubernetes/pkg/quota" "k8s.io/kubernetes/pkg/quota/generic" "k8s.io/kubernetes/pkg/quota/install" diff --git a/staging/copy.sh b/staging/copy.sh index e3d4c7065ec..65947e61435 100755 --- a/staging/copy.sh +++ b/staging/copy.sh @@ -72,6 +72,7 @@ function save() { save "discovery" save "dynamic" save "rest" +save "testing" save "tools/auth" save "tools/cache" save "tools/clientcmd" @@ -90,11 +91,13 @@ function mkcp() { # assemble all the other parts of the staging directory echo "copying client packages" +# need to copy version. We aren't authoritative here +# version has subdirs which we don't need. Only copy the files we want +mkdir -p "${CLIENT_REPO_TEMP}/pkg/version" +find "${MAIN_REPO}/pkg/version" -maxdepth 1 -type f | xargs -I{} cp {} "${CLIENT_REPO_TEMP}/pkg/version" +# need to copy clientsets, though later we should copy APIs and later generate clientsets mkcp "pkg/client/clientset_generated/${CLIENTSET}" "pkg/client/clientset_generated" mkcp "/pkg/client/record" "/pkg/client" -mkcp "/pkg/client/testing" "/pkg/client" -# remove this test because it imports the internal clientset -rm "${CLIENT_REPO_TEMP}"/pkg/client/testing/core/fake_test.go mkcp "/pkg/client/unversioned/portforward" "/pkg/client/unversioned" @@ -185,8 +188,6 @@ function mvfolder { mvfolder "pkg/client/clientset_generated/${CLIENTSET}" kubernetes mvfolder pkg/client/record tools/record mvfolder pkg/client/unversioned/portforward tools/portforward -mvfolder pkg/client/testing/core testing -mvfolder pkg/client/testing/cache tools/cache/testing if [ "$(find "${CLIENT_REPO_TEMP}"/pkg/client -type f -name "*.go")" ]; then echo "${CLIENT_REPO_TEMP}/pkg/client is expected to be empty" exit 1 diff --git a/staging/src/k8s.io/client-go/discovery/helper.go b/staging/src/k8s.io/client-go/discovery/helper.go index 2dfa71913d9..41a580807e5 100644 --- a/staging/src/k8s.io/client-go/discovery/helper.go +++ b/staging/src/k8s.io/client-go/discovery/helper.go @@ -22,7 +22,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/sets" - "k8s.io/client-go/pkg/version" + apimachineryversion "k8s.io/apimachinery/pkg/version" // Import solely to initialize client auth plugins. _ "k8s.io/client-go/plugin/pkg/client/auth" ) @@ -30,15 +30,14 @@ import ( // MatchesServerVersion queries the server to compares the build version // (git hash) of the client with the server's build version. It returns an error // if it failed to contact the server or if the versions are not an exact match. -func MatchesServerVersion(client DiscoveryInterface) error { - cVer := version.Get() +func MatchesServerVersion(clientVersion apimachineryversion.Info, client DiscoveryInterface) error { sVer, err := client.ServerVersion() if err != nil { return fmt.Errorf("couldn't read version from server: %v\n", err) } // GitVersion includes GitCommit and GitTreeState, but best to be safe? - if cVer.GitVersion != sVer.GitVersion || cVer.GitCommit != sVer.GitCommit || cVer.GitTreeState != sVer.GitTreeState { - return fmt.Errorf("server version (%#v) differs from client version (%#v)!\n", sVer, cVer) + if clientVersion.GitVersion != sVer.GitVersion || clientVersion.GitCommit != sVer.GitCommit || clientVersion.GitTreeState != sVer.GitTreeState { + return fmt.Errorf("server version (%#v) differs from client version (%#v)!\n", sVer, clientVersion) } return nil diff --git a/staging/src/k8s.io/client-go/discovery/helper_blackbox_test.go b/staging/src/k8s.io/client-go/discovery/helper_blackbox_test.go index 8b2fae576e5..3232bffb73a 100644 --- a/staging/src/k8s.io/client-go/discovery/helper_blackbox_test.go +++ b/staging/src/k8s.io/client-go/discovery/helper_blackbox_test.go @@ -33,9 +33,10 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/client-go/discovery" "k8s.io/client-go/pkg/api" - "k8s.io/client-go/pkg/api/testapi" restclient "k8s.io/client-go/rest" "k8s.io/client-go/rest/fake" + + _ "k8s.io/client-go/pkg/api/install" ) func objBody(object interface{}) io.ReadCloser { @@ -126,7 +127,7 @@ func TestNegotiateVersion(t *testing.T) { for _, test := range tests { fakeClient := &fake.RESTClient{ APIRegistry: api.Registry, - NegotiatedSerializer: testapi.Default.NegotiatedSerializer(), + NegotiatedSerializer: api.Codecs, Resp: &http.Response{ StatusCode: test.statusCode, Body: objBody(&uapi.APIVersions{Versions: test.serverVersions}), diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/authentication/v1beta1/fake/fake_tokenreview_expansion.go b/staging/src/k8s.io/client-go/kubernetes/typed/authentication/v1beta1/fake/fake_tokenreview_expansion.go index 06173128744..e27e0929074 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/authentication/v1beta1/fake/fake_tokenreview_expansion.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/authentication/v1beta1/fake/fake_tokenreview_expansion.go @@ -18,10 +18,10 @@ package fake import ( authenticationapi "k8s.io/client-go/pkg/apis/authentication/v1beta1" - "k8s.io/client-go/testing" + core "k8s.io/client-go/testing" ) func (c *FakeTokenReviews) Create(tokenReview *authenticationapi.TokenReview) (result *authenticationapi.TokenReview, err error) { - obj, err := c.Fake.Invokes(testing.NewRootCreateAction(authenticationapi.SchemeGroupVersion.WithResource("tokenreviews"), tokenReview), &authenticationapi.TokenReview{}) + obj, err := c.Fake.Invokes(core.NewRootCreateAction(authenticationapi.SchemeGroupVersion.WithResource("tokenreviews"), tokenReview), &authenticationapi.TokenReview{}) return obj.(*authenticationapi.TokenReview), err } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1beta1/fake/fake_localsubjectaccessreview_expansion.go b/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1beta1/fake/fake_localsubjectaccessreview_expansion.go index 983eebe4d5e..0db666db02a 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1beta1/fake/fake_localsubjectaccessreview_expansion.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1beta1/fake/fake_localsubjectaccessreview_expansion.go @@ -18,10 +18,10 @@ package fake import ( authorizationapi "k8s.io/client-go/pkg/apis/authorization/v1beta1" - "k8s.io/client-go/testing" + core "k8s.io/client-go/testing" ) func (c *FakeLocalSubjectAccessReviews) Create(sar *authorizationapi.LocalSubjectAccessReview) (result *authorizationapi.LocalSubjectAccessReview, err error) { - obj, err := c.Fake.Invokes(testing.NewCreateAction(authorizationapi.SchemeGroupVersion.WithResource("localsubjectaccessreviews"), c.ns, sar), &authorizationapi.SubjectAccessReview{}) + obj, err := c.Fake.Invokes(core.NewCreateAction(authorizationapi.SchemeGroupVersion.WithResource("localsubjectaccessreviews"), c.ns, sar), &authorizationapi.SubjectAccessReview{}) return obj.(*authorizationapi.LocalSubjectAccessReview), err } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1beta1/fake/fake_selfsubjectaccessreview_expansion.go b/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1beta1/fake/fake_selfsubjectaccessreview_expansion.go index 4b1baf28392..d1f7756380c 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1beta1/fake/fake_selfsubjectaccessreview_expansion.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1beta1/fake/fake_selfsubjectaccessreview_expansion.go @@ -18,10 +18,10 @@ package fake import ( authorizationapi "k8s.io/client-go/pkg/apis/authorization/v1beta1" - "k8s.io/client-go/testing" + core "k8s.io/client-go/testing" ) func (c *FakeSelfSubjectAccessReviews) Create(sar *authorizationapi.SelfSubjectAccessReview) (result *authorizationapi.SelfSubjectAccessReview, err error) { - obj, err := c.Fake.Invokes(testing.NewRootCreateAction(authorizationapi.SchemeGroupVersion.WithResource("selfsubjectaccessreviews"), sar), &authorizationapi.SelfSubjectAccessReview{}) + obj, err := c.Fake.Invokes(core.NewRootCreateAction(authorizationapi.SchemeGroupVersion.WithResource("selfsubjectaccessreviews"), sar), &authorizationapi.SelfSubjectAccessReview{}) return obj.(*authorizationapi.SelfSubjectAccessReview), err } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1beta1/fake/fake_subjectaccessreview_expansion.go b/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1beta1/fake/fake_subjectaccessreview_expansion.go index b4fe5e8cfdb..58ced8eca69 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1beta1/fake/fake_subjectaccessreview_expansion.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1beta1/fake/fake_subjectaccessreview_expansion.go @@ -18,10 +18,10 @@ package fake import ( authorizationapi "k8s.io/client-go/pkg/apis/authorization/v1beta1" - "k8s.io/client-go/testing" + core "k8s.io/client-go/testing" ) func (c *FakeSubjectAccessReviews) Create(sar *authorizationapi.SubjectAccessReview) (result *authorizationapi.SubjectAccessReview, err error) { - obj, err := c.Fake.Invokes(testing.NewRootCreateAction(authorizationapi.SchemeGroupVersion.WithResource("subjectaccessreviews"), sar), &authorizationapi.SubjectAccessReview{}) + obj, err := c.Fake.Invokes(core.NewRootCreateAction(authorizationapi.SchemeGroupVersion.WithResource("subjectaccessreviews"), sar), &authorizationapi.SubjectAccessReview{}) return obj.(*authorizationapi.SubjectAccessReview), err } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/certificates/v1beta1/fake/fake_certificatesigningrequest_expansion.go b/staging/src/k8s.io/client-go/kubernetes/typed/certificates/v1beta1/fake/fake_certificatesigningrequest_expansion.go index bf6840781ff..2333c0f3ec0 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/certificates/v1beta1/fake/fake_certificatesigningrequest_expansion.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/certificates/v1beta1/fake/fake_certificatesigningrequest_expansion.go @@ -18,12 +18,12 @@ package fake import ( certificates "k8s.io/client-go/pkg/apis/certificates/v1beta1" - "k8s.io/client-go/testing" + core "k8s.io/client-go/testing" ) func (c *FakeCertificateSigningRequests) UpdateApproval(certificateSigningRequest *certificates.CertificateSigningRequest) (result *certificates.CertificateSigningRequest, err error) { obj, err := c.Fake. - Invokes(testing.NewRootUpdateSubresourceAction(certificatesigningrequestsResource, "approval", certificateSigningRequest), &certificates.CertificateSigningRequest{}) + Invokes(core.NewRootUpdateSubresourceAction(certificatesigningrequestsResource, "approval", certificateSigningRequest), &certificates.CertificateSigningRequest{}) if obj == nil { return nil, err } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_event_expansion.go b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_event_expansion.go index f66bb862333..3195eadef62 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_event_expansion.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_event_expansion.go @@ -21,13 +21,13 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/pkg/api" "k8s.io/client-go/pkg/api/v1" - "k8s.io/client-go/testing" + core "k8s.io/client-go/testing" ) func (c *FakeEvents) CreateWithEventNamespace(event *v1.Event) (*v1.Event, error) { - action := testing.NewRootCreateAction(eventsResource, event) + action := core.NewRootCreateAction(eventsResource, event) if c.ns != "" { - action = testing.NewCreateAction(eventsResource, c.ns, event) + action = core.NewCreateAction(eventsResource, c.ns, event) } obj, err := c.Fake.Invokes(action, event) if obj == nil { @@ -39,9 +39,9 @@ func (c *FakeEvents) CreateWithEventNamespace(event *v1.Event) (*v1.Event, error // Update replaces an existing event. Returns the copy of the event the server returns, or an error. func (c *FakeEvents) UpdateWithEventNamespace(event *v1.Event) (*v1.Event, error) { - action := testing.NewRootUpdateAction(eventsResource, event) + action := core.NewRootUpdateAction(eventsResource, event) if c.ns != "" { - action = testing.NewUpdateAction(eventsResource, c.ns, event) + action = core.NewUpdateAction(eventsResource, c.ns, event) } obj, err := c.Fake.Invokes(action, event) if obj == nil { @@ -53,9 +53,9 @@ func (c *FakeEvents) UpdateWithEventNamespace(event *v1.Event) (*v1.Event, error // PatchWithEventNamespace patches an existing event. Returns the copy of the event the server returns, or an error. func (c *FakeEvents) PatchWithEventNamespace(event *v1.Event, data []byte) (*v1.Event, error) { - action := testing.NewRootPatchAction(eventsResource, event.Name, data) + action := core.NewRootPatchAction(eventsResource, event.Name, data) if c.ns != "" { - action = testing.NewPatchAction(eventsResource, c.ns, event.Name, data) + action = core.NewPatchAction(eventsResource, c.ns, event.Name, data) } obj, err := c.Fake.Invokes(action, event) if obj == nil { @@ -67,9 +67,9 @@ func (c *FakeEvents) PatchWithEventNamespace(event *v1.Event, data []byte) (*v1. // Search returns a list of events matching the specified object. func (c *FakeEvents) Search(objOrRef runtime.Object) (*v1.EventList, error) { - action := testing.NewRootListAction(eventsResource, api.ListOptions{}) + action := core.NewRootListAction(eventsResource, api.ListOptions{}) if c.ns != "" { - action = testing.NewListAction(eventsResource, c.ns, api.ListOptions{}) + action = core.NewListAction(eventsResource, c.ns, api.ListOptions{}) } obj, err := c.Fake.Invokes(action, &v1.EventList{}) if obj == nil { @@ -80,7 +80,7 @@ func (c *FakeEvents) Search(objOrRef runtime.Object) (*v1.EventList, error) { } func (c *FakeEvents) GetFieldSelector(involvedObjectName, involvedObjectNamespace, involvedObjectKind, involvedObjectUID *string) fields.Selector { - action := testing.GenericActionImpl{} + action := core.GenericActionImpl{} action.Verb = "get-field-selector" action.Resource = eventsResource diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_namespace_expansion.go b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_namespace_expansion.go index c2e0c0ce726..1ac7e75d765 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_namespace_expansion.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_namespace_expansion.go @@ -18,11 +18,11 @@ package fake import ( "k8s.io/client-go/pkg/api/v1" - "k8s.io/client-go/testing" + core "k8s.io/client-go/testing" ) func (c *FakeNamespaces) Finalize(namespace *v1.Namespace) (*v1.Namespace, error) { - action := testing.CreateActionImpl{} + action := core.CreateActionImpl{} action.Verb = "create" action.Resource = namespacesResource action.Subresource = "finalize" diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_node_expansion.go b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_node_expansion.go index 07740dc7e59..597334582c9 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_node_expansion.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_node_expansion.go @@ -18,12 +18,12 @@ package fake import ( "k8s.io/client-go/pkg/api/v1" - "k8s.io/client-go/testing" + core "k8s.io/client-go/testing" ) func (c *FakeNodes) PatchStatus(nodeName string, data []byte) (*v1.Node, error) { obj, err := c.Fake.Invokes( - testing.NewRootPatchSubresourceAction(nodesResource, nodeName, data, "status"), &v1.Node{}) + core.NewRootPatchSubresourceAction(nodesResource, nodeName, data, "status"), &v1.Node{}) if obj == nil { return nil, err } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_pod_expansion.go b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_pod_expansion.go index c54c1658312..c9d404e1623 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_pod_expansion.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_pod_expansion.go @@ -20,11 +20,11 @@ import ( "k8s.io/client-go/pkg/api/v1" policy "k8s.io/client-go/pkg/apis/policy/v1beta1" restclient "k8s.io/client-go/rest" - "k8s.io/client-go/testing" + core "k8s.io/client-go/testing" ) func (c *FakePods) Bind(binding *v1.Binding) error { - action := testing.CreateActionImpl{} + action := core.CreateActionImpl{} action.Verb = "create" action.Resource = podsResource action.Subresource = "bindings" @@ -35,7 +35,7 @@ func (c *FakePods) Bind(binding *v1.Binding) error { } func (c *FakePods) GetLogs(name string, opts *v1.PodLogOptions) *restclient.Request { - action := testing.GenericActionImpl{} + action := core.GenericActionImpl{} action.Verb = "get" action.Namespace = c.ns action.Resource = podsResource @@ -47,7 +47,7 @@ func (c *FakePods) GetLogs(name string, opts *v1.PodLogOptions) *restclient.Requ } func (c *FakePods) Evict(eviction *policy.Eviction) error { - action := testing.CreateActionImpl{} + action := core.CreateActionImpl{} action.Verb = "create" action.Resource = podsResource action.Subresource = "eviction" diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_service_expansion.go b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_service_expansion.go index 59fa8e51241..92e4930d711 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_service_expansion.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_service_expansion.go @@ -18,9 +18,9 @@ package fake import ( restclient "k8s.io/client-go/rest" - "k8s.io/client-go/testing" + core "k8s.io/client-go/testing" ) func (c *FakeServices) ProxyGet(scheme, name, port, path string, params map[string]string) restclient.ResponseWrapper { - return c.Fake.InvokesProxy(testing.NewProxyGetAction(servicesResource, c.ns, scheme, name, port, path, params)) + return c.Fake.InvokesProxy(core.NewProxyGetAction(servicesResource, c.ns, scheme, name, port, path, params)) } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/fake/fake_deployment_expansion.go b/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/fake/fake_deployment_expansion.go index cb4ff17481b..f49c3366640 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/fake/fake_deployment_expansion.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/fake/fake_deployment_expansion.go @@ -18,11 +18,11 @@ package fake import ( "k8s.io/client-go/pkg/apis/extensions/v1beta1" - "k8s.io/client-go/testing" + core "k8s.io/client-go/testing" ) func (c *FakeDeployments) Rollback(deploymentRollback *v1beta1.DeploymentRollback) error { - action := testing.CreateActionImpl{} + action := core.CreateActionImpl{} action.Verb = "create" action.Resource = deploymentsResource action.Subresource = "rollback" diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/fake/fake_scale_expansion.go b/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/fake/fake_scale_expansion.go index dca6226acfa..db13b4c37ba 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/fake/fake_scale_expansion.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/fake/fake_scale_expansion.go @@ -19,11 +19,11 @@ package fake import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/client-go/pkg/apis/extensions/v1beta1" - "k8s.io/client-go/testing" + core "k8s.io/client-go/testing" ) func (c *FakeScales) Get(kind string, name string) (result *v1beta1.Scale, err error) { - action := testing.GetActionImpl{} + action := core.GetActionImpl{} action.Verb = "get" action.Namespace = c.ns action.Resource = schema.GroupVersionResource{Resource: kind} @@ -35,7 +35,7 @@ func (c *FakeScales) Get(kind string, name string) (result *v1beta1.Scale, err e } func (c *FakeScales) Update(kind string, scale *v1beta1.Scale) (result *v1beta1.Scale, err error) { - action := testing.UpdateActionImpl{} + action := core.UpdateActionImpl{} action.Verb = "update" action.Namespace = c.ns action.Resource = schema.GroupVersionResource{Resource: kind} diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/policy/v1beta1/fake/fake_eviction_expansion.go b/staging/src/k8s.io/client-go/kubernetes/typed/policy/v1beta1/fake/fake_eviction_expansion.go index d5e686a1d99..35c40713c06 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/policy/v1beta1/fake/fake_eviction_expansion.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/policy/v1beta1/fake/fake_eviction_expansion.go @@ -19,11 +19,11 @@ package fake import ( "k8s.io/apimachinery/pkg/runtime/schema" policy "k8s.io/client-go/pkg/apis/policy/v1beta1" - testing "k8s.io/client-go/testing" + core "k8s.io/client-go/testing" ) func (c *FakeEvictions) Evict(eviction *policy.Eviction) error { - action := testing.GetActionImpl{} + action := core.GetActionImpl{} action.Verb = "post" action.Namespace = c.ns action.Resource = schema.GroupVersionResource{Group: "", Version: "", Resource: "pods"} diff --git a/staging/src/k8s.io/client-go/pkg/version/doc.go b/staging/src/k8s.io/client-go/pkg/version/doc.go index ccedec76f61..4bf139ce8b5 100644 --- a/staging/src/k8s.io/client-go/pkg/version/doc.go +++ b/staging/src/k8s.io/client-go/pkg/version/doc.go @@ -16,4 +16,4 @@ limitations under the License. // Package version supplies version information collected at build time to // kubernetes components. -package version +package version // import "k8s.io/client-go/pkg/version" diff --git a/staging/src/k8s.io/client-go/rest/client_test.go b/staging/src/k8s.io/client-go/rest/client_test.go index 51dd61b92ad..91eb8c8a0f0 100644 --- a/staging/src/k8s.io/client-go/rest/client_test.go +++ b/staging/src/k8s.io/client-go/rest/client_test.go @@ -34,8 +34,10 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/diff" "k8s.io/client-go/pkg/api" - "k8s.io/client-go/pkg/api/testapi" + "k8s.io/client-go/pkg/api/v1" utiltesting "k8s.io/client-go/util/testing" + + _ "k8s.io/client-go/pkg/api/install" ) type TestParam struct { @@ -91,7 +93,7 @@ func TestDoRequestFailed(t *testing.T) { Message: " \"\" not found", Details: &metav1.StatusDetails{}, } - expectedBody, _ := runtime.Encode(testapi.Default.Codec(), status) + expectedBody, _ := runtime.Encode(api.Codecs.LegacyCodec(v1.SchemeGroupVersion), status) fakeHandler := utiltesting.FakeHandler{ StatusCode: 404, ResponseBody: string(expectedBody), @@ -130,7 +132,7 @@ func TestDoRawRequestFailed(t *testing.T) { }, }, } - expectedBody, _ := runtime.Encode(testapi.Default.Codec(), status) + expectedBody, _ := runtime.Encode(api.Codecs.LegacyCodec(v1.SchemeGroupVersion), status) fakeHandler := utiltesting.FakeHandler{ StatusCode: 404, ResponseBody: string(expectedBody), @@ -229,7 +231,7 @@ func validate(testParam TestParam, t *testing.T, body []byte, fakeHandler *utilt t.Errorf("Expected object not to be created") } } - statusOut, err := runtime.Decode(testapi.Default.Codec(), body) + statusOut, err := runtime.Decode(api.Codecs.LegacyCodec(v1.SchemeGroupVersion), body) if testParam.testBody { if testParam.testBodyErrorIsNotNil { if err == nil { @@ -316,7 +318,7 @@ func TestCreateBackoffManager(t *testing.T) { func testServerEnv(t *testing.T, statusCode int) (*httptest.Server, *utiltesting.FakeHandler, *metav1.Status) { status := &metav1.Status{Status: fmt.Sprintf("%s", metav1.StatusSuccess)} - expectedBody, _ := runtime.Encode(testapi.Default.Codec(), status) + expectedBody, _ := runtime.Encode(api.Codecs.LegacyCodec(v1.SchemeGroupVersion), status) fakeHandler := utiltesting.FakeHandler{ StatusCode: statusCode, ResponseBody: string(expectedBody), @@ -331,7 +333,7 @@ func restClient(testServer *httptest.Server) (*RESTClient, error) { Host: testServer.URL, ContentConfig: ContentConfig{ GroupVersion: &api.Registry.GroupOrDie(api.GroupName).GroupVersion, - NegotiatedSerializer: testapi.Default.NegotiatedSerializer(), + NegotiatedSerializer: api.Codecs, }, Username: "user", Password: "pass", diff --git a/staging/src/k8s.io/client-go/rest/config_test.go b/staging/src/k8s.io/client-go/rest/config_test.go index e1ee26b47f4..41336335379 100644 --- a/staging/src/k8s.io/client-go/rest/config_test.go +++ b/staging/src/k8s.io/client-go/rest/config_test.go @@ -29,9 +29,10 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/diff" "k8s.io/client-go/pkg/api" - "k8s.io/client-go/pkg/api/testapi" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" "k8s.io/client-go/util/flowcontrol" + + _ "k8s.io/client-go/pkg/api/install" ) func TestIsConfigTransportTLS(t *testing.T) { @@ -98,13 +99,13 @@ func TestSetKubernetesDefaultsUserAgent(t *testing.T) { } func TestRESTClientRequires(t *testing.T) { - if _, err := RESTClientFor(&Config{Host: "127.0.0.1", ContentConfig: ContentConfig{NegotiatedSerializer: testapi.Default.NegotiatedSerializer()}}); err == nil { + if _, err := RESTClientFor(&Config{Host: "127.0.0.1", ContentConfig: ContentConfig{NegotiatedSerializer: api.Codecs}}); err == nil { t.Errorf("unexpected non-error") } if _, err := RESTClientFor(&Config{Host: "127.0.0.1", ContentConfig: ContentConfig{GroupVersion: &api.Registry.GroupOrDie(api.GroupName).GroupVersion}}); err == nil { t.Errorf("unexpected non-error") } - if _, err := RESTClientFor(&Config{Host: "127.0.0.1", ContentConfig: ContentConfig{GroupVersion: &api.Registry.GroupOrDie(api.GroupName).GroupVersion, NegotiatedSerializer: testapi.Default.NegotiatedSerializer()}}); err != nil { + if _, err := RESTClientFor(&Config{Host: "127.0.0.1", ContentConfig: ContentConfig{GroupVersion: &api.Registry.GroupOrDie(api.GroupName).GroupVersion, NegotiatedSerializer: api.Codecs}}); err != nil { t.Errorf("unexpected error: %v", err) } } diff --git a/staging/src/k8s.io/client-go/rest/request_test.go b/staging/src/k8s.io/client-go/rest/request_test.go index e7b68c0e046..db6049c925c 100755 --- a/staging/src/k8s.io/client-go/rest/request_test.go +++ b/staging/src/k8s.io/client-go/rest/request_test.go @@ -43,7 +43,6 @@ import ( "k8s.io/apimachinery/pkg/util/diff" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/pkg/api" - "k8s.io/client-go/pkg/api/testapi" "k8s.io/client-go/pkg/api/v1" "k8s.io/client-go/pkg/util/httpstream" "k8s.io/client-go/pkg/util/intstr" @@ -51,6 +50,8 @@ import ( "k8s.io/client-go/util/clock" "k8s.io/client-go/util/flowcontrol" utiltesting "k8s.io/client-go/util/testing" + + _ "k8s.io/client-go/pkg/api/install" ) func TestNewRequestSetsAccept(t *testing.T) { @@ -279,18 +280,18 @@ func (obj NotAnAPIObject) SetGroupVersionKind(gvk *schema.GroupVersionKind) {} func defaultContentConfig() ContentConfig { return ContentConfig{ GroupVersion: &api.Registry.GroupOrDie(api.GroupName).GroupVersion, - NegotiatedSerializer: testapi.Default.NegotiatedSerializer(), + NegotiatedSerializer: api.Codecs, } } func defaultSerializers() Serializers { return Serializers{ - Encoder: testapi.Default.Codec(), - Decoder: testapi.Default.Codec(), - StreamingSerializer: testapi.Default.Codec(), + Encoder: api.Codecs.LegacyCodec(v1.SchemeGroupVersion), + Decoder: api.Codecs.LegacyCodec(v1.SchemeGroupVersion), + StreamingSerializer: api.Codecs.LegacyCodec(v1.SchemeGroupVersion), Framer: runtime.DefaultFramer, RenegotiatedDecoder: func(contentType string, params map[string]string) (runtime.Decoder, error) { - return testapi.Default.Codec(), nil + return api.Codecs.LegacyCodec(v1.SchemeGroupVersion), nil }, } } @@ -473,7 +474,7 @@ func TestTransformResponseNegotiate(t *testing.T) { Header: http.Header{"Content-Type": []string{"application/protobuf"}}, Body: ioutil.NopCloser(bytes.NewReader(invalid)), }, - Decoder: testapi.Default.Codec(), + Decoder: api.Codecs.LegacyCodec(v1.SchemeGroupVersion), Called: true, ExpectContentType: "application/protobuf", @@ -489,7 +490,7 @@ func TestTransformResponseNegotiate(t *testing.T) { StatusCode: 500, Header: http.Header{"Content-Type": []string{"application/,others"}}, }, - Decoder: testapi.Default.Codec(), + Decoder: api.Codecs.LegacyCodec(v1.SchemeGroupVersion), Error: true, ErrFn: func(err error) bool { @@ -503,7 +504,7 @@ func TestTransformResponseNegotiate(t *testing.T) { Header: http.Header{"Content-Type": []string{"text/any"}}, Body: ioutil.NopCloser(bytes.NewReader(invalid)), }, - Decoder: testapi.Default.Codec(), + Decoder: api.Codecs.LegacyCodec(v1.SchemeGroupVersion), }, { // no negotiation when no response content type specified @@ -512,7 +513,7 @@ func TestTransformResponseNegotiate(t *testing.T) { StatusCode: 200, Body: ioutil.NopCloser(bytes.NewReader(invalid)), }, - Decoder: testapi.Default.Codec(), + Decoder: api.Codecs.LegacyCodec(v1.SchemeGroupVersion), }, { // unrecognized content type is not handled @@ -522,7 +523,7 @@ func TestTransformResponseNegotiate(t *testing.T) { Header: http.Header{"Content-Type": []string{"application/unrecognized"}}, Body: ioutil.NopCloser(bytes.NewReader(invalid)), }, - Decoder: testapi.Default.Codec(), + Decoder: api.Codecs.LegacyCodec(v1.SchemeGroupVersion), NegotiateErr: fmt.Errorf("aaaa"), Called: true, @@ -785,7 +786,7 @@ func TestRequestWatch(t *testing.T) { client: clientFunc(func(req *http.Request) (*http.Response, error) { return &http.Response{ StatusCode: http.StatusUnauthorized, - Body: ioutil.NopCloser(bytes.NewReader([]byte(runtime.EncodeOrDie(testapi.Default.Codec(), &metav1.Status{ + Body: ioutil.NopCloser(bytes.NewReader([]byte(runtime.EncodeOrDie(api.Codecs.LegacyCodec(v1.SchemeGroupVersion), &metav1.Status{ Status: metav1.StatusFailure, Reason: metav1.StatusReasonUnauthorized, })))), @@ -892,7 +893,7 @@ func TestRequestStream(t *testing.T) { client: clientFunc(func(req *http.Request) (*http.Response, error) { return &http.Response{ StatusCode: http.StatusUnauthorized, - Body: ioutil.NopCloser(bytes.NewReader([]byte(runtime.EncodeOrDie(testapi.Default.Codec(), &metav1.Status{ + Body: ioutil.NopCloser(bytes.NewReader([]byte(runtime.EncodeOrDie(api.Codecs.LegacyCodec(v1.SchemeGroupVersion), &metav1.Status{ Status: metav1.StatusFailure, Reason: metav1.StatusReasonUnauthorized, })))), @@ -1021,7 +1022,7 @@ func TestDoRequestNewWay(t *testing.T) { Port: 12345, TargetPort: intstr.FromInt(12345), }}}} - expectedBody, _ := runtime.Encode(testapi.Default.Codec(), expectedObj) + expectedBody, _ := runtime.Encode(api.Codecs.LegacyCodec(v1.SchemeGroupVersion), expectedObj) fakeHandler := utiltesting.FakeHandler{ StatusCode: 200, ResponseBody: string(expectedBody), @@ -1045,7 +1046,7 @@ func TestDoRequestNewWay(t *testing.T) { } else if !api.Semantic.DeepDerivative(expectedObj, obj) { t.Errorf("Expected: %#v, got %#v", expectedObj, obj) } - requestURL := testapi.Default.ResourcePathWithPrefix("foo/bar", "", "", "baz") + requestURL := defaultResourcePathWithPrefix("foo/bar", "", "", "baz") requestURL += "?timeout=1s" fakeHandler.ValidateRequest(t, requestURL, "POST", &reqBody) } @@ -1246,13 +1247,13 @@ func BenchmarkCheckRetryClosesBody(b *testing.B) { func TestDoRequestNewWayReader(t *testing.T) { reqObj := &api.Pod{ObjectMeta: metav1.ObjectMeta{Name: "foo"}} - reqBodyExpected, _ := runtime.Encode(testapi.Default.Codec(), reqObj) + reqBodyExpected, _ := runtime.Encode(api.Codecs.LegacyCodec(v1.SchemeGroupVersion), reqObj) expectedObj := &api.Service{Spec: api.ServiceSpec{Ports: []api.ServicePort{{ Protocol: "TCP", Port: 12345, TargetPort: intstr.FromInt(12345), }}}} - expectedBody, _ := runtime.Encode(testapi.Default.Codec(), expectedObj) + expectedBody, _ := runtime.Encode(api.Codecs.LegacyCodec(v1.SchemeGroupVersion), expectedObj) fakeHandler := utiltesting.FakeHandler{ StatusCode: 200, ResponseBody: string(expectedBody), @@ -1279,20 +1280,20 @@ func TestDoRequestNewWayReader(t *testing.T) { t.Errorf("Expected: %#v, got %#v", expectedObj, obj) } tmpStr := string(reqBodyExpected) - requestURL := testapi.Default.ResourcePathWithPrefix("foo", "bar", "", "baz") + requestURL := defaultResourcePathWithPrefix("foo", "bar", "", "baz") requestURL += "?" + metav1.LabelSelectorQueryParam(api.Registry.GroupOrDie(api.GroupName).GroupVersion.String()) + "=name%3Dfoo&timeout=1s" fakeHandler.ValidateRequest(t, requestURL, "POST", &tmpStr) } func TestDoRequestNewWayObj(t *testing.T) { reqObj := &api.Pod{ObjectMeta: metav1.ObjectMeta{Name: "foo"}} - reqBodyExpected, _ := runtime.Encode(testapi.Default.Codec(), reqObj) + reqBodyExpected, _ := runtime.Encode(api.Codecs.LegacyCodec(v1.SchemeGroupVersion), reqObj) expectedObj := &api.Service{Spec: api.ServiceSpec{Ports: []api.ServicePort{{ Protocol: "TCP", Port: 12345, TargetPort: intstr.FromInt(12345), }}}} - expectedBody, _ := runtime.Encode(testapi.Default.Codec(), expectedObj) + expectedBody, _ := runtime.Encode(api.Codecs.LegacyCodec(v1.SchemeGroupVersion), expectedObj) fakeHandler := utiltesting.FakeHandler{ StatusCode: 200, ResponseBody: string(expectedBody), @@ -1319,14 +1320,14 @@ func TestDoRequestNewWayObj(t *testing.T) { t.Errorf("Expected: %#v, got %#v", expectedObj, obj) } tmpStr := string(reqBodyExpected) - requestURL := testapi.Default.ResourcePath("foo", "", "bar/baz") + requestURL := defaultResourcePathWithPrefix("", "foo", "", "bar/baz") requestURL += "?" + metav1.LabelSelectorQueryParam(api.Registry.GroupOrDie(api.GroupName).GroupVersion.String()) + "=name%3Dfoo&timeout=1s" fakeHandler.ValidateRequest(t, requestURL, "POST", &tmpStr) } func TestDoRequestNewWayFile(t *testing.T) { reqObj := &api.Pod{ObjectMeta: metav1.ObjectMeta{Name: "foo"}} - reqBodyExpected, err := runtime.Encode(testapi.Default.Codec(), reqObj) + reqBodyExpected, err := runtime.Encode(api.Codecs.LegacyCodec(v1.SchemeGroupVersion), reqObj) if err != nil { t.Errorf("unexpected error: %v", err) } @@ -1348,7 +1349,7 @@ func TestDoRequestNewWayFile(t *testing.T) { Port: 12345, TargetPort: intstr.FromInt(12345), }}}} - expectedBody, _ := runtime.Encode(testapi.Default.Codec(), expectedObj) + expectedBody, _ := runtime.Encode(api.Codecs.LegacyCodec(v1.SchemeGroupVersion), expectedObj) fakeHandler := utiltesting.FakeHandler{ StatusCode: 200, ResponseBody: string(expectedBody), @@ -1376,14 +1377,14 @@ func TestDoRequestNewWayFile(t *testing.T) { t.Errorf("expected object was created") } tmpStr := string(reqBodyExpected) - requestURL := testapi.Default.ResourcePathWithPrefix("foo/bar/baz", "", "", "") + requestURL := defaultResourcePathWithPrefix("foo/bar/baz", "", "", "") requestURL += "?timeout=1s" fakeHandler.ValidateRequest(t, requestURL, "POST", &tmpStr) } func TestWasCreated(t *testing.T) { reqObj := &api.Pod{ObjectMeta: metav1.ObjectMeta{Name: "foo"}} - reqBodyExpected, err := runtime.Encode(testapi.Default.Codec(), reqObj) + reqBodyExpected, err := runtime.Encode(api.Codecs.LegacyCodec(v1.SchemeGroupVersion), reqObj) if err != nil { t.Errorf("unexpected error: %v", err) } @@ -1393,7 +1394,7 @@ func TestWasCreated(t *testing.T) { Port: 12345, TargetPort: intstr.FromInt(12345), }}}} - expectedBody, _ := runtime.Encode(testapi.Default.Codec(), expectedObj) + expectedBody, _ := runtime.Encode(api.Codecs.LegacyCodec(v1.SchemeGroupVersion), expectedObj) fakeHandler := utiltesting.FakeHandler{ StatusCode: 201, ResponseBody: string(expectedBody), @@ -1422,7 +1423,7 @@ func TestWasCreated(t *testing.T) { } tmpStr := string(reqBodyExpected) - requestURL := testapi.Default.ResourcePathWithPrefix("foo/bar/baz", "", "", "") + requestURL := defaultResourcePathWithPrefix("foo/bar/baz", "", "", "") requestURL += "?timeout=1s" fakeHandler.ValidateRequest(t, requestURL, "PUT", &tmpStr) } @@ -1520,7 +1521,7 @@ func TestBody(t *testing.T) { const data = "test payload" obj := &api.Pod{ObjectMeta: metav1.ObjectMeta{Name: "foo"}} - bodyExpected, _ := runtime.Encode(testapi.Default.Codec(), obj) + bodyExpected, _ := runtime.Encode(api.Codecs.LegacyCodec(v1.SchemeGroupVersion), obj) f, err := ioutil.TempFile("", "test_body") if err != nil { @@ -1598,7 +1599,7 @@ func TestWatch(t *testing.T) { w.WriteHeader(http.StatusOK) flusher.Flush() - encoder := restclientwatch.NewEncoder(streaming.NewEncoder(w, testapi.Default.Codec()), testapi.Default.Codec()) + encoder := restclientwatch.NewEncoder(streaming.NewEncoder(w, api.Codecs.LegacyCodec(v1.SchemeGroupVersion)), api.Codecs.LegacyCodec(v1.SchemeGroupVersion)) for _, item := range table { if err := encoder.Encode(&watch.Event{Type: item.t, Object: item.obj}); err != nil { panic(err) @@ -1672,7 +1673,7 @@ func testRESTClient(t testing.TB, srv *httptest.Server) *RESTClient { t.Fatalf("failed to parse test URL: %v", err) } } - versionedAPIPath := testapi.Default.ResourcePath("", "", "") + versionedAPIPath := defaultResourcePathWithPrefix("", "", "", "") client, err := NewRESTClient(baseURL, versionedAPIPath, defaultContentConfig(), 0, 0, nil, nil) if err != nil { t.Fatalf("failed to create a client: %v", err) @@ -1708,3 +1709,24 @@ func TestDoContext(t *testing.T) { t.Fatal("Expected context cancellation error") } } + +func defaultResourcePathWithPrefix(prefix, resource, namespace, name string) string { + var path string + path = "/api/" + v1.SchemeGroupVersion.Version + + if prefix != "" { + path = path + "/" + prefix + } + if namespace != "" { + path = path + "/namespaces/" + namespace + } + // Resource names are lower case. + resource = strings.ToLower(resource) + if resource != "" { + path = path + "/" + resource + } + if name != "" { + path = path + "/" + name + } + return path +} diff --git a/staging/src/k8s.io/client-go/rest/watch/decoder_test.go b/staging/src/k8s.io/client-go/rest/watch/decoder_test.go index 312c2875b4e..559d1e5f772 100644 --- a/staging/src/k8s.io/client-go/rest/watch/decoder_test.go +++ b/staging/src/k8s.io/client-go/rest/watch/decoder_test.go @@ -28,8 +28,10 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/pkg/api" - "k8s.io/client-go/pkg/api/testapi" + "k8s.io/client-go/pkg/api/v1" restclientwatch "k8s.io/client-go/rest/watch" + + _ "k8s.io/client-go/pkg/api/install" ) func TestDecoder(t *testing.T) { @@ -37,13 +39,13 @@ func TestDecoder(t *testing.T) { for _, eventType := range table { out, in := io.Pipe() - codec := testapi.Default.Codec() + codec := api.Codecs.LegacyCodec(v1.SchemeGroupVersion) decoder := restclientwatch.NewDecoder(streaming.NewDecoder(out, codec), codec) expect := &api.Pod{ObjectMeta: metav1.ObjectMeta{Name: "foo"}} encoder := json.NewEncoder(in) go func() { - data, err := runtime.Encode(testapi.Default.Codec(), expect) + data, err := runtime.Encode(api.Codecs.LegacyCodec(v1.SchemeGroupVersion), expect) if err != nil { t.Fatalf("Unexpected error %v", err) } @@ -90,7 +92,7 @@ func TestDecoder(t *testing.T) { func TestDecoder_SourceClose(t *testing.T) { out, in := io.Pipe() - codec := testapi.Default.Codec() + codec := api.Codecs.LegacyCodec(v1.SchemeGroupVersion) decoder := restclientwatch.NewDecoder(streaming.NewDecoder(out, codec), codec) done := make(chan struct{}) diff --git a/staging/src/k8s.io/client-go/rest/watch/encoder_test.go b/staging/src/k8s.io/client-go/rest/watch/encoder_test.go index 31f3610ca7a..6a8e1e8a3fd 100644 --- a/staging/src/k8s.io/client-go/rest/watch/encoder_test.go +++ b/staging/src/k8s.io/client-go/rest/watch/encoder_test.go @@ -26,8 +26,10 @@ import ( "k8s.io/apimachinery/pkg/runtime/serializer/streaming" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/pkg/api" - "k8s.io/client-go/pkg/api/testapi" + "k8s.io/client-go/pkg/api/v1" restclientwatch "k8s.io/client-go/rest/watch" + + _ "k8s.io/client-go/pkg/api/install" ) func TestEncodeDecodeRoundTrip(t *testing.T) { @@ -39,17 +41,17 @@ func TestEncodeDecodeRoundTrip(t *testing.T) { { watch.Added, &api.Pod{ObjectMeta: metav1.ObjectMeta{Name: "foo"}}, - testapi.Default.Codec(), + api.Codecs.LegacyCodec(v1.SchemeGroupVersion), }, { watch.Modified, &api.Pod{ObjectMeta: metav1.ObjectMeta{Name: "foo"}}, - testapi.Default.Codec(), + api.Codecs.LegacyCodec(v1.SchemeGroupVersion), }, { watch.Deleted, &api.Pod{ObjectMeta: metav1.ObjectMeta{Name: "foo"}}, - testapi.Default.Codec(), + api.Codecs.LegacyCodec(v1.SchemeGroupVersion), }, } for i, testCase := range testCases { diff --git a/staging/src/k8s.io/client-go/testing/fixture.go b/staging/src/k8s.io/client-go/testing/fixture.go index 64a617cf854..f6858535742 100644 --- a/staging/src/k8s.io/client-go/testing/fixture.go +++ b/staging/src/k8s.io/client-go/testing/fixture.go @@ -22,11 +22,11 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/meta" + "k8s.io/apimachinery/pkg/apimachinery/registered" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/watch" - "k8s.io/client-go/pkg/api" restclient "k8s.io/client-go/rest" ) @@ -144,21 +144,23 @@ func ObjectReaction(tracker ObjectTracker, mapper meta.RESTMapper) ReactionFunc } type tracker struct { - scheme ObjectScheme - decoder runtime.Decoder - lock sync.RWMutex - objects map[schema.GroupVersionKind][]runtime.Object + registry *registered.APIRegistrationManager + scheme ObjectScheme + decoder runtime.Decoder + lock sync.RWMutex + objects map[schema.GroupVersionKind][]runtime.Object } var _ ObjectTracker = &tracker{} // NewObjectTracker returns an ObjectTracker that can be used to keep track // of objects for the fake clientset. Mostly useful for unit tests. -func NewObjectTracker(scheme ObjectScheme, decoder runtime.Decoder) ObjectTracker { +func NewObjectTracker(registry *registered.APIRegistrationManager, scheme ObjectScheme, decoder runtime.Decoder) ObjectTracker { return &tracker{ - scheme: scheme, - decoder: decoder, - objects: make(map[schema.GroupVersionKind][]runtime.Object), + registry: registry, + scheme: scheme, + decoder: decoder, + objects: make(map[schema.GroupVersionKind][]runtime.Object), } } @@ -200,7 +202,7 @@ func (t *tracker) List(gvk schema.GroupVersionKind, ns string) (runtime.Object, } func (t *tracker) Get(gvk schema.GroupVersionKind, ns, name string) (runtime.Object, error) { - if err := checkNamespace(gvk, ns); err != nil { + if err := checkNamespace(t.registry, gvk, ns); err != nil { return nil, err } @@ -307,7 +309,7 @@ func (t *tracker) add(obj runtime.Object, ns string, replaceExisting bool) error return errors.NewBadRequest(msg) } - if err := checkNamespace(gvk, newMeta.GetNamespace()); err != nil { + if err := checkNamespace(t.registry, gvk, newMeta.GetNamespace()); err != nil { return err } @@ -359,7 +361,7 @@ func (t *tracker) addList(obj runtime.Object, replaceExisting bool) error { } func (t *tracker) Delete(gvk schema.GroupVersionKind, ns, name string) error { - if err := checkNamespace(gvk, ns); err != nil { + if err := checkNamespace(t.registry, gvk, ns); err != nil { return err } @@ -413,8 +415,8 @@ func filterByNamespaceAndName(objs []runtime.Object, ns, name string) ([]runtime // checkNamespace makes sure that the scope of gvk matches ns. It // returns an error if namespace is empty but gvk is a namespaced // kind, or if ns is non-empty and gvk is a namespaced kind. -func checkNamespace(gvk schema.GroupVersionKind, ns string) error { - group, err := api.Registry.Group(gvk.Group) +func checkNamespace(registry *registered.APIRegistrationManager, gvk schema.GroupVersionKind, ns string) error { + group, err := registry.Group(gvk.Group) if err != nil { return err } diff --git a/vendor/BUILD b/vendor/BUILD index ba7f5bf9d25..b27b82f51ae 100644 --- a/vendor/BUILD +++ b/vendor/BUILD @@ -10625,7 +10625,6 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/version", "//vendor:k8s.io/client-go/pkg/api", "//vendor:k8s.io/client-go/pkg/api/v1", - "//vendor:k8s.io/client-go/pkg/version", "//vendor:k8s.io/client-go/plugin/pkg/client/auth", "//vendor:k8s.io/client-go/rest", ], @@ -10650,7 +10649,7 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/version", "//vendor:k8s.io/client-go/discovery", "//vendor:k8s.io/client-go/pkg/api", - "//vendor:k8s.io/client-go/pkg/api/testapi", + "//vendor:k8s.io/client-go/pkg/api/install", "//vendor:k8s.io/client-go/pkg/api/v1", "//vendor:k8s.io/client-go/rest", "//vendor:k8s.io/client-go/rest/fake", @@ -12363,7 +12362,7 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/util/diff", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/client-go/pkg/api", - "//vendor:k8s.io/client-go/pkg/api/testapi", + "//vendor:k8s.io/client-go/pkg/api/install", "//vendor:k8s.io/client-go/pkg/api/v1", "//vendor:k8s.io/client-go/pkg/util/httpstream", "//vendor:k8s.io/client-go/pkg/util/intstr", @@ -12456,7 +12455,8 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/util/wait", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/client-go/pkg/api", - "//vendor:k8s.io/client-go/pkg/api/testapi", + "//vendor:k8s.io/client-go/pkg/api/install", + "//vendor:k8s.io/client-go/pkg/api/v1", "//vendor:k8s.io/client-go/rest/watch", ], ) @@ -12472,6 +12472,7 @@ go_library( deps = [ "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/api/meta", + "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/fields", "//vendor:k8s.io/apimachinery/pkg/labels", @@ -12479,7 +12480,6 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/version", "//vendor:k8s.io/apimachinery/pkg/watch", - "//vendor:k8s.io/client-go/pkg/api", "//vendor:k8s.io/client-go/pkg/version", "//vendor:k8s.io/client-go/rest", ],