From 27aa69fcc8d2811af21e768fbfd9a1ee4e1391b0 Mon Sep 17 00:00:00 2001 From: Chao Xu Date: Tue, 30 May 2017 19:23:06 -0700 Subject: [PATCH] generated Kubernetes-commit: ec787db460c21af5d5d5989f90f8f6fc1640f73f --- .../externaladmissionhookconfiguration.go | 4 +- .../v1alpha1/initializerconfiguration.go | 4 +- .../v1alpha1/admissionregistration_client.go | 8 ++-- .../externaladmissionhookconfiguration.go | 14 +------ .../fake/fake_admissionregistration_client.go | 8 ++-- ...fake_externaladmissionhookconfiguration.go | 24 ++++------- .../fake/fake_initializerconfiguration.go | 24 ++++------- .../v1alpha1/initializerconfiguration.go | 14 +------ listers/admissionregistration/v1alpha1/BUILD | 1 + .../v1alpha1/expansion_generated.go | 8 ---- .../externaladmissionhookconfiguration.go | 41 ++++--------------- .../v1alpha1/initializerconfiguration.go | 41 ++++--------------- pkg/apis/admissionregistration/types.go | 2 + .../admissionregistration/v1alpha1/types.go | 2 + 14 files changed, 51 insertions(+), 144 deletions(-) diff --git a/informers/admissionregistration/v1alpha1/externaladmissionhookconfiguration.go b/informers/admissionregistration/v1alpha1/externaladmissionhookconfiguration.go index 80fd1e05..868c16f2 100644 --- a/informers/admissionregistration/v1alpha1/externaladmissionhookconfiguration.go +++ b/informers/admissionregistration/v1alpha1/externaladmissionhookconfiguration.go @@ -45,10 +45,10 @@ func newExternalAdmissionHookConfigurationInformer(client kubernetes.Interface, sharedIndexInformer := cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options v1.ListOptions) (runtime.Object, error) { - return client.AdmissionregistrationV1alpha1().ExternalAdmissionHookConfigurations(v1.NamespaceAll).List(options) + return client.AdmissionregistrationV1alpha1().ExternalAdmissionHookConfigurations().List(options) }, WatchFunc: func(options v1.ListOptions) (watch.Interface, error) { - return client.AdmissionregistrationV1alpha1().ExternalAdmissionHookConfigurations(v1.NamespaceAll).Watch(options) + return client.AdmissionregistrationV1alpha1().ExternalAdmissionHookConfigurations().Watch(options) }, }, &admissionregistration_v1alpha1.ExternalAdmissionHookConfiguration{}, diff --git a/informers/admissionregistration/v1alpha1/initializerconfiguration.go b/informers/admissionregistration/v1alpha1/initializerconfiguration.go index 4fd4df13..78d49f47 100644 --- a/informers/admissionregistration/v1alpha1/initializerconfiguration.go +++ b/informers/admissionregistration/v1alpha1/initializerconfiguration.go @@ -45,10 +45,10 @@ func newInitializerConfigurationInformer(client kubernetes.Interface, resyncPeri sharedIndexInformer := cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options v1.ListOptions) (runtime.Object, error) { - return client.AdmissionregistrationV1alpha1().InitializerConfigurations(v1.NamespaceAll).List(options) + return client.AdmissionregistrationV1alpha1().InitializerConfigurations().List(options) }, WatchFunc: func(options v1.ListOptions) (watch.Interface, error) { - return client.AdmissionregistrationV1alpha1().InitializerConfigurations(v1.NamespaceAll).Watch(options) + return client.AdmissionregistrationV1alpha1().InitializerConfigurations().Watch(options) }, }, &admissionregistration_v1alpha1.InitializerConfiguration{}, diff --git a/kubernetes/typed/admissionregistration/v1alpha1/admissionregistration_client.go b/kubernetes/typed/admissionregistration/v1alpha1/admissionregistration_client.go index c1d11b69..1ac48c8f 100644 --- a/kubernetes/typed/admissionregistration/v1alpha1/admissionregistration_client.go +++ b/kubernetes/typed/admissionregistration/v1alpha1/admissionregistration_client.go @@ -34,12 +34,12 @@ type AdmissionregistrationV1alpha1Client struct { restClient rest.Interface } -func (c *AdmissionregistrationV1alpha1Client) ExternalAdmissionHookConfigurations(namespace string) ExternalAdmissionHookConfigurationInterface { - return newExternalAdmissionHookConfigurations(c, namespace) +func (c *AdmissionregistrationV1alpha1Client) ExternalAdmissionHookConfigurations() ExternalAdmissionHookConfigurationInterface { + return newExternalAdmissionHookConfigurations(c) } -func (c *AdmissionregistrationV1alpha1Client) InitializerConfigurations(namespace string) InitializerConfigurationInterface { - return newInitializerConfigurations(c, namespace) +func (c *AdmissionregistrationV1alpha1Client) InitializerConfigurations() InitializerConfigurationInterface { + return newInitializerConfigurations(c) } // NewForConfig creates a new AdmissionregistrationV1alpha1Client for the given config. diff --git a/kubernetes/typed/admissionregistration/v1alpha1/externaladmissionhookconfiguration.go b/kubernetes/typed/admissionregistration/v1alpha1/externaladmissionhookconfiguration.go index 277802c2..08d68dd0 100644 --- a/kubernetes/typed/admissionregistration/v1alpha1/externaladmissionhookconfiguration.go +++ b/kubernetes/typed/admissionregistration/v1alpha1/externaladmissionhookconfiguration.go @@ -28,7 +28,7 @@ import ( // ExternalAdmissionHookConfigurationsGetter has a method to return a ExternalAdmissionHookConfigurationInterface. // A group's client should implement this interface. type ExternalAdmissionHookConfigurationsGetter interface { - ExternalAdmissionHookConfigurations(namespace string) ExternalAdmissionHookConfigurationInterface + ExternalAdmissionHookConfigurations() ExternalAdmissionHookConfigurationInterface } // ExternalAdmissionHookConfigurationInterface has methods to work with ExternalAdmissionHookConfiguration resources. @@ -47,14 +47,12 @@ type ExternalAdmissionHookConfigurationInterface interface { // externalAdmissionHookConfigurations implements ExternalAdmissionHookConfigurationInterface type externalAdmissionHookConfigurations struct { client rest.Interface - ns string } // newExternalAdmissionHookConfigurations returns a ExternalAdmissionHookConfigurations -func newExternalAdmissionHookConfigurations(c *AdmissionregistrationV1alpha1Client, namespace string) *externalAdmissionHookConfigurations { +func newExternalAdmissionHookConfigurations(c *AdmissionregistrationV1alpha1Client) *externalAdmissionHookConfigurations { return &externalAdmissionHookConfigurations{ client: c.RESTClient(), - ns: namespace, } } @@ -62,7 +60,6 @@ func newExternalAdmissionHookConfigurations(c *AdmissionregistrationV1alpha1Clie func (c *externalAdmissionHookConfigurations) Create(externalAdmissionHookConfiguration *v1alpha1.ExternalAdmissionHookConfiguration) (result *v1alpha1.ExternalAdmissionHookConfiguration, err error) { result = &v1alpha1.ExternalAdmissionHookConfiguration{} err = c.client.Post(). - Namespace(c.ns). Resource("externaladmissionhookconfigurations"). Body(externalAdmissionHookConfiguration). Do(). @@ -74,7 +71,6 @@ func (c *externalAdmissionHookConfigurations) Create(externalAdmissionHookConfig func (c *externalAdmissionHookConfigurations) Update(externalAdmissionHookConfiguration *v1alpha1.ExternalAdmissionHookConfiguration) (result *v1alpha1.ExternalAdmissionHookConfiguration, err error) { result = &v1alpha1.ExternalAdmissionHookConfiguration{} err = c.client.Put(). - Namespace(c.ns). Resource("externaladmissionhookconfigurations"). Name(externalAdmissionHookConfiguration.Name). Body(externalAdmissionHookConfiguration). @@ -86,7 +82,6 @@ func (c *externalAdmissionHookConfigurations) Update(externalAdmissionHookConfig // Delete takes name of the externalAdmissionHookConfiguration and deletes it. Returns an error if one occurs. func (c *externalAdmissionHookConfigurations) Delete(name string, options *v1.DeleteOptions) error { return c.client.Delete(). - Namespace(c.ns). Resource("externaladmissionhookconfigurations"). Name(name). Body(options). @@ -97,7 +92,6 @@ func (c *externalAdmissionHookConfigurations) Delete(name string, options *v1.De // DeleteCollection deletes a collection of objects. func (c *externalAdmissionHookConfigurations) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { return c.client.Delete(). - Namespace(c.ns). Resource("externaladmissionhookconfigurations"). VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). @@ -109,7 +103,6 @@ func (c *externalAdmissionHookConfigurations) DeleteCollection(options *v1.Delet func (c *externalAdmissionHookConfigurations) Get(name string, options v1.GetOptions) (result *v1alpha1.ExternalAdmissionHookConfiguration, err error) { result = &v1alpha1.ExternalAdmissionHookConfiguration{} err = c.client.Get(). - Namespace(c.ns). Resource("externaladmissionhookconfigurations"). Name(name). VersionedParams(&options, scheme.ParameterCodec). @@ -122,7 +115,6 @@ func (c *externalAdmissionHookConfigurations) Get(name string, options v1.GetOpt func (c *externalAdmissionHookConfigurations) List(opts v1.ListOptions) (result *v1alpha1.ExternalAdmissionHookConfigurationList, err error) { result = &v1alpha1.ExternalAdmissionHookConfigurationList{} err = c.client.Get(). - Namespace(c.ns). Resource("externaladmissionhookconfigurations"). VersionedParams(&opts, scheme.ParameterCodec). Do(). @@ -134,7 +126,6 @@ func (c *externalAdmissionHookConfigurations) List(opts v1.ListOptions) (result func (c *externalAdmissionHookConfigurations) Watch(opts v1.ListOptions) (watch.Interface, error) { opts.Watch = true return c.client.Get(). - Namespace(c.ns). Resource("externaladmissionhookconfigurations"). VersionedParams(&opts, scheme.ParameterCodec). Watch() @@ -144,7 +135,6 @@ func (c *externalAdmissionHookConfigurations) Watch(opts v1.ListOptions) (watch. func (c *externalAdmissionHookConfigurations) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1alpha1.ExternalAdmissionHookConfiguration, err error) { result = &v1alpha1.ExternalAdmissionHookConfiguration{} err = c.client.Patch(pt). - Namespace(c.ns). Resource("externaladmissionhookconfigurations"). SubResource(subresources...). Name(name). diff --git a/kubernetes/typed/admissionregistration/v1alpha1/fake/fake_admissionregistration_client.go b/kubernetes/typed/admissionregistration/v1alpha1/fake/fake_admissionregistration_client.go index f6460bb6..8c370a9f 100644 --- a/kubernetes/typed/admissionregistration/v1alpha1/fake/fake_admissionregistration_client.go +++ b/kubernetes/typed/admissionregistration/v1alpha1/fake/fake_admissionregistration_client.go @@ -26,12 +26,12 @@ type FakeAdmissionregistrationV1alpha1 struct { *testing.Fake } -func (c *FakeAdmissionregistrationV1alpha1) ExternalAdmissionHookConfigurations(namespace string) v1alpha1.ExternalAdmissionHookConfigurationInterface { - return &FakeExternalAdmissionHookConfigurations{c, namespace} +func (c *FakeAdmissionregistrationV1alpha1) ExternalAdmissionHookConfigurations() v1alpha1.ExternalAdmissionHookConfigurationInterface { + return &FakeExternalAdmissionHookConfigurations{c} } -func (c *FakeAdmissionregistrationV1alpha1) InitializerConfigurations(namespace string) v1alpha1.InitializerConfigurationInterface { - return &FakeInitializerConfigurations{c, namespace} +func (c *FakeAdmissionregistrationV1alpha1) InitializerConfigurations() v1alpha1.InitializerConfigurationInterface { + return &FakeInitializerConfigurations{c} } // RESTClient returns a RESTClient that is used to communicate diff --git a/kubernetes/typed/admissionregistration/v1alpha1/fake/fake_externaladmissionhookconfiguration.go b/kubernetes/typed/admissionregistration/v1alpha1/fake/fake_externaladmissionhookconfiguration.go index 268ebadf..0f5d2293 100644 --- a/kubernetes/typed/admissionregistration/v1alpha1/fake/fake_externaladmissionhookconfiguration.go +++ b/kubernetes/typed/admissionregistration/v1alpha1/fake/fake_externaladmissionhookconfiguration.go @@ -29,7 +29,6 @@ import ( // FakeExternalAdmissionHookConfigurations implements ExternalAdmissionHookConfigurationInterface type FakeExternalAdmissionHookConfigurations struct { Fake *FakeAdmissionregistrationV1alpha1 - ns string } var externaladmissionhookconfigurationsResource = schema.GroupVersionResource{Group: "admissionregistration.k8s.io", Version: "v1alpha1", Resource: "externaladmissionhookconfigurations"} @@ -38,8 +37,7 @@ var externaladmissionhookconfigurationsKind = schema.GroupVersionKind{Group: "ad func (c *FakeExternalAdmissionHookConfigurations) Create(externalAdmissionHookConfiguration *v1alpha1.ExternalAdmissionHookConfiguration) (result *v1alpha1.ExternalAdmissionHookConfiguration, err error) { obj, err := c.Fake. - Invokes(testing.NewCreateAction(externaladmissionhookconfigurationsResource, c.ns, externalAdmissionHookConfiguration), &v1alpha1.ExternalAdmissionHookConfiguration{}) - + Invokes(testing.NewRootCreateAction(externaladmissionhookconfigurationsResource, externalAdmissionHookConfiguration), &v1alpha1.ExternalAdmissionHookConfiguration{}) if obj == nil { return nil, err } @@ -48,8 +46,7 @@ func (c *FakeExternalAdmissionHookConfigurations) Create(externalAdmissionHookCo func (c *FakeExternalAdmissionHookConfigurations) Update(externalAdmissionHookConfiguration *v1alpha1.ExternalAdmissionHookConfiguration) (result *v1alpha1.ExternalAdmissionHookConfiguration, err error) { obj, err := c.Fake. - Invokes(testing.NewUpdateAction(externaladmissionhookconfigurationsResource, c.ns, externalAdmissionHookConfiguration), &v1alpha1.ExternalAdmissionHookConfiguration{}) - + Invokes(testing.NewRootUpdateAction(externaladmissionhookconfigurationsResource, externalAdmissionHookConfiguration), &v1alpha1.ExternalAdmissionHookConfiguration{}) if obj == nil { return nil, err } @@ -58,13 +55,12 @@ func (c *FakeExternalAdmissionHookConfigurations) Update(externalAdmissionHookCo func (c *FakeExternalAdmissionHookConfigurations) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(testing.NewDeleteAction(externaladmissionhookconfigurationsResource, c.ns, name), &v1alpha1.ExternalAdmissionHookConfiguration{}) - + Invokes(testing.NewRootDeleteAction(externaladmissionhookconfigurationsResource, name), &v1alpha1.ExternalAdmissionHookConfiguration{}) return err } func (c *FakeExternalAdmissionHookConfigurations) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := testing.NewDeleteCollectionAction(externaladmissionhookconfigurationsResource, c.ns, listOptions) + action := testing.NewRootDeleteCollectionAction(externaladmissionhookconfigurationsResource, listOptions) _, err := c.Fake.Invokes(action, &v1alpha1.ExternalAdmissionHookConfigurationList{}) return err @@ -72,8 +68,7 @@ func (c *FakeExternalAdmissionHookConfigurations) DeleteCollection(options *v1.D func (c *FakeExternalAdmissionHookConfigurations) Get(name string, options v1.GetOptions) (result *v1alpha1.ExternalAdmissionHookConfiguration, err error) { obj, err := c.Fake. - Invokes(testing.NewGetAction(externaladmissionhookconfigurationsResource, c.ns, name), &v1alpha1.ExternalAdmissionHookConfiguration{}) - + Invokes(testing.NewRootGetAction(externaladmissionhookconfigurationsResource, name), &v1alpha1.ExternalAdmissionHookConfiguration{}) if obj == nil { return nil, err } @@ -82,8 +77,7 @@ func (c *FakeExternalAdmissionHookConfigurations) Get(name string, options v1.Ge func (c *FakeExternalAdmissionHookConfigurations) List(opts v1.ListOptions) (result *v1alpha1.ExternalAdmissionHookConfigurationList, err error) { obj, err := c.Fake. - Invokes(testing.NewListAction(externaladmissionhookconfigurationsResource, externaladmissionhookconfigurationsKind, c.ns, opts), &v1alpha1.ExternalAdmissionHookConfigurationList{}) - + Invokes(testing.NewRootListAction(externaladmissionhookconfigurationsResource, externaladmissionhookconfigurationsKind, opts), &v1alpha1.ExternalAdmissionHookConfigurationList{}) if obj == nil { return nil, err } @@ -104,15 +98,13 @@ func (c *FakeExternalAdmissionHookConfigurations) List(opts v1.ListOptions) (res // Watch returns a watch.Interface that watches the requested externalAdmissionHookConfigurations. func (c *FakeExternalAdmissionHookConfigurations) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(testing.NewWatchAction(externaladmissionhookconfigurationsResource, c.ns, opts)) - + InvokesWatch(testing.NewRootWatchAction(externaladmissionhookconfigurationsResource, opts)) } // Patch applies the patch and returns the patched externalAdmissionHookConfiguration. func (c *FakeExternalAdmissionHookConfigurations) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1alpha1.ExternalAdmissionHookConfiguration, err error) { obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceAction(externaladmissionhookconfigurationsResource, c.ns, name, data, subresources...), &v1alpha1.ExternalAdmissionHookConfiguration{}) - + Invokes(testing.NewRootPatchSubresourceAction(externaladmissionhookconfigurationsResource, name, data, subresources...), &v1alpha1.ExternalAdmissionHookConfiguration{}) if obj == nil { return nil, err } diff --git a/kubernetes/typed/admissionregistration/v1alpha1/fake/fake_initializerconfiguration.go b/kubernetes/typed/admissionregistration/v1alpha1/fake/fake_initializerconfiguration.go index b86a1f34..d57f9044 100644 --- a/kubernetes/typed/admissionregistration/v1alpha1/fake/fake_initializerconfiguration.go +++ b/kubernetes/typed/admissionregistration/v1alpha1/fake/fake_initializerconfiguration.go @@ -29,7 +29,6 @@ import ( // FakeInitializerConfigurations implements InitializerConfigurationInterface type FakeInitializerConfigurations struct { Fake *FakeAdmissionregistrationV1alpha1 - ns string } var initializerconfigurationsResource = schema.GroupVersionResource{Group: "admissionregistration.k8s.io", Version: "v1alpha1", Resource: "initializerconfigurations"} @@ -38,8 +37,7 @@ var initializerconfigurationsKind = schema.GroupVersionKind{Group: "admissionreg func (c *FakeInitializerConfigurations) Create(initializerConfiguration *v1alpha1.InitializerConfiguration) (result *v1alpha1.InitializerConfiguration, err error) { obj, err := c.Fake. - Invokes(testing.NewCreateAction(initializerconfigurationsResource, c.ns, initializerConfiguration), &v1alpha1.InitializerConfiguration{}) - + Invokes(testing.NewRootCreateAction(initializerconfigurationsResource, initializerConfiguration), &v1alpha1.InitializerConfiguration{}) if obj == nil { return nil, err } @@ -48,8 +46,7 @@ func (c *FakeInitializerConfigurations) Create(initializerConfiguration *v1alpha func (c *FakeInitializerConfigurations) Update(initializerConfiguration *v1alpha1.InitializerConfiguration) (result *v1alpha1.InitializerConfiguration, err error) { obj, err := c.Fake. - Invokes(testing.NewUpdateAction(initializerconfigurationsResource, c.ns, initializerConfiguration), &v1alpha1.InitializerConfiguration{}) - + Invokes(testing.NewRootUpdateAction(initializerconfigurationsResource, initializerConfiguration), &v1alpha1.InitializerConfiguration{}) if obj == nil { return nil, err } @@ -58,13 +55,12 @@ func (c *FakeInitializerConfigurations) Update(initializerConfiguration *v1alpha func (c *FakeInitializerConfigurations) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(testing.NewDeleteAction(initializerconfigurationsResource, c.ns, name), &v1alpha1.InitializerConfiguration{}) - + Invokes(testing.NewRootDeleteAction(initializerconfigurationsResource, name), &v1alpha1.InitializerConfiguration{}) return err } func (c *FakeInitializerConfigurations) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := testing.NewDeleteCollectionAction(initializerconfigurationsResource, c.ns, listOptions) + action := testing.NewRootDeleteCollectionAction(initializerconfigurationsResource, listOptions) _, err := c.Fake.Invokes(action, &v1alpha1.InitializerConfigurationList{}) return err @@ -72,8 +68,7 @@ func (c *FakeInitializerConfigurations) DeleteCollection(options *v1.DeleteOptio func (c *FakeInitializerConfigurations) Get(name string, options v1.GetOptions) (result *v1alpha1.InitializerConfiguration, err error) { obj, err := c.Fake. - Invokes(testing.NewGetAction(initializerconfigurationsResource, c.ns, name), &v1alpha1.InitializerConfiguration{}) - + Invokes(testing.NewRootGetAction(initializerconfigurationsResource, name), &v1alpha1.InitializerConfiguration{}) if obj == nil { return nil, err } @@ -82,8 +77,7 @@ func (c *FakeInitializerConfigurations) Get(name string, options v1.GetOptions) func (c *FakeInitializerConfigurations) List(opts v1.ListOptions) (result *v1alpha1.InitializerConfigurationList, err error) { obj, err := c.Fake. - Invokes(testing.NewListAction(initializerconfigurationsResource, initializerconfigurationsKind, c.ns, opts), &v1alpha1.InitializerConfigurationList{}) - + Invokes(testing.NewRootListAction(initializerconfigurationsResource, initializerconfigurationsKind, opts), &v1alpha1.InitializerConfigurationList{}) if obj == nil { return nil, err } @@ -104,15 +98,13 @@ func (c *FakeInitializerConfigurations) List(opts v1.ListOptions) (result *v1alp // Watch returns a watch.Interface that watches the requested initializerConfigurations. func (c *FakeInitializerConfigurations) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(testing.NewWatchAction(initializerconfigurationsResource, c.ns, opts)) - + InvokesWatch(testing.NewRootWatchAction(initializerconfigurationsResource, opts)) } // Patch applies the patch and returns the patched initializerConfiguration. func (c *FakeInitializerConfigurations) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1alpha1.InitializerConfiguration, err error) { obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceAction(initializerconfigurationsResource, c.ns, name, data, subresources...), &v1alpha1.InitializerConfiguration{}) - + Invokes(testing.NewRootPatchSubresourceAction(initializerconfigurationsResource, name, data, subresources...), &v1alpha1.InitializerConfiguration{}) if obj == nil { return nil, err } diff --git a/kubernetes/typed/admissionregistration/v1alpha1/initializerconfiguration.go b/kubernetes/typed/admissionregistration/v1alpha1/initializerconfiguration.go index d8b75600..25fee850 100644 --- a/kubernetes/typed/admissionregistration/v1alpha1/initializerconfiguration.go +++ b/kubernetes/typed/admissionregistration/v1alpha1/initializerconfiguration.go @@ -28,7 +28,7 @@ import ( // InitializerConfigurationsGetter has a method to return a InitializerConfigurationInterface. // A group's client should implement this interface. type InitializerConfigurationsGetter interface { - InitializerConfigurations(namespace string) InitializerConfigurationInterface + InitializerConfigurations() InitializerConfigurationInterface } // InitializerConfigurationInterface has methods to work with InitializerConfiguration resources. @@ -47,14 +47,12 @@ type InitializerConfigurationInterface interface { // initializerConfigurations implements InitializerConfigurationInterface type initializerConfigurations struct { client rest.Interface - ns string } // newInitializerConfigurations returns a InitializerConfigurations -func newInitializerConfigurations(c *AdmissionregistrationV1alpha1Client, namespace string) *initializerConfigurations { +func newInitializerConfigurations(c *AdmissionregistrationV1alpha1Client) *initializerConfigurations { return &initializerConfigurations{ client: c.RESTClient(), - ns: namespace, } } @@ -62,7 +60,6 @@ func newInitializerConfigurations(c *AdmissionregistrationV1alpha1Client, namesp func (c *initializerConfigurations) Create(initializerConfiguration *v1alpha1.InitializerConfiguration) (result *v1alpha1.InitializerConfiguration, err error) { result = &v1alpha1.InitializerConfiguration{} err = c.client.Post(). - Namespace(c.ns). Resource("initializerconfigurations"). Body(initializerConfiguration). Do(). @@ -74,7 +71,6 @@ func (c *initializerConfigurations) Create(initializerConfiguration *v1alpha1.In func (c *initializerConfigurations) Update(initializerConfiguration *v1alpha1.InitializerConfiguration) (result *v1alpha1.InitializerConfiguration, err error) { result = &v1alpha1.InitializerConfiguration{} err = c.client.Put(). - Namespace(c.ns). Resource("initializerconfigurations"). Name(initializerConfiguration.Name). Body(initializerConfiguration). @@ -86,7 +82,6 @@ func (c *initializerConfigurations) Update(initializerConfiguration *v1alpha1.In // Delete takes name of the initializerConfiguration and deletes it. Returns an error if one occurs. func (c *initializerConfigurations) Delete(name string, options *v1.DeleteOptions) error { return c.client.Delete(). - Namespace(c.ns). Resource("initializerconfigurations"). Name(name). Body(options). @@ -97,7 +92,6 @@ func (c *initializerConfigurations) Delete(name string, options *v1.DeleteOption // DeleteCollection deletes a collection of objects. func (c *initializerConfigurations) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { return c.client.Delete(). - Namespace(c.ns). Resource("initializerconfigurations"). VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). @@ -109,7 +103,6 @@ func (c *initializerConfigurations) DeleteCollection(options *v1.DeleteOptions, func (c *initializerConfigurations) Get(name string, options v1.GetOptions) (result *v1alpha1.InitializerConfiguration, err error) { result = &v1alpha1.InitializerConfiguration{} err = c.client.Get(). - Namespace(c.ns). Resource("initializerconfigurations"). Name(name). VersionedParams(&options, scheme.ParameterCodec). @@ -122,7 +115,6 @@ func (c *initializerConfigurations) Get(name string, options v1.GetOptions) (res func (c *initializerConfigurations) List(opts v1.ListOptions) (result *v1alpha1.InitializerConfigurationList, err error) { result = &v1alpha1.InitializerConfigurationList{} err = c.client.Get(). - Namespace(c.ns). Resource("initializerconfigurations"). VersionedParams(&opts, scheme.ParameterCodec). Do(). @@ -134,7 +126,6 @@ func (c *initializerConfigurations) List(opts v1.ListOptions) (result *v1alpha1. func (c *initializerConfigurations) Watch(opts v1.ListOptions) (watch.Interface, error) { opts.Watch = true return c.client.Get(). - Namespace(c.ns). Resource("initializerconfigurations"). VersionedParams(&opts, scheme.ParameterCodec). Watch() @@ -144,7 +135,6 @@ func (c *initializerConfigurations) Watch(opts v1.ListOptions) (watch.Interface, func (c *initializerConfigurations) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1alpha1.InitializerConfiguration, err error) { result = &v1alpha1.InitializerConfiguration{} err = c.client.Patch(pt). - Namespace(c.ns). Resource("initializerconfigurations"). SubResource(subresources...). Name(name). diff --git a/listers/admissionregistration/v1alpha1/BUILD b/listers/admissionregistration/v1alpha1/BUILD index 02a14cca..b46f8b05 100644 --- a/listers/admissionregistration/v1alpha1/BUILD +++ b/listers/admissionregistration/v1alpha1/BUILD @@ -17,6 +17,7 @@ go_library( tags = ["automanaged"], deps = [ "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", "//vendor/k8s.io/client-go/pkg/apis/admissionregistration/v1alpha1:go_default_library", "//vendor/k8s.io/client-go/tools/cache:go_default_library", diff --git a/listers/admissionregistration/v1alpha1/expansion_generated.go b/listers/admissionregistration/v1alpha1/expansion_generated.go index 3282a8bc..5d9f1470 100644 --- a/listers/admissionregistration/v1alpha1/expansion_generated.go +++ b/listers/admissionregistration/v1alpha1/expansion_generated.go @@ -22,14 +22,6 @@ package v1alpha1 // ExternalAdmissionHookConfigurationLister. type ExternalAdmissionHookConfigurationListerExpansion interface{} -// ExternalAdmissionHookConfigurationNamespaceListerExpansion allows custom methods to be added to -// ExternalAdmissionHookConfigurationNamespaceLister. -type ExternalAdmissionHookConfigurationNamespaceListerExpansion interface{} - // InitializerConfigurationListerExpansion allows custom methods to be added to // InitializerConfigurationLister. type InitializerConfigurationListerExpansion interface{} - -// InitializerConfigurationNamespaceListerExpansion allows custom methods to be added to -// InitializerConfigurationNamespaceLister. -type InitializerConfigurationNamespaceListerExpansion interface{} diff --git a/listers/admissionregistration/v1alpha1/externaladmissionhookconfiguration.go b/listers/admissionregistration/v1alpha1/externaladmissionhookconfiguration.go index e0331f54..c84b35e5 100644 --- a/listers/admissionregistration/v1alpha1/externaladmissionhookconfiguration.go +++ b/listers/admissionregistration/v1alpha1/externaladmissionhookconfiguration.go @@ -20,6 +20,7 @@ package v1alpha1 import ( "k8s.io/apimachinery/pkg/api/errors" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" v1alpha1 "k8s.io/client-go/pkg/apis/admissionregistration/v1alpha1" "k8s.io/client-go/tools/cache" @@ -29,8 +30,8 @@ import ( type ExternalAdmissionHookConfigurationLister interface { // List lists all ExternalAdmissionHookConfigurations in the indexer. List(selector labels.Selector) (ret []*v1alpha1.ExternalAdmissionHookConfiguration, err error) - // ExternalAdmissionHookConfigurations returns an object that can list and get ExternalAdmissionHookConfigurations. - ExternalAdmissionHookConfigurations(namespace string) ExternalAdmissionHookConfigurationNamespaceLister + // Get retrieves the ExternalAdmissionHookConfiguration from the index for a given name. + Get(name string) (*v1alpha1.ExternalAdmissionHookConfiguration, error) ExternalAdmissionHookConfigurationListerExpansion } @@ -52,38 +53,10 @@ func (s *externalAdmissionHookConfigurationLister) List(selector labels.Selector return ret, err } -// ExternalAdmissionHookConfigurations returns an object that can list and get ExternalAdmissionHookConfigurations. -func (s *externalAdmissionHookConfigurationLister) ExternalAdmissionHookConfigurations(namespace string) ExternalAdmissionHookConfigurationNamespaceLister { - return externalAdmissionHookConfigurationNamespaceLister{indexer: s.indexer, namespace: namespace} -} - -// ExternalAdmissionHookConfigurationNamespaceLister helps list and get ExternalAdmissionHookConfigurations. -type ExternalAdmissionHookConfigurationNamespaceLister interface { - // List lists all ExternalAdmissionHookConfigurations in the indexer for a given namespace. - List(selector labels.Selector) (ret []*v1alpha1.ExternalAdmissionHookConfiguration, err error) - // Get retrieves the ExternalAdmissionHookConfiguration from the indexer for a given namespace and name. - Get(name string) (*v1alpha1.ExternalAdmissionHookConfiguration, error) - ExternalAdmissionHookConfigurationNamespaceListerExpansion -} - -// externalAdmissionHookConfigurationNamespaceLister implements the ExternalAdmissionHookConfigurationNamespaceLister -// interface. -type externalAdmissionHookConfigurationNamespaceLister struct { - indexer cache.Indexer - namespace string -} - -// List lists all ExternalAdmissionHookConfigurations in the indexer for a given namespace. -func (s externalAdmissionHookConfigurationNamespaceLister) List(selector labels.Selector) (ret []*v1alpha1.ExternalAdmissionHookConfiguration, err error) { - err = cache.ListAllByNamespace(s.indexer, s.namespace, selector, func(m interface{}) { - ret = append(ret, m.(*v1alpha1.ExternalAdmissionHookConfiguration)) - }) - return ret, err -} - -// Get retrieves the ExternalAdmissionHookConfiguration from the indexer for a given namespace and name. -func (s externalAdmissionHookConfigurationNamespaceLister) Get(name string) (*v1alpha1.ExternalAdmissionHookConfiguration, error) { - obj, exists, err := s.indexer.GetByKey(s.namespace + "/" + name) +// Get retrieves the ExternalAdmissionHookConfiguration from the index for a given name. +func (s *externalAdmissionHookConfigurationLister) Get(name string) (*v1alpha1.ExternalAdmissionHookConfiguration, error) { + key := &v1alpha1.ExternalAdmissionHookConfiguration{ObjectMeta: v1.ObjectMeta{Name: name}} + obj, exists, err := s.indexer.Get(key) if err != nil { return nil, err } diff --git a/listers/admissionregistration/v1alpha1/initializerconfiguration.go b/listers/admissionregistration/v1alpha1/initializerconfiguration.go index a2b1c3b3..bfe5d467 100644 --- a/listers/admissionregistration/v1alpha1/initializerconfiguration.go +++ b/listers/admissionregistration/v1alpha1/initializerconfiguration.go @@ -20,6 +20,7 @@ package v1alpha1 import ( "k8s.io/apimachinery/pkg/api/errors" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" v1alpha1 "k8s.io/client-go/pkg/apis/admissionregistration/v1alpha1" "k8s.io/client-go/tools/cache" @@ -29,8 +30,8 @@ import ( type InitializerConfigurationLister interface { // List lists all InitializerConfigurations in the indexer. List(selector labels.Selector) (ret []*v1alpha1.InitializerConfiguration, err error) - // InitializerConfigurations returns an object that can list and get InitializerConfigurations. - InitializerConfigurations(namespace string) InitializerConfigurationNamespaceLister + // Get retrieves the InitializerConfiguration from the index for a given name. + Get(name string) (*v1alpha1.InitializerConfiguration, error) InitializerConfigurationListerExpansion } @@ -52,38 +53,10 @@ func (s *initializerConfigurationLister) List(selector labels.Selector) (ret []* return ret, err } -// InitializerConfigurations returns an object that can list and get InitializerConfigurations. -func (s *initializerConfigurationLister) InitializerConfigurations(namespace string) InitializerConfigurationNamespaceLister { - return initializerConfigurationNamespaceLister{indexer: s.indexer, namespace: namespace} -} - -// InitializerConfigurationNamespaceLister helps list and get InitializerConfigurations. -type InitializerConfigurationNamespaceLister interface { - // List lists all InitializerConfigurations in the indexer for a given namespace. - List(selector labels.Selector) (ret []*v1alpha1.InitializerConfiguration, err error) - // Get retrieves the InitializerConfiguration from the indexer for a given namespace and name. - Get(name string) (*v1alpha1.InitializerConfiguration, error) - InitializerConfigurationNamespaceListerExpansion -} - -// initializerConfigurationNamespaceLister implements the InitializerConfigurationNamespaceLister -// interface. -type initializerConfigurationNamespaceLister struct { - indexer cache.Indexer - namespace string -} - -// List lists all InitializerConfigurations in the indexer for a given namespace. -func (s initializerConfigurationNamespaceLister) List(selector labels.Selector) (ret []*v1alpha1.InitializerConfiguration, err error) { - err = cache.ListAllByNamespace(s.indexer, s.namespace, selector, func(m interface{}) { - ret = append(ret, m.(*v1alpha1.InitializerConfiguration)) - }) - return ret, err -} - -// Get retrieves the InitializerConfiguration from the indexer for a given namespace and name. -func (s initializerConfigurationNamespaceLister) Get(name string) (*v1alpha1.InitializerConfiguration, error) { - obj, exists, err := s.indexer.GetByKey(s.namespace + "/" + name) +// Get retrieves the InitializerConfiguration from the index for a given name. +func (s *initializerConfigurationLister) Get(name string) (*v1alpha1.InitializerConfiguration, error) { + key := &v1alpha1.InitializerConfiguration{ObjectMeta: v1.ObjectMeta{Name: name}} + obj, exists, err := s.indexer.Get(key) if err != nil { return nil, err } diff --git a/pkg/apis/admissionregistration/types.go b/pkg/apis/admissionregistration/types.go index 037c0757..be760c44 100644 --- a/pkg/apis/admissionregistration/types.go +++ b/pkg/apis/admissionregistration/types.go @@ -21,6 +21,7 @@ import ( ) // +genclient=true +// +nonNamespaced=true // InitializerConfiguration describes the configuration of initializers. type InitializerConfiguration struct { @@ -114,6 +115,7 @@ const ( ) // +genclient=true +// +nonNamespaced=true // ExternalAdmissionHookConfiguration describes the configuration of initializers. type ExternalAdmissionHookConfiguration struct { diff --git a/pkg/apis/admissionregistration/v1alpha1/types.go b/pkg/apis/admissionregistration/v1alpha1/types.go index 67a76dff..f35d54a8 100644 --- a/pkg/apis/admissionregistration/v1alpha1/types.go +++ b/pkg/apis/admissionregistration/v1alpha1/types.go @@ -21,6 +21,7 @@ import ( ) // +genclient=true +// +nonNamespaced=true // InitializerConfiguration describes the configuration of initializers. type InitializerConfiguration struct { @@ -116,6 +117,7 @@ const ( ) // +genclient=true +// +nonNamespaced=true // ExternalAdmissionHookConfiguration describes the configuration of initializers. type ExternalAdmissionHookConfiguration struct {