Merge pull request #13525 from jim-minter/image_nonNamespaced

Merged by openshift-bot

Author: OpenShift Bot

pkg/client/listers/core/internalversion/image.go

@@ -4,6 +4,7 @@ package internalversion
 
 import (
 	api "github.com/openshift/origin/pkg/image/api"
+	pkg_api "k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/errors"
 	"k8s.io/kubernetes/pkg/client/cache"
 	"k8s.io/kubernetes/pkg/labels"
@@ -13,8 +14,8 @@ import (
 type ImageLister interface {
 	// List lists all Images in the indexer.
 	List(selector labels.Selector) (ret []*api.Image, err error)
-	// Images returns an object that can list and get Images.
-	Images(namespace string) ImageNamespaceLister
+	// Get retrieves the Image from the index for a given name.
+	Get(name string) (*api.Image, error)
 	ImageListerExpansion
 }
 
@@ -36,38 +37,10 @@ func (s *imageLister) List(selector labels.Selector) (ret []*api.Image, err erro
 	return ret, err
 }
 
-// Images returns an object that can list and get Images.
-func (s *imageLister) Images(namespace string) ImageNamespaceLister {
-	return imageNamespaceLister{indexer: s.indexer, namespace: namespace}
-}
-
-// ImageNamespaceLister helps list and get Images.
-type ImageNamespaceLister interface {
-	// List lists all Images in the indexer for a given namespace.
-	List(selector labels.Selector) (ret []*api.Image, err error)
-	// Get retrieves the Image from the indexer for a given namespace and name.
-	Get(name string) (*api.Image, error)
-	ImageNamespaceListerExpansion
-}
-
-// imageNamespaceLister implements the ImageNamespaceLister
-// interface.
-type imageNamespaceLister struct {
-	indexer   cache.Indexer
-	namespace string
-}
-
-// List lists all Images in the indexer for a given namespace.
-func (s imageNamespaceLister) List(selector labels.Selector) (ret []*api.Image, err error) {
-	err = cache.ListAllByNamespace(s.indexer, s.namespace, selector, func(m interface{}) {
-		ret = append(ret, m.(*api.Image))
-	})
-	return ret, err
-}
-
-// Get retrieves the Image from the indexer for a given namespace and name.
-func (s imageNamespaceLister) Get(name string) (*api.Image, error) {
-	obj, exists, err := s.indexer.GetByKey(s.namespace + "/" + name)
+// Get retrieves the Image from the index for a given name.
+func (s *imageLister) Get(name string) (*api.Image, error) {
+	key := &api.Image{ObjectMeta: pkg_api.ObjectMeta{Name: name}}
+	obj, exists, err := s.indexer.Get(key)
 	if err != nil {
 		return nil, err
 	}

pkg/client/listers/core/v1/image.go

@@ -6,6 +6,7 @@ import (
 	api "github.com/openshift/origin/pkg/image/api"
 	v1 "github.com/openshift/origin/pkg/image/api/v1"
 	"k8s.io/kubernetes/pkg/api/errors"
+	api_v1 "k8s.io/kubernetes/pkg/api/v1"
 	"k8s.io/kubernetes/pkg/client/cache"
 	"k8s.io/kubernetes/pkg/labels"
 )
@@ -14,8 +15,8 @@ import (
 type ImageLister interface {
 	// List lists all Images in the indexer.
 	List(selector labels.Selector) (ret []*v1.Image, err error)
-	// Images returns an object that can list and get Images.
-	Images(namespace string) ImageNamespaceLister
+	// Get retrieves the Image from the index for a given name.
+	Get(name string) (*v1.Image, error)
 	ImageListerExpansion
 }
 
@@ -37,38 +38,10 @@ func (s *imageLister) List(selector labels.Selector) (ret []*v1.Image, err error
 	return ret, err
 }
 
-// Images returns an object that can list and get Images.
-func (s *imageLister) Images(namespace string) ImageNamespaceLister {
-	return imageNamespaceLister{indexer: s.indexer, namespace: namespace}
-}
-
-// ImageNamespaceLister helps list and get Images.
-type ImageNamespaceLister interface {
-	// List lists all Images in the indexer for a given namespace.
-	List(selector labels.Selector) (ret []*v1.Image, err error)
-	// Get retrieves the Image from the indexer for a given namespace and name.
-	Get(name string) (*v1.Image, error)
-	ImageNamespaceListerExpansion
-}
-
-// imageNamespaceLister implements the ImageNamespaceLister
-// interface.
-type imageNamespaceLister struct {
-	indexer   cache.Indexer
-	namespace string
-}
-
-// List lists all Images in the indexer for a given namespace.
-func (s imageNamespaceLister) List(selector labels.Selector) (ret []*v1.Image, err error) {
-	err = cache.ListAllByNamespace(s.indexer, s.namespace, selector, func(m interface{}) {
-		ret = append(ret, m.(*v1.Image))
-	})
-	return ret, err
-}
-
-// Get retrieves the Image from the indexer for a given namespace and name.
-func (s imageNamespaceLister) Get(name string) (*v1.Image, error) {
-	obj, exists, err := s.indexer.GetByKey(s.namespace + "/" + name)
+// Get retrieves the Image from the index for a given name.
+func (s *imageLister) Get(name string) (*v1.Image, error) {
+	key := &v1.Image{ObjectMeta: api_v1.ObjectMeta{Name: name}}
+	obj, exists, err := s.indexer.Get(key)
 	if err != nil {
 		return nil, err
 	}

pkg/image/api/types.go

@@ -52,6 +52,7 @@ const (
 )
 
 // +genclient=true
+// +nonNamespaced=true
 
 // Image is an immutable representation of a Docker image and metadata at a point in time.
 type Image struct {

pkg/image/api/v1/types.go

@@ -17,6 +17,7 @@ type ImageList struct {
 }
 
 // +genclient=true
+// +nonNamespaced=true
 
 // Image is an immutable representation of a Docker image and metadata at a point in time.
 type Image struct {

pkg/image/clientset/internalclientset/typed/image/internalversion/fake/fake_image.go

@@ -12,15 +12,13 @@ import (
 // FakeImages implements ImageResourceInterface
 type FakeImages struct {
 	Fake *FakeImage
-	ns   string
 }
 
 var imagesResource = unversioned.GroupVersionResource{Group: "image.openshift.io", Version: "", Resource: "images"}
 
 func (c *FakeImages) Create(image *api.Image) (result *api.Image, err error) {
 	obj, err := c.Fake.
-		Invokes(core.NewCreateAction(imagesResource, c.ns, image), &api.Image{})
-
+		Invokes(core.NewRootCreateAction(imagesResource, image), &api.Image{})
 	if obj == nil {
 		return nil, err
 	}
@@ -29,8 +27,7 @@ func (c *FakeImages) Create(image *api.Image) (result *api.Image, err error) {
 
 func (c *FakeImages) Update(image *api.Image) (result *api.Image, err error) {
 	obj, err := c.Fake.
-		Invokes(core.NewUpdateAction(imagesResource, c.ns, image), &api.Image{})
-
+		Invokes(core.NewRootUpdateAction(imagesResource, image), &api.Image{})
 	if obj == nil {
 		return nil, err
 	}
@@ -39,22 +36,20 @@ func (c *FakeImages) Update(image *api.Image) (result *api.Image, err error) {
 
 func (c *FakeImages) Delete(name string, options *pkg_api.DeleteOptions) error {
 	_, err := c.Fake.
-		Invokes(core.NewDeleteAction(imagesResource, c.ns, name), &api.Image{})
-
+		Invokes(core.NewRootDeleteAction(imagesResource, name), &api.Image{})
 	return err
 }
 
 func (c *FakeImages) DeleteCollection(options *pkg_api.DeleteOptions, listOptions pkg_api.ListOptions) error {
-	action := core.NewDeleteCollectionAction(imagesResource, c.ns, listOptions)
+	action := core.NewRootDeleteCollectionAction(imagesResource, listOptions)
 
 	_, err := c.Fake.Invokes(action, &api.ImageList{})
 	return err
 }
 
 func (c *FakeImages) Get(name string) (result *api.Image, err error) {
 	obj, err := c.Fake.
-		Invokes(core.NewGetAction(imagesResource, c.ns, name), &api.Image{})
-
+		Invokes(core.NewRootGetAction(imagesResource, name), &api.Image{})
 	if obj == nil {
 		return nil, err
 	}
@@ -63,8 +58,7 @@ func (c *FakeImages) Get(name string) (result *api.Image, err error) {
 
 func (c *FakeImages) List(opts pkg_api.ListOptions) (result *api.ImageList, err error) {
 	obj, err := c.Fake.
-		Invokes(core.NewListAction(imagesResource, c.ns, opts), &api.ImageList{})
-
+		Invokes(core.NewRootListAction(imagesResource, opts), &api.ImageList{})
 	if obj == nil {
 		return nil, err
 	}
@@ -85,15 +79,13 @@ func (c *FakeImages) List(opts pkg_api.ListOptions) (result *api.ImageList, err
 // Watch returns a watch.Interface that watches the requested images.
 func (c *FakeImages) Watch(opts pkg_api.ListOptions) (watch.Interface, error) {
 	return c.Fake.
-		InvokesWatch(core.NewWatchAction(imagesResource, c.ns, opts))
-
+		InvokesWatch(core.NewRootWatchAction(imagesResource, opts))
 }
 
 // Patch applies the patch and returns the patched image.
 func (c *FakeImages) Patch(name string, pt pkg_api.PatchType, data []byte, subresources ...string) (result *api.Image, err error) {
 	obj, err := c.Fake.
-		Invokes(core.NewPatchSubresourceAction(imagesResource, c.ns, name, data, subresources...), &api.Image{})
-
+		Invokes(core.NewRootPatchSubresourceAction(imagesResource, name, data, subresources...), &api.Image{})
 	if obj == nil {
 		return nil, err
 	}

pkg/image/clientset/internalclientset/typed/image/internalversion/fake/fake_image_client.go

@@ -10,8 +10,8 @@ type FakeImage struct {
 	*core.Fake
 }
 
-func (c *FakeImage) Images(namespace string) internalversion.ImageResourceInterface {
-	return &FakeImages{c, namespace}
+func (c *FakeImage) Images() internalversion.ImageResourceInterface {
+	return &FakeImages{c}
 }
 
 // RESTClient returns a RESTClient that is used to communicate

pkg/image/clientset/internalclientset/typed/image/internalversion/image.go

@@ -10,7 +10,7 @@ import (
 // ImagesGetter has a method to return a ImageResourceInterface.
 // A group's client should implement this interface.
 type ImagesGetter interface {
-	Images(namespace string) ImageResourceInterface
+	Images() ImageResourceInterface
 }
 
 // ImageResourceInterface has methods to work with ImageResource resources.
@@ -29,22 +29,19 @@ type ImageResourceInterface interface {
 // images implements ImageResourceInterface
 type images struct {
 	client restclient.Interface
-	ns     string
 }
 
 // newImages returns a Images
-func newImages(c *ImageClient, namespace string) *images {
+func newImages(c *ImageClient) *images {
 	return &images{
 		client: c.RESTClient(),
-		ns:     namespace,
 	}
 }
 
 // Create takes the representation of a image and creates it.  Returns the server's representation of the image, and an error, if there is any.
 func (c *images) Create(image *api.Image) (result *api.Image, err error) {
 	result = &api.Image{}
 	err = c.client.Post().
-		Namespace(c.ns).
 		Resource("images").
 		Body(image).
 		Do().
@@ -56,7 +53,6 @@ func (c *images) Create(image *api.Image) (result *api.Image, err error) {
 func (c *images) Update(image *api.Image) (result *api.Image, err error) {
 	result = &api.Image{}
 	err = c.client.Put().
-		Namespace(c.ns).
 		Resource("images").
 		Name(image.Name).
 		Body(image).
@@ -68,7 +64,6 @@ func (c *images) Update(image *api.Image) (result *api.Image, err error) {
 // Delete takes name of the image and deletes it. Returns an error if one occurs.
 func (c *images) Delete(name string, options *pkg_api.DeleteOptions) error {
 	return c.client.Delete().
-		Namespace(c.ns).
 		Resource("images").
 		Name(name).
 		Body(options).
@@ -79,7 +74,6 @@ func (c *images) Delete(name string, options *pkg_api.DeleteOptions) error {
 // DeleteCollection deletes a collection of objects.
 func (c *images) DeleteCollection(options *pkg_api.DeleteOptions, listOptions pkg_api.ListOptions) error {
 	return c.client.Delete().
-		Namespace(c.ns).
 		Resource("images").
 		VersionedParams(&listOptions, pkg_api.ParameterCodec).
 		Body(options).
@@ -91,7 +85,6 @@ func (c *images) DeleteCollection(options *pkg_api.DeleteOptions, listOptions pk
 func (c *images) Get(name string) (result *api.Image, err error) {
 	result = &api.Image{}
 	err = c.client.Get().
-		Namespace(c.ns).
 		Resource("images").
 		Name(name).
 		Do().
@@ -103,7 +96,6 @@ func (c *images) Get(name string) (result *api.Image, err error) {
 func (c *images) List(opts pkg_api.ListOptions) (result *api.ImageList, err error) {
 	result = &api.ImageList{}
 	err = c.client.Get().
-		Namespace(c.ns).
 		Resource("images").
 		VersionedParams(&opts, pkg_api.ParameterCodec).
 		Do().
@@ -115,7 +107,6 @@ func (c *images) List(opts pkg_api.ListOptions) (result *api.ImageList, err erro
 func (c *images) Watch(opts pkg_api.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
-		Namespace(c.ns).
 		Resource("images").
 		VersionedParams(&opts, pkg_api.ParameterCodec).
 		Watch()
@@ -125,7 +116,6 @@ func (c *images) Watch(opts pkg_api.ListOptions) (watch.Interface, error) {
 func (c *images) Patch(name string, pt pkg_api.PatchType, data []byte, subresources ...string) (result *api.Image, err error) {
 	result = &api.Image{}
 	err = c.client.Patch(pt).
-		Namespace(c.ns).
 		Resource("images").
 		SubResource(subresources...).
 		Name(name).

pkg/image/clientset/internalclientset/typed/image/internalversion/image_client.go

@@ -16,8 +16,8 @@ type ImageClient struct {
 	restClient restclient.Interface
 }
 
-func (c *ImageClient) Images(namespace string) ImageResourceInterface {
-	return newImages(c, namespace)
+func (c *ImageClient) Images() ImageResourceInterface {
+	return newImages(c)
 }
 
 // NewForConfig creates a new ImageClient for the given config.