fix federatednamespace resource scope

Signed-off-by: hongming <talonwan@yunify.com>
This commit is contained in:
hongming
2020-07-22 22:36:51 +08:00
parent 3525fc5507
commit c103f47abd
11 changed files with 84 additions and 32 deletions

View File

@@ -31,6 +31,7 @@ import (
// FakeFederatedNamespaces implements FederatedNamespaceInterface
type FakeFederatedNamespaces struct {
Fake *FakeTypesV1beta1
ns string
}
var federatednamespacesResource = schema.GroupVersionResource{Group: "types.kubefed.io", Version: "v1beta1", Resource: "federatednamespaces"}
@@ -40,7 +41,8 @@ var federatednamespacesKind = schema.GroupVersionKind{Group: "types.kubefed.io",
// Get takes name of the federatedNamespace, and returns the corresponding federatedNamespace object, and an error if there is any.
func (c *FakeFederatedNamespaces) Get(name string, options v1.GetOptions) (result *v1beta1.FederatedNamespace, err error) {
obj, err := c.Fake.
Invokes(testing.NewRootGetAction(federatednamespacesResource, name), &v1beta1.FederatedNamespace{})
Invokes(testing.NewGetAction(federatednamespacesResource, c.ns, name), &v1beta1.FederatedNamespace{})
if obj == nil {
return nil, err
}
@@ -50,7 +52,8 @@ func (c *FakeFederatedNamespaces) Get(name string, options v1.GetOptions) (resul
// List takes label and field selectors, and returns the list of FederatedNamespaces that match those selectors.
func (c *FakeFederatedNamespaces) List(opts v1.ListOptions) (result *v1beta1.FederatedNamespaceList, err error) {
obj, err := c.Fake.
Invokes(testing.NewRootListAction(federatednamespacesResource, federatednamespacesKind, opts), &v1beta1.FederatedNamespaceList{})
Invokes(testing.NewListAction(federatednamespacesResource, federatednamespacesKind, c.ns, opts), &v1beta1.FederatedNamespaceList{})
if obj == nil {
return nil, err
}
@@ -71,13 +74,15 @@ func (c *FakeFederatedNamespaces) List(opts v1.ListOptions) (result *v1beta1.Fed
// Watch returns a watch.Interface that watches the requested federatedNamespaces.
func (c *FakeFederatedNamespaces) Watch(opts v1.ListOptions) (watch.Interface, error) {
return c.Fake.
InvokesWatch(testing.NewRootWatchAction(federatednamespacesResource, opts))
InvokesWatch(testing.NewWatchAction(federatednamespacesResource, c.ns, opts))
}
// Create takes the representation of a federatedNamespace and creates it. Returns the server's representation of the federatedNamespace, and an error, if there is any.
func (c *FakeFederatedNamespaces) Create(federatedNamespace *v1beta1.FederatedNamespace) (result *v1beta1.FederatedNamespace, err error) {
obj, err := c.Fake.
Invokes(testing.NewRootCreateAction(federatednamespacesResource, federatedNamespace), &v1beta1.FederatedNamespace{})
Invokes(testing.NewCreateAction(federatednamespacesResource, c.ns, federatedNamespace), &v1beta1.FederatedNamespace{})
if obj == nil {
return nil, err
}
@@ -87,7 +92,8 @@ func (c *FakeFederatedNamespaces) Create(federatedNamespace *v1beta1.FederatedNa
// Update takes the representation of a federatedNamespace and updates it. Returns the server's representation of the federatedNamespace, and an error, if there is any.
func (c *FakeFederatedNamespaces) Update(federatedNamespace *v1beta1.FederatedNamespace) (result *v1beta1.FederatedNamespace, err error) {
obj, err := c.Fake.
Invokes(testing.NewRootUpdateAction(federatednamespacesResource, federatedNamespace), &v1beta1.FederatedNamespace{})
Invokes(testing.NewUpdateAction(federatednamespacesResource, c.ns, federatedNamespace), &v1beta1.FederatedNamespace{})
if obj == nil {
return nil, err
}
@@ -97,13 +103,14 @@ func (c *FakeFederatedNamespaces) Update(federatedNamespace *v1beta1.FederatedNa
// Delete takes name of the federatedNamespace and deletes it. Returns an error if one occurs.
func (c *FakeFederatedNamespaces) Delete(name string, options *v1.DeleteOptions) error {
_, err := c.Fake.
Invokes(testing.NewRootDeleteAction(federatednamespacesResource, name), &v1beta1.FederatedNamespace{})
Invokes(testing.NewDeleteAction(federatednamespacesResource, c.ns, name), &v1beta1.FederatedNamespace{})
return err
}
// DeleteCollection deletes a collection of objects.
func (c *FakeFederatedNamespaces) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
action := testing.NewRootDeleteCollectionAction(federatednamespacesResource, listOptions)
action := testing.NewDeleteCollectionAction(federatednamespacesResource, c.ns, listOptions)
_, err := c.Fake.Invokes(action, &v1beta1.FederatedNamespaceList{})
return err
@@ -112,7 +119,8 @@ func (c *FakeFederatedNamespaces) DeleteCollection(options *v1.DeleteOptions, li
// Patch applies the patch and returns the patched federatedNamespace.
func (c *FakeFederatedNamespaces) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.FederatedNamespace, err error) {
obj, err := c.Fake.
Invokes(testing.NewRootPatchSubresourceAction(federatednamespacesResource, name, pt, data, subresources...), &v1beta1.FederatedNamespace{})
Invokes(testing.NewPatchSubresourceAction(federatednamespacesResource, c.ns, name, pt, data, subresources...), &v1beta1.FederatedNamespace{})
if obj == nil {
return nil, err
}

View File

@@ -28,8 +28,8 @@ type FakeTypesV1beta1 struct {
*testing.Fake
}
func (c *FakeTypesV1beta1) FederatedNamespaces() v1beta1.FederatedNamespaceInterface {
return &FakeFederatedNamespaces{c}
func (c *FakeTypesV1beta1) FederatedNamespaces(namespace string) v1beta1.FederatedNamespaceInterface {
return &FakeFederatedNamespaces{c, namespace}
}
// RESTClient returns a RESTClient that is used to communicate

View File

@@ -32,7 +32,7 @@ import (
// FederatedNamespacesGetter has a method to return a FederatedNamespaceInterface.
// A group's client should implement this interface.
type FederatedNamespacesGetter interface {
FederatedNamespaces() FederatedNamespaceInterface
FederatedNamespaces(namespace string) FederatedNamespaceInterface
}
// FederatedNamespaceInterface has methods to work with FederatedNamespace resources.
@@ -51,12 +51,14 @@ type FederatedNamespaceInterface interface {
// federatedNamespaces implements FederatedNamespaceInterface
type federatedNamespaces struct {
client rest.Interface
ns string
}
// newFederatedNamespaces returns a FederatedNamespaces
func newFederatedNamespaces(c *TypesV1beta1Client) *federatedNamespaces {
func newFederatedNamespaces(c *TypesV1beta1Client, namespace string) *federatedNamespaces {
return &federatedNamespaces{
client: c.RESTClient(),
ns: namespace,
}
}
@@ -64,6 +66,7 @@ func newFederatedNamespaces(c *TypesV1beta1Client) *federatedNamespaces {
func (c *federatedNamespaces) Get(name string, options v1.GetOptions) (result *v1beta1.FederatedNamespace, err error) {
result = &v1beta1.FederatedNamespace{}
err = c.client.Get().
Namespace(c.ns).
Resource("federatednamespaces").
Name(name).
VersionedParams(&options, scheme.ParameterCodec).
@@ -80,6 +83,7 @@ func (c *federatedNamespaces) List(opts v1.ListOptions) (result *v1beta1.Federat
}
result = &v1beta1.FederatedNamespaceList{}
err = c.client.Get().
Namespace(c.ns).
Resource("federatednamespaces").
VersionedParams(&opts, scheme.ParameterCodec).
Timeout(timeout).
@@ -96,6 +100,7 @@ func (c *federatedNamespaces) Watch(opts v1.ListOptions) (watch.Interface, error
}
opts.Watch = true
return c.client.Get().
Namespace(c.ns).
Resource("federatednamespaces").
VersionedParams(&opts, scheme.ParameterCodec).
Timeout(timeout).
@@ -106,6 +111,7 @@ func (c *federatedNamespaces) Watch(opts v1.ListOptions) (watch.Interface, error
func (c *federatedNamespaces) Create(federatedNamespace *v1beta1.FederatedNamespace) (result *v1beta1.FederatedNamespace, err error) {
result = &v1beta1.FederatedNamespace{}
err = c.client.Post().
Namespace(c.ns).
Resource("federatednamespaces").
Body(federatedNamespace).
Do().
@@ -117,6 +123,7 @@ func (c *federatedNamespaces) Create(federatedNamespace *v1beta1.FederatedNamesp
func (c *federatedNamespaces) Update(federatedNamespace *v1beta1.FederatedNamespace) (result *v1beta1.FederatedNamespace, err error) {
result = &v1beta1.FederatedNamespace{}
err = c.client.Put().
Namespace(c.ns).
Resource("federatednamespaces").
Name(federatedNamespace.Name).
Body(federatedNamespace).
@@ -128,6 +135,7 @@ func (c *federatedNamespaces) Update(federatedNamespace *v1beta1.FederatedNamesp
// Delete takes name of the federatedNamespace and deletes it. Returns an error if one occurs.
func (c *federatedNamespaces) Delete(name string, options *v1.DeleteOptions) error {
return c.client.Delete().
Namespace(c.ns).
Resource("federatednamespaces").
Name(name).
Body(options).
@@ -142,6 +150,7 @@ func (c *federatedNamespaces) DeleteCollection(options *v1.DeleteOptions, listOp
timeout = time.Duration(*listOptions.TimeoutSeconds) * time.Second
}
return c.client.Delete().
Namespace(c.ns).
Resource("federatednamespaces").
VersionedParams(&listOptions, scheme.ParameterCodec).
Timeout(timeout).
@@ -154,6 +163,7 @@ func (c *federatedNamespaces) DeleteCollection(options *v1.DeleteOptions, listOp
func (c *federatedNamespaces) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.FederatedNamespace, err error) {
result = &v1beta1.FederatedNamespace{}
err = c.client.Patch(pt).
Namespace(c.ns).
Resource("federatednamespaces").
SubResource(subresources...).
Name(name).

View File

@@ -34,8 +34,8 @@ type TypesV1beta1Client struct {
restClient rest.Interface
}
func (c *TypesV1beta1Client) FederatedNamespaces() FederatedNamespaceInterface {
return newFederatedNamespaces(c)
func (c *TypesV1beta1Client) FederatedNamespaces(namespace string) FederatedNamespaceInterface {
return newFederatedNamespaces(c, namespace)
}
// NewForConfig creates a new TypesV1beta1Client for the given config.