Merge pull request #63861 from deads2k/client-09-clean

Automatic merge from submit-queue (batch tested with PRs 63589, 63644, 63861, 63872, 63847). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

remove service.deletecollection since the server doesn't support it

Updates the generated service client to match the API available.

@kubernetes/sig-api-machinery-pr-reviews
@kubernetes/api-reviewers

```release-note
NONE
```

Kubernetes-commit: 49e9322d4f62cda83e3eac815e202967dc1a0333
This commit is contained in:
Kubernetes Publisher 2018-05-15 17:09:14 -07:00
commit 79540301d5
5 changed files with 80 additions and 119 deletions

160
Godeps/Godeps.json generated
View File

@ -268,323 +268,323 @@
},
{
"ImportPath": "k8s.io/api/admissionregistration/v1alpha1",
"Rev": "1b6ea75871c9eda0a66254aeeb2d47ecba3ff3c6"
"Rev": "ef391d2c23625c579885ab0a689293ded22d11b4"
},
{
"ImportPath": "k8s.io/api/admissionregistration/v1beta1",
"Rev": "1b6ea75871c9eda0a66254aeeb2d47ecba3ff3c6"
"Rev": "ef391d2c23625c579885ab0a689293ded22d11b4"
},
{
"ImportPath": "k8s.io/api/apps/v1",
"Rev": "1b6ea75871c9eda0a66254aeeb2d47ecba3ff3c6"
"Rev": "ef391d2c23625c579885ab0a689293ded22d11b4"
},
{
"ImportPath": "k8s.io/api/apps/v1beta1",
"Rev": "1b6ea75871c9eda0a66254aeeb2d47ecba3ff3c6"
"Rev": "ef391d2c23625c579885ab0a689293ded22d11b4"
},
{
"ImportPath": "k8s.io/api/apps/v1beta2",
"Rev": "1b6ea75871c9eda0a66254aeeb2d47ecba3ff3c6"
"Rev": "ef391d2c23625c579885ab0a689293ded22d11b4"
},
{
"ImportPath": "k8s.io/api/authentication/v1",
"Rev": "1b6ea75871c9eda0a66254aeeb2d47ecba3ff3c6"
"Rev": "ef391d2c23625c579885ab0a689293ded22d11b4"
},
{
"ImportPath": "k8s.io/api/authentication/v1beta1",
"Rev": "1b6ea75871c9eda0a66254aeeb2d47ecba3ff3c6"
"Rev": "ef391d2c23625c579885ab0a689293ded22d11b4"
},
{
"ImportPath": "k8s.io/api/authorization/v1",
"Rev": "1b6ea75871c9eda0a66254aeeb2d47ecba3ff3c6"
"Rev": "ef391d2c23625c579885ab0a689293ded22d11b4"
},
{
"ImportPath": "k8s.io/api/authorization/v1beta1",
"Rev": "1b6ea75871c9eda0a66254aeeb2d47ecba3ff3c6"
"Rev": "ef391d2c23625c579885ab0a689293ded22d11b4"
},
{
"ImportPath": "k8s.io/api/autoscaling/v1",
"Rev": "1b6ea75871c9eda0a66254aeeb2d47ecba3ff3c6"
"Rev": "ef391d2c23625c579885ab0a689293ded22d11b4"
},
{
"ImportPath": "k8s.io/api/autoscaling/v2beta1",
"Rev": "1b6ea75871c9eda0a66254aeeb2d47ecba3ff3c6"
"Rev": "ef391d2c23625c579885ab0a689293ded22d11b4"
},
{
"ImportPath": "k8s.io/api/batch/v1",
"Rev": "1b6ea75871c9eda0a66254aeeb2d47ecba3ff3c6"
"Rev": "ef391d2c23625c579885ab0a689293ded22d11b4"
},
{
"ImportPath": "k8s.io/api/batch/v1beta1",
"Rev": "1b6ea75871c9eda0a66254aeeb2d47ecba3ff3c6"
"Rev": "ef391d2c23625c579885ab0a689293ded22d11b4"
},
{
"ImportPath": "k8s.io/api/batch/v2alpha1",
"Rev": "1b6ea75871c9eda0a66254aeeb2d47ecba3ff3c6"
"Rev": "ef391d2c23625c579885ab0a689293ded22d11b4"
},
{
"ImportPath": "k8s.io/api/certificates/v1beta1",
"Rev": "1b6ea75871c9eda0a66254aeeb2d47ecba3ff3c6"
"Rev": "ef391d2c23625c579885ab0a689293ded22d11b4"
},
{
"ImportPath": "k8s.io/api/core/v1",
"Rev": "1b6ea75871c9eda0a66254aeeb2d47ecba3ff3c6"
"Rev": "ef391d2c23625c579885ab0a689293ded22d11b4"
},
{
"ImportPath": "k8s.io/api/events/v1beta1",
"Rev": "1b6ea75871c9eda0a66254aeeb2d47ecba3ff3c6"
"Rev": "ef391d2c23625c579885ab0a689293ded22d11b4"
},
{
"ImportPath": "k8s.io/api/extensions/v1beta1",
"Rev": "1b6ea75871c9eda0a66254aeeb2d47ecba3ff3c6"
"Rev": "ef391d2c23625c579885ab0a689293ded22d11b4"
},
{
"ImportPath": "k8s.io/api/imagepolicy/v1alpha1",
"Rev": "1b6ea75871c9eda0a66254aeeb2d47ecba3ff3c6"
"Rev": "ef391d2c23625c579885ab0a689293ded22d11b4"
},
{
"ImportPath": "k8s.io/api/networking/v1",
"Rev": "1b6ea75871c9eda0a66254aeeb2d47ecba3ff3c6"
"Rev": "ef391d2c23625c579885ab0a689293ded22d11b4"
},
{
"ImportPath": "k8s.io/api/policy/v1beta1",
"Rev": "1b6ea75871c9eda0a66254aeeb2d47ecba3ff3c6"
"Rev": "ef391d2c23625c579885ab0a689293ded22d11b4"
},
{
"ImportPath": "k8s.io/api/rbac/v1",
"Rev": "1b6ea75871c9eda0a66254aeeb2d47ecba3ff3c6"
"Rev": "ef391d2c23625c579885ab0a689293ded22d11b4"
},
{
"ImportPath": "k8s.io/api/rbac/v1alpha1",
"Rev": "1b6ea75871c9eda0a66254aeeb2d47ecba3ff3c6"
"Rev": "ef391d2c23625c579885ab0a689293ded22d11b4"
},
{
"ImportPath": "k8s.io/api/rbac/v1beta1",
"Rev": "1b6ea75871c9eda0a66254aeeb2d47ecba3ff3c6"
"Rev": "ef391d2c23625c579885ab0a689293ded22d11b4"
},
{
"ImportPath": "k8s.io/api/scheduling/v1alpha1",
"Rev": "1b6ea75871c9eda0a66254aeeb2d47ecba3ff3c6"
"Rev": "ef391d2c23625c579885ab0a689293ded22d11b4"
},
{
"ImportPath": "k8s.io/api/scheduling/v1beta1",
"Rev": "1b6ea75871c9eda0a66254aeeb2d47ecba3ff3c6"
"Rev": "ef391d2c23625c579885ab0a689293ded22d11b4"
},
{
"ImportPath": "k8s.io/api/settings/v1alpha1",
"Rev": "1b6ea75871c9eda0a66254aeeb2d47ecba3ff3c6"
"Rev": "ef391d2c23625c579885ab0a689293ded22d11b4"
},
{
"ImportPath": "k8s.io/api/storage/v1",
"Rev": "1b6ea75871c9eda0a66254aeeb2d47ecba3ff3c6"
"Rev": "ef391d2c23625c579885ab0a689293ded22d11b4"
},
{
"ImportPath": "k8s.io/api/storage/v1alpha1",
"Rev": "1b6ea75871c9eda0a66254aeeb2d47ecba3ff3c6"
"Rev": "ef391d2c23625c579885ab0a689293ded22d11b4"
},
{
"ImportPath": "k8s.io/api/storage/v1beta1",
"Rev": "1b6ea75871c9eda0a66254aeeb2d47ecba3ff3c6"
"Rev": "ef391d2c23625c579885ab0a689293ded22d11b4"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/equality",
"Rev": "8e510c818b62c1a0a1b738153104e8627916ebeb"
"Rev": "3492ef8dace114d765f20d9c1a03f306449e5252"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/errors",
"Rev": "8e510c818b62c1a0a1b738153104e8627916ebeb"
"Rev": "3492ef8dace114d765f20d9c1a03f306449e5252"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/meta",
"Rev": "8e510c818b62c1a0a1b738153104e8627916ebeb"
"Rev": "3492ef8dace114d765f20d9c1a03f306449e5252"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/resource",
"Rev": "8e510c818b62c1a0a1b738153104e8627916ebeb"
"Rev": "3492ef8dace114d765f20d9c1a03f306449e5252"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/testing",
"Rev": "8e510c818b62c1a0a1b738153104e8627916ebeb"
"Rev": "3492ef8dace114d765f20d9c1a03f306449e5252"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/testing/fuzzer",
"Rev": "8e510c818b62c1a0a1b738153104e8627916ebeb"
"Rev": "3492ef8dace114d765f20d9c1a03f306449e5252"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/testing/roundtrip",
"Rev": "8e510c818b62c1a0a1b738153104e8627916ebeb"
"Rev": "3492ef8dace114d765f20d9c1a03f306449e5252"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer",
"Rev": "8e510c818b62c1a0a1b738153104e8627916ebeb"
"Rev": "3492ef8dace114d765f20d9c1a03f306449e5252"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
"Rev": "8e510c818b62c1a0a1b738153104e8627916ebeb"
"Rev": "3492ef8dace114d765f20d9c1a03f306449e5252"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
"Rev": "8e510c818b62c1a0a1b738153104e8627916ebeb"
"Rev": "3492ef8dace114d765f20d9c1a03f306449e5252"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
"Rev": "8e510c818b62c1a0a1b738153104e8627916ebeb"
"Rev": "3492ef8dace114d765f20d9c1a03f306449e5252"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1",
"Rev": "8e510c818b62c1a0a1b738153104e8627916ebeb"
"Rev": "3492ef8dace114d765f20d9c1a03f306449e5252"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/conversion",
"Rev": "8e510c818b62c1a0a1b738153104e8627916ebeb"
"Rev": "3492ef8dace114d765f20d9c1a03f306449e5252"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
"Rev": "8e510c818b62c1a0a1b738153104e8627916ebeb"
"Rev": "3492ef8dace114d765f20d9c1a03f306449e5252"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/fields",
"Rev": "8e510c818b62c1a0a1b738153104e8627916ebeb"
"Rev": "3492ef8dace114d765f20d9c1a03f306449e5252"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/labels",
"Rev": "8e510c818b62c1a0a1b738153104e8627916ebeb"
"Rev": "3492ef8dace114d765f20d9c1a03f306449e5252"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime",
"Rev": "8e510c818b62c1a0a1b738153104e8627916ebeb"
"Rev": "3492ef8dace114d765f20d9c1a03f306449e5252"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
"Rev": "8e510c818b62c1a0a1b738153104e8627916ebeb"
"Rev": "3492ef8dace114d765f20d9c1a03f306449e5252"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
"Rev": "8e510c818b62c1a0a1b738153104e8627916ebeb"
"Rev": "3492ef8dace114d765f20d9c1a03f306449e5252"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
"Rev": "8e510c818b62c1a0a1b738153104e8627916ebeb"
"Rev": "3492ef8dace114d765f20d9c1a03f306449e5252"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
"Rev": "8e510c818b62c1a0a1b738153104e8627916ebeb"
"Rev": "3492ef8dace114d765f20d9c1a03f306449e5252"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
"Rev": "8e510c818b62c1a0a1b738153104e8627916ebeb"
"Rev": "3492ef8dace114d765f20d9c1a03f306449e5252"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
"Rev": "8e510c818b62c1a0a1b738153104e8627916ebeb"
"Rev": "3492ef8dace114d765f20d9c1a03f306449e5252"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
"Rev": "8e510c818b62c1a0a1b738153104e8627916ebeb"
"Rev": "3492ef8dace114d765f20d9c1a03f306449e5252"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/selection",
"Rev": "8e510c818b62c1a0a1b738153104e8627916ebeb"
"Rev": "3492ef8dace114d765f20d9c1a03f306449e5252"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/types",
"Rev": "8e510c818b62c1a0a1b738153104e8627916ebeb"
"Rev": "3492ef8dace114d765f20d9c1a03f306449e5252"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/cache",
"Rev": "8e510c818b62c1a0a1b738153104e8627916ebeb"
"Rev": "3492ef8dace114d765f20d9c1a03f306449e5252"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/clock",
"Rev": "8e510c818b62c1a0a1b738153104e8627916ebeb"
"Rev": "3492ef8dace114d765f20d9c1a03f306449e5252"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/diff",
"Rev": "8e510c818b62c1a0a1b738153104e8627916ebeb"
"Rev": "3492ef8dace114d765f20d9c1a03f306449e5252"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/errors",
"Rev": "8e510c818b62c1a0a1b738153104e8627916ebeb"
"Rev": "3492ef8dace114d765f20d9c1a03f306449e5252"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/framer",
"Rev": "8e510c818b62c1a0a1b738153104e8627916ebeb"
"Rev": "3492ef8dace114d765f20d9c1a03f306449e5252"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream",
"Rev": "8e510c818b62c1a0a1b738153104e8627916ebeb"
"Rev": "3492ef8dace114d765f20d9c1a03f306449e5252"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy",
"Rev": "8e510c818b62c1a0a1b738153104e8627916ebeb"
"Rev": "3492ef8dace114d765f20d9c1a03f306449e5252"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
"Rev": "8e510c818b62c1a0a1b738153104e8627916ebeb"
"Rev": "3492ef8dace114d765f20d9c1a03f306449e5252"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/json",
"Rev": "8e510c818b62c1a0a1b738153104e8627916ebeb"
"Rev": "3492ef8dace114d765f20d9c1a03f306449e5252"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
"Rev": "8e510c818b62c1a0a1b738153104e8627916ebeb"
"Rev": "3492ef8dace114d765f20d9c1a03f306449e5252"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/net",
"Rev": "8e510c818b62c1a0a1b738153104e8627916ebeb"
"Rev": "3492ef8dace114d765f20d9c1a03f306449e5252"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand",
"Rev": "8e510c818b62c1a0a1b738153104e8627916ebeb"
"Rev": "3492ef8dace114d765f20d9c1a03f306449e5252"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
"Rev": "8e510c818b62c1a0a1b738153104e8627916ebeb"
"Rev": "3492ef8dace114d765f20d9c1a03f306449e5252"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/sets",
"Rev": "8e510c818b62c1a0a1b738153104e8627916ebeb"
"Rev": "3492ef8dace114d765f20d9c1a03f306449e5252"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
"Rev": "8e510c818b62c1a0a1b738153104e8627916ebeb"
"Rev": "3492ef8dace114d765f20d9c1a03f306449e5252"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/validation",
"Rev": "8e510c818b62c1a0a1b738153104e8627916ebeb"
"Rev": "3492ef8dace114d765f20d9c1a03f306449e5252"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
"Rev": "8e510c818b62c1a0a1b738153104e8627916ebeb"
"Rev": "3492ef8dace114d765f20d9c1a03f306449e5252"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/wait",
"Rev": "8e510c818b62c1a0a1b738153104e8627916ebeb"
"Rev": "3492ef8dace114d765f20d9c1a03f306449e5252"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
"Rev": "8e510c818b62c1a0a1b738153104e8627916ebeb"
"Rev": "3492ef8dace114d765f20d9c1a03f306449e5252"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/version",
"Rev": "8e510c818b62c1a0a1b738153104e8627916ebeb"
"Rev": "3492ef8dace114d765f20d9c1a03f306449e5252"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/watch",
"Rev": "8e510c818b62c1a0a1b738153104e8627916ebeb"
"Rev": "3492ef8dace114d765f20d9c1a03f306449e5252"
},
{
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
"Rev": "8e510c818b62c1a0a1b738153104e8627916ebeb"
"Rev": "3492ef8dace114d765f20d9c1a03f306449e5252"
},
{
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil",
"Rev": "8e510c818b62c1a0a1b738153104e8627916ebeb"
"Rev": "3492ef8dace114d765f20d9c1a03f306449e5252"
},
{
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
"Rev": "8e510c818b62c1a0a1b738153104e8627916ebeb"
"Rev": "3492ef8dace114d765f20d9c1a03f306449e5252"
},
{
"ImportPath": "k8s.io/kube-openapi/pkg/util/proto",

View File

@ -112,14 +112,6 @@ func (c *FakeNamespaces) Delete(name string, options *v1.DeleteOptions) error {
return err
}
// DeleteCollection deletes a collection of objects.
func (c *FakeNamespaces) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
action := testing.NewRootDeleteCollectionAction(namespacesResource, listOptions)
_, err := c.Fake.Invokes(action, &core_v1.NamespaceList{})
return err
}
// Patch applies the patch and returns the patched namespace.
func (c *FakeNamespaces) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *core_v1.Namespace, err error) {
obj, err := c.Fake.

View File

@ -120,14 +120,6 @@ func (c *FakeServices) Delete(name string, options *v1.DeleteOptions) error {
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)
_, err := c.Fake.Invokes(action, &core_v1.ServiceList{})
return err
}
// Patch applies the patch and returns the patched service.
func (c *FakeServices) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *core_v1.Service, err error) {
obj, err := c.Fake.

View File

@ -39,7 +39,6 @@ type NamespaceInterface interface {
Update(*v1.Namespace) (*v1.Namespace, error)
UpdateStatus(*v1.Namespace) (*v1.Namespace, error)
Delete(name string, options *meta_v1.DeleteOptions) error
DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error
Get(name string, options meta_v1.GetOptions) (*v1.Namespace, error)
List(opts meta_v1.ListOptions) (*v1.NamespaceList, error)
Watch(opts meta_v1.ListOptions) (watch.Interface, error)
@ -139,16 +138,6 @@ func (c *namespaces) Delete(name string, options *meta_v1.DeleteOptions) error {
Error()
}
// DeleteCollection deletes a collection of objects.
func (c *namespaces) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
return c.client.Delete().
Resource("namespaces").
VersionedParams(&listOptions, scheme.ParameterCodec).
Body(options).
Do().
Error()
}
// Patch applies the patch and returns the patched namespace.
func (c *namespaces) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.Namespace, err error) {
result = &v1.Namespace{}

View File

@ -39,7 +39,6 @@ type ServiceInterface interface {
Update(*v1.Service) (*v1.Service, error)
UpdateStatus(*v1.Service) (*v1.Service, error)
Delete(name string, options *meta_v1.DeleteOptions) error
DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error
Get(name string, options meta_v1.GetOptions) (*v1.Service, error)
List(opts meta_v1.ListOptions) (*v1.ServiceList, error)
Watch(opts meta_v1.ListOptions) (watch.Interface, error)
@ -148,17 +147,6 @@ func (c *services) Delete(name string, options *meta_v1.DeleteOptions) error {
Error()
}
// DeleteCollection deletes a collection of objects.
func (c *services) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
return c.client.Delete().
Namespace(c.ns).
Resource("services").
VersionedParams(&listOptions, scheme.ParameterCodec).
Body(options).
Do().
Error()
}
// Patch applies the patch and returns the patched service.
func (c *services) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.Service, err error) {
result = &v1.Service{}