diff --git a/apis/inwinstack/v1/service_types.go b/apis/inwinstack/v1/service_types.go index d5c681e..afd8e19 100644 --- a/apis/inwinstack/v1/service_types.go +++ b/apis/inwinstack/v1/service_types.go @@ -29,6 +29,7 @@ type ServiceList struct { } // +genclient +// +genclient:nonNamespaced // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // Service represents a Kubernetes Service Custom Resource. diff --git a/client/clientset/versioned/typed/inwinstack/v1/fake/fake_inwinstack_client.go b/client/clientset/versioned/typed/inwinstack/v1/fake/fake_inwinstack_client.go index 5ac1b95..8d2b425 100644 --- a/client/clientset/versioned/typed/inwinstack/v1/fake/fake_inwinstack_client.go +++ b/client/clientset/versioned/typed/inwinstack/v1/fake/fake_inwinstack_client.go @@ -43,8 +43,8 @@ func (c *FakeInwinstackV1) Securities(namespace string) v1.SecurityInterface { return &FakeSecurities{c, namespace} } -func (c *FakeInwinstackV1) Services(namespace string) v1.ServiceInterface { - return &FakeServices{c, namespace} +func (c *FakeInwinstackV1) Services() v1.ServiceInterface { + return &FakeServices{c} } // RESTClient returns a RESTClient that is used to communicate diff --git a/client/clientset/versioned/typed/inwinstack/v1/fake/fake_service.go b/client/clientset/versioned/typed/inwinstack/v1/fake/fake_service.go index 31cca86..1f3a944 100644 --- a/client/clientset/versioned/typed/inwinstack/v1/fake/fake_service.go +++ b/client/clientset/versioned/typed/inwinstack/v1/fake/fake_service.go @@ -30,7 +30,6 @@ import ( // FakeServices implements ServiceInterface type FakeServices struct { Fake *FakeInwinstackV1 - ns string } var servicesResource = schema.GroupVersionResource{Group: "inwinstack.com", Version: "v1", Resource: "services"} @@ -40,8 +39,7 @@ var servicesKind = schema.GroupVersionKind{Group: "inwinstack.com", Version: "v1 // Get takes name of the service, and returns the corresponding service object, and an error if there is any. func (c *FakeServices) Get(name string, options v1.GetOptions) (result *inwinstackv1.Service, err error) { obj, err := c.Fake. - Invokes(testing.NewGetAction(servicesResource, c.ns, name), &inwinstackv1.Service{}) - + Invokes(testing.NewRootGetAction(servicesResource, name), &inwinstackv1.Service{}) if obj == nil { return nil, err } @@ -51,8 +49,7 @@ func (c *FakeServices) Get(name string, options v1.GetOptions) (result *inwinsta // List takes label and field selectors, and returns the list of Services that match those selectors. func (c *FakeServices) List(opts v1.ListOptions) (result *inwinstackv1.ServiceList, err error) { obj, err := c.Fake. - Invokes(testing.NewListAction(servicesResource, servicesKind, c.ns, opts), &inwinstackv1.ServiceList{}) - + Invokes(testing.NewRootListAction(servicesResource, servicesKind, opts), &inwinstackv1.ServiceList{}) if obj == nil { return nil, err } @@ -73,15 +70,13 @@ func (c *FakeServices) List(opts v1.ListOptions) (result *inwinstackv1.ServiceLi // Watch returns a watch.Interface that watches the requested services. func (c *FakeServices) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.Fake. - InvokesWatch(testing.NewWatchAction(servicesResource, c.ns, opts)) - + InvokesWatch(testing.NewRootWatchAction(servicesResource, opts)) } // Create takes the representation of a service and creates it. Returns the server's representation of the service, and an error, if there is any. func (c *FakeServices) Create(service *inwinstackv1.Service) (result *inwinstackv1.Service, err error) { obj, err := c.Fake. - Invokes(testing.NewCreateAction(servicesResource, c.ns, service), &inwinstackv1.Service{}) - + Invokes(testing.NewRootCreateAction(servicesResource, service), &inwinstackv1.Service{}) if obj == nil { return nil, err } @@ -91,8 +86,7 @@ func (c *FakeServices) Create(service *inwinstackv1.Service) (result *inwinstack // Update takes the representation of a service and updates it. Returns the server's representation of the service, and an error, if there is any. func (c *FakeServices) Update(service *inwinstackv1.Service) (result *inwinstackv1.Service, err error) { obj, err := c.Fake. - Invokes(testing.NewUpdateAction(servicesResource, c.ns, service), &inwinstackv1.Service{}) - + Invokes(testing.NewRootUpdateAction(servicesResource, service), &inwinstackv1.Service{}) if obj == nil { return nil, err } @@ -103,8 +97,7 @@ func (c *FakeServices) Update(service *inwinstackv1.Service) (result *inwinstack // Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). func (c *FakeServices) UpdateStatus(service *inwinstackv1.Service) (*inwinstackv1.Service, error) { obj, err := c.Fake. - Invokes(testing.NewUpdateSubresourceAction(servicesResource, "status", c.ns, service), &inwinstackv1.Service{}) - + Invokes(testing.NewRootUpdateSubresourceAction(servicesResource, "status", service), &inwinstackv1.Service{}) if obj == nil { return nil, err } @@ -114,14 +107,13 @@ func (c *FakeServices) UpdateStatus(service *inwinstackv1.Service) (*inwinstackv // Delete takes name of the service and deletes it. Returns an error if one occurs. func (c *FakeServices) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(testing.NewDeleteAction(servicesResource, c.ns, name), &inwinstackv1.Service{}) - + Invokes(testing.NewRootDeleteAction(servicesResource, name), &inwinstackv1.Service{}) return err } // DeleteCollection deletes a collection of objects. func (c *FakeServices) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := testing.NewDeleteCollectionAction(servicesResource, c.ns, listOptions) + action := testing.NewRootDeleteCollectionAction(servicesResource, listOptions) _, err := c.Fake.Invokes(action, &inwinstackv1.ServiceList{}) return err @@ -130,8 +122,7 @@ func (c *FakeServices) DeleteCollection(options *v1.DeleteOptions, listOptions v // Patch applies the patch and returns the patched service. func (c *FakeServices) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *inwinstackv1.Service, err error) { obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceAction(servicesResource, c.ns, name, data, subresources...), &inwinstackv1.Service{}) - + Invokes(testing.NewRootPatchSubresourceAction(servicesResource, name, data, subresources...), &inwinstackv1.Service{}) if obj == nil { return nil, err } diff --git a/client/clientset/versioned/typed/inwinstack/v1/inwinstack_client.go b/client/clientset/versioned/typed/inwinstack/v1/inwinstack_client.go index b0fa097..fa3c266 100644 --- a/client/clientset/versioned/typed/inwinstack/v1/inwinstack_client.go +++ b/client/clientset/versioned/typed/inwinstack/v1/inwinstack_client.go @@ -54,8 +54,8 @@ func (c *InwinstackV1Client) Securities(namespace string) SecurityInterface { return newSecurities(c, namespace) } -func (c *InwinstackV1Client) Services(namespace string) ServiceInterface { - return newServices(c, namespace) +func (c *InwinstackV1Client) Services() ServiceInterface { + return newServices(c) } // NewForConfig creates a new InwinstackV1Client for the given config. diff --git a/client/clientset/versioned/typed/inwinstack/v1/service.go b/client/clientset/versioned/typed/inwinstack/v1/service.go index 65256b2..860ae8a 100644 --- a/client/clientset/versioned/typed/inwinstack/v1/service.go +++ b/client/clientset/versioned/typed/inwinstack/v1/service.go @@ -29,7 +29,7 @@ import ( // ServicesGetter has a method to return a ServiceInterface. // A group's client should implement this interface. type ServicesGetter interface { - Services(namespace string) ServiceInterface + Services() ServiceInterface } // ServiceInterface has methods to work with Service resources. @@ -49,14 +49,12 @@ type ServiceInterface interface { // services implements ServiceInterface type services struct { client rest.Interface - ns string } // newServices returns a Services -func newServices(c *InwinstackV1Client, namespace string) *services { +func newServices(c *InwinstackV1Client) *services { return &services{ client: c.RESTClient(), - ns: namespace, } } @@ -64,7 +62,6 @@ func newServices(c *InwinstackV1Client, namespace string) *services { func (c *services) Get(name string, options metav1.GetOptions) (result *v1.Service, err error) { result = &v1.Service{} err = c.client.Get(). - Namespace(c.ns). Resource("services"). Name(name). VersionedParams(&options, scheme.ParameterCodec). @@ -77,7 +74,6 @@ func (c *services) Get(name string, options metav1.GetOptions) (result *v1.Servi func (c *services) List(opts metav1.ListOptions) (result *v1.ServiceList, err error) { result = &v1.ServiceList{} err = c.client.Get(). - Namespace(c.ns). Resource("services"). VersionedParams(&opts, scheme.ParameterCodec). Do(). @@ -89,7 +85,6 @@ func (c *services) List(opts metav1.ListOptions) (result *v1.ServiceList, err er func (c *services) Watch(opts metav1.ListOptions) (watch.Interface, error) { opts.Watch = true return c.client.Get(). - Namespace(c.ns). Resource("services"). VersionedParams(&opts, scheme.ParameterCodec). Watch() @@ -99,7 +94,6 @@ func (c *services) Watch(opts metav1.ListOptions) (watch.Interface, error) { func (c *services) Create(service *v1.Service) (result *v1.Service, err error) { result = &v1.Service{} err = c.client.Post(). - Namespace(c.ns). Resource("services"). Body(service). Do(). @@ -111,7 +105,6 @@ func (c *services) Create(service *v1.Service) (result *v1.Service, err error) { func (c *services) Update(service *v1.Service) (result *v1.Service, err error) { result = &v1.Service{} err = c.client.Put(). - Namespace(c.ns). Resource("services"). Name(service.Name). Body(service). @@ -126,7 +119,6 @@ func (c *services) Update(service *v1.Service) (result *v1.Service, err error) { func (c *services) UpdateStatus(service *v1.Service) (result *v1.Service, err error) { result = &v1.Service{} err = c.client.Put(). - Namespace(c.ns). Resource("services"). Name(service.Name). SubResource("status"). @@ -139,7 +131,6 @@ func (c *services) UpdateStatus(service *v1.Service) (result *v1.Service, err er // Delete takes name of the service and deletes it. Returns an error if one occurs. func (c *services) Delete(name string, options *metav1.DeleteOptions) error { return c.client.Delete(). - Namespace(c.ns). Resource("services"). Name(name). Body(options). @@ -150,7 +141,6 @@ func (c *services) Delete(name string, options *metav1.DeleteOptions) error { // DeleteCollection deletes a collection of objects. func (c *services) DeleteCollection(options *metav1.DeleteOptions, listOptions metav1.ListOptions) error { return c.client.Delete(). - Namespace(c.ns). Resource("services"). VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). @@ -162,7 +152,6 @@ func (c *services) DeleteCollection(options *metav1.DeleteOptions, listOptions m func (c *services) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.Service, err error) { result = &v1.Service{} err = c.client.Patch(pt). - Namespace(c.ns). Resource("services"). SubResource(subresources...). Name(name). diff --git a/client/informers/externalversions/inwinstack/v1/interface.go b/client/informers/externalversions/inwinstack/v1/interface.go index 31caa51..1eb71cb 100644 --- a/client/informers/externalversions/inwinstack/v1/interface.go +++ b/client/informers/externalversions/inwinstack/v1/interface.go @@ -68,5 +68,5 @@ func (v *version) Securities() SecurityInformer { // Services returns a ServiceInformer. func (v *version) Services() ServiceInformer { - return &serviceInformer{factory: v.factory, namespace: v.namespace, tweakListOptions: v.tweakListOptions} + return &serviceInformer{factory: v.factory, tweakListOptions: v.tweakListOptions} } diff --git a/client/informers/externalversions/inwinstack/v1/service.go b/client/informers/externalversions/inwinstack/v1/service.go index 76738fb..b0e0cdd 100644 --- a/client/informers/externalversions/inwinstack/v1/service.go +++ b/client/informers/externalversions/inwinstack/v1/service.go @@ -40,33 +40,32 @@ type ServiceInformer interface { type serviceInformer struct { factory internalinterfaces.SharedInformerFactory tweakListOptions internalinterfaces.TweakListOptionsFunc - namespace string } // NewServiceInformer constructs a new informer for Service type. // Always prefer using an informer factory to get a shared informer instead of getting an independent // one. This reduces memory footprint and number of connections to the server. -func NewServiceInformer(client versioned.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers) cache.SharedIndexInformer { - return NewFilteredServiceInformer(client, namespace, resyncPeriod, indexers, nil) +func NewServiceInformer(client versioned.Interface, resyncPeriod time.Duration, indexers cache.Indexers) cache.SharedIndexInformer { + return NewFilteredServiceInformer(client, resyncPeriod, indexers, nil) } // NewFilteredServiceInformer constructs a new informer for Service type. // Always prefer using an informer factory to get a shared informer instead of getting an independent // one. This reduces memory footprint and number of connections to the server. -func NewFilteredServiceInformer(client versioned.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { +func NewFilteredServiceInformer(client versioned.Interface, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { return cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options metav1.ListOptions) (runtime.Object, error) { if tweakListOptions != nil { tweakListOptions(&options) } - return client.InwinstackV1().Services(namespace).List(options) + return client.InwinstackV1().Services().List(options) }, WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) { if tweakListOptions != nil { tweakListOptions(&options) } - return client.InwinstackV1().Services(namespace).Watch(options) + return client.InwinstackV1().Services().Watch(options) }, }, &inwinstackv1.Service{}, @@ -76,7 +75,7 @@ func NewFilteredServiceInformer(client versioned.Interface, namespace string, re } func (f *serviceInformer) defaultInformer(client versioned.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { - return NewFilteredServiceInformer(client, f.namespace, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions) + return NewFilteredServiceInformer(client, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions) } func (f *serviceInformer) Informer() cache.SharedIndexInformer { diff --git a/client/listers/inwinstack/v1/expansion_generated.go b/client/listers/inwinstack/v1/expansion_generated.go index ccd1d16..0e177e2 100644 --- a/client/listers/inwinstack/v1/expansion_generated.go +++ b/client/listers/inwinstack/v1/expansion_generated.go @@ -48,7 +48,3 @@ type SecurityNamespaceListerExpansion interface{} // ServiceListerExpansion allows custom methods to be added to // ServiceLister. type ServiceListerExpansion interface{} - -// ServiceNamespaceListerExpansion allows custom methods to be added to -// ServiceNamespaceLister. -type ServiceNamespaceListerExpansion interface{} diff --git a/client/listers/inwinstack/v1/service.go b/client/listers/inwinstack/v1/service.go index e2ec041..8f52f00 100644 --- a/client/listers/inwinstack/v1/service.go +++ b/client/listers/inwinstack/v1/service.go @@ -28,8 +28,8 @@ import ( type ServiceLister interface { // List lists all Services in the indexer. List(selector labels.Selector) (ret []*v1.Service, err error) - // Services returns an object that can list and get Services. - Services(namespace string) ServiceNamespaceLister + // Get retrieves the Service from the index for a given name. + Get(name string) (*v1.Service, error) ServiceListerExpansion } @@ -51,38 +51,9 @@ func (s *serviceLister) List(selector labels.Selector) (ret []*v1.Service, err e return ret, err } -// Services returns an object that can list and get Services. -func (s *serviceLister) Services(namespace string) ServiceNamespaceLister { - return serviceNamespaceLister{indexer: s.indexer, namespace: namespace} -} - -// ServiceNamespaceLister helps list and get Services. -type ServiceNamespaceLister interface { - // List lists all Services in the indexer for a given namespace. - List(selector labels.Selector) (ret []*v1.Service, err error) - // Get retrieves the Service from the indexer for a given namespace and name. - Get(name string) (*v1.Service, error) - ServiceNamespaceListerExpansion -} - -// serviceNamespaceLister implements the ServiceNamespaceLister -// interface. -type serviceNamespaceLister struct { - indexer cache.Indexer - namespace string -} - -// List lists all Services in the indexer for a given namespace. -func (s serviceNamespaceLister) List(selector labels.Selector) (ret []*v1.Service, err error) { - err = cache.ListAllByNamespace(s.indexer, s.namespace, selector, func(m interface{}) { - ret = append(ret, m.(*v1.Service)) - }) - return ret, err -} - -// Get retrieves the Service from the indexer for a given namespace and name. -func (s serviceNamespaceLister) Get(name string) (*v1.Service, error) { - obj, exists, err := s.indexer.GetByKey(s.namespace + "/" + name) +// Get retrieves the Service from the index for a given name. +func (s *serviceLister) Get(name string) (*v1.Service, error) { + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err }