github/client-go
1
0
Fork 0
mirror of https://github.com/kubernetes/client-go.git synced 2025-06-24 22:23:02 +00:00
Code Issues Projects Releases Wiki Activity

published by bot

Browse Source 
(https://github.com/kubernetes/contrib/tree/master/mungegithub)

copied from https://github.com/kubernetes/kubernetes.git, branch master,
last commit is 122bf004bf5d03f96d9f205d4008b6ea8b47d209
This commit is contained in:
Kubernetes Publisher 2017-01-26 15:19:41 +00:00
parent fcdf37233b
commit f427d46f91
150 changed files with 3321 additions and 2392 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
Godeps/Godeps.json generated
View File

@ -324,151 +324,151 @@
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/errors", "ImportPath": "k8s.io/apimachinery/pkg/api/errors",
"Rev": "1f1411cd407a75607081ff37f3ca1baeeb63d05a" "Rev": "02fccf9462f0fb0287e82cb8a0f1d03b05f8d704"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/meta", "ImportPath": "k8s.io/apimachinery/pkg/api/meta",
"Rev": "1f1411cd407a75607081ff37f3ca1baeeb63d05a" "Rev": "02fccf9462f0fb0287e82cb8a0f1d03b05f8d704"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apimachinery", "ImportPath": "k8s.io/apimachinery/pkg/apimachinery",
"Rev": "1f1411cd407a75607081ff37f3ca1baeeb63d05a" "Rev": "02fccf9462f0fb0287e82cb8a0f1d03b05f8d704"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apimachinery/announced", "ImportPath": "k8s.io/apimachinery/pkg/apimachinery/announced",
"Rev": "1f1411cd407a75607081ff37f3ca1baeeb63d05a" "Rev": "02fccf9462f0fb0287e82cb8a0f1d03b05f8d704"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apimachinery/registered", "ImportPath": "k8s.io/apimachinery/pkg/apimachinery/registered",
"Rev": "1f1411cd407a75607081ff37f3ca1baeeb63d05a" "Rev": "02fccf9462f0fb0287e82cb8a0f1d03b05f8d704"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1", "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
"Rev": "1f1411cd407a75607081ff37f3ca1baeeb63d05a" "Rev": "02fccf9462f0fb0287e82cb8a0f1d03b05f8d704"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured", "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
"Rev": "1f1411cd407a75607081ff37f3ca1baeeb63d05a" "Rev": "02fccf9462f0fb0287e82cb8a0f1d03b05f8d704"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/conversion", "ImportPath": "k8s.io/apimachinery/pkg/conversion",
"Rev": "1f1411cd407a75607081ff37f3ca1baeeb63d05a" "Rev": "02fccf9462f0fb0287e82cb8a0f1d03b05f8d704"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams", "ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
"Rev": "1f1411cd407a75607081ff37f3ca1baeeb63d05a" "Rev": "02fccf9462f0fb0287e82cb8a0f1d03b05f8d704"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/fields", "ImportPath": "k8s.io/apimachinery/pkg/fields",
"Rev": "1f1411cd407a75607081ff37f3ca1baeeb63d05a" "Rev": "02fccf9462f0fb0287e82cb8a0f1d03b05f8d704"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/labels", "ImportPath": "k8s.io/apimachinery/pkg/labels",
"Rev": "1f1411cd407a75607081ff37f3ca1baeeb63d05a" "Rev": "02fccf9462f0fb0287e82cb8a0f1d03b05f8d704"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/openapi", "ImportPath": "k8s.io/apimachinery/pkg/openapi",
"Rev": "1f1411cd407a75607081ff37f3ca1baeeb63d05a" "Rev": "02fccf9462f0fb0287e82cb8a0f1d03b05f8d704"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime", "ImportPath": "k8s.io/apimachinery/pkg/runtime",
"Rev": "1f1411cd407a75607081ff37f3ca1baeeb63d05a" "Rev": "02fccf9462f0fb0287e82cb8a0f1d03b05f8d704"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema", "ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
"Rev": "1f1411cd407a75607081ff37f3ca1baeeb63d05a" "Rev": "02fccf9462f0fb0287e82cb8a0f1d03b05f8d704"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
"Rev": "1f1411cd407a75607081ff37f3ca1baeeb63d05a" "Rev": "02fccf9462f0fb0287e82cb8a0f1d03b05f8d704"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
"Rev": "1f1411cd407a75607081ff37f3ca1baeeb63d05a" "Rev": "02fccf9462f0fb0287e82cb8a0f1d03b05f8d704"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
"Rev": "1f1411cd407a75607081ff37f3ca1baeeb63d05a" "Rev": "02fccf9462f0fb0287e82cb8a0f1d03b05f8d704"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
"Rev": "1f1411cd407a75607081ff37f3ca1baeeb63d05a" "Rev": "02fccf9462f0fb0287e82cb8a0f1d03b05f8d704"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
"Rev": "1f1411cd407a75607081ff37f3ca1baeeb63d05a" "Rev": "02fccf9462f0fb0287e82cb8a0f1d03b05f8d704"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
"Rev": "1f1411cd407a75607081ff37f3ca1baeeb63d05a" "Rev": "02fccf9462f0fb0287e82cb8a0f1d03b05f8d704"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/selection", "ImportPath": "k8s.io/apimachinery/pkg/selection",
"Rev": "1f1411cd407a75607081ff37f3ca1baeeb63d05a" "Rev": "02fccf9462f0fb0287e82cb8a0f1d03b05f8d704"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/types", "ImportPath": "k8s.io/apimachinery/pkg/types",
"Rev": "1f1411cd407a75607081ff37f3ca1baeeb63d05a" "Rev": "02fccf9462f0fb0287e82cb8a0f1d03b05f8d704"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/diff", "ImportPath": "k8s.io/apimachinery/pkg/util/diff",
"Rev": "1f1411cd407a75607081ff37f3ca1baeeb63d05a" "Rev": "02fccf9462f0fb0287e82cb8a0f1d03b05f8d704"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/errors", "ImportPath": "k8s.io/apimachinery/pkg/util/errors",
"Rev": "1f1411cd407a75607081ff37f3ca1baeeb63d05a" "Rev": "02fccf9462f0fb0287e82cb8a0f1d03b05f8d704"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/framer", "ImportPath": "k8s.io/apimachinery/pkg/util/framer",
"Rev": "1f1411cd407a75607081ff37f3ca1baeeb63d05a" "Rev": "02fccf9462f0fb0287e82cb8a0f1d03b05f8d704"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/json", "ImportPath": "k8s.io/apimachinery/pkg/util/json",
"Rev": "1f1411cd407a75607081ff37f3ca1baeeb63d05a" "Rev": "02fccf9462f0fb0287e82cb8a0f1d03b05f8d704"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/net", "ImportPath": "k8s.io/apimachinery/pkg/util/net",
"Rev": "1f1411cd407a75607081ff37f3ca1baeeb63d05a" "Rev": "02fccf9462f0fb0287e82cb8a0f1d03b05f8d704"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/rand", "ImportPath": "k8s.io/apimachinery/pkg/util/rand",
"Rev": "1f1411cd407a75607081ff37f3ca1baeeb63d05a" "Rev": "02fccf9462f0fb0287e82cb8a0f1d03b05f8d704"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/runtime", "ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
"Rev": "1f1411cd407a75607081ff37f3ca1baeeb63d05a" "Rev": "02fccf9462f0fb0287e82cb8a0f1d03b05f8d704"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/sets", "ImportPath": "k8s.io/apimachinery/pkg/util/sets",
"Rev": "1f1411cd407a75607081ff37f3ca1baeeb63d05a" "Rev": "02fccf9462f0fb0287e82cb8a0f1d03b05f8d704"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/validation", "ImportPath": "k8s.io/apimachinery/pkg/util/validation",
"Rev": "1f1411cd407a75607081ff37f3ca1baeeb63d05a" "Rev": "02fccf9462f0fb0287e82cb8a0f1d03b05f8d704"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field", "ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
"Rev": "1f1411cd407a75607081ff37f3ca1baeeb63d05a" "Rev": "02fccf9462f0fb0287e82cb8a0f1d03b05f8d704"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/wait", "ImportPath": "k8s.io/apimachinery/pkg/util/wait",
"Rev": "1f1411cd407a75607081ff37f3ca1baeeb63d05a" "Rev": "02fccf9462f0fb0287e82cb8a0f1d03b05f8d704"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/yaml", "ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
"Rev": "1f1411cd407a75607081ff37f3ca1baeeb63d05a" "Rev": "02fccf9462f0fb0287e82cb8a0f1d03b05f8d704"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/version", "ImportPath": "k8s.io/apimachinery/pkg/version",
"Rev": "1f1411cd407a75607081ff37f3ca1baeeb63d05a" "Rev": "02fccf9462f0fb0287e82cb8a0f1d03b05f8d704"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/watch", "ImportPath": "k8s.io/apimachinery/pkg/watch",
"Rev": "1f1411cd407a75607081ff37f3ca1baeeb63d05a" "Rev": "02fccf9462f0fb0287e82cb8a0f1d03b05f8d704"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect", "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
"Rev": "1f1411cd407a75607081ff37f3ca1baeeb63d05a" "Rev": "02fccf9462f0fb0287e82cb8a0f1d03b05f8d704"
} }
] ]
} }

1
discovery/helper_blackbox_test.go
View File

@ -125,6 +125,7 @@ func TestNegotiateVersion(t *testing.T) {
for _, test := range tests { for _, test := range tests {
fakeClient := &fake.RESTClient{ fakeClient := &fake.RESTClient{
APIRegistry: api.Registry,
NegotiatedSerializer: testapi.Default.NegotiatedSerializer(), NegotiatedSerializer: testapi.Default.NegotiatedSerializer(),
Resp: &http.Response{ Resp: &http.Response{
StatusCode: test.statusCode, StatusCode: test.statusCode,

4
dynamic/client.go
View File

@ -138,7 +138,7 @@ func (rc *ResourceClient) Get(name string) (*unstructured.Unstructured, error) {
} }
// Delete deletes the resource with the specified name. // Delete deletes the resource with the specified name.
func (rc *ResourceClient) Delete(name string, opts *v1.DeleteOptions) error { func (rc *ResourceClient) Delete(name string, opts *metav1.DeleteOptions) error {
return rc.cl.Delete(). return rc.cl.Delete().
NamespaceIfScoped(rc.ns, rc.resource.Namespaced). NamespaceIfScoped(rc.ns, rc.resource.Namespaced).
Resource(rc.resource.Name). Resource(rc.resource.Name).
@ -149,7 +149,7 @@ func (rc *ResourceClient) Delete(name string, opts *v1.DeleteOptions) error {
} }
// DeleteCollection deletes a collection of objects. // DeleteCollection deletes a collection of objects.
func (rc *ResourceClient) DeleteCollection(deleteOptions *v1.DeleteOptions, listOptions runtime.Object) error { func (rc *ResourceClient) DeleteCollection(deleteOptions *metav1.DeleteOptions, listOptions runtime.Object) error {
parameterEncoder := rc.parameterCodec parameterEncoder := rc.parameterCodec
if parameterEncoder == nil { if parameterEncoder == nil {
parameterEncoder = defaultParameterEncoder parameterEncoder = defaultParameterEncoder

11
kubernetes/typed/apps/v1beta1/fake/fake_statefulset.go
View File

@ -17,12 +17,11 @@ limitations under the License.
package fake package fake
import ( import (
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
labels "k8s.io/apimachinery/pkg/labels" labels "k8s.io/apimachinery/pkg/labels"
schema "k8s.io/apimachinery/pkg/runtime/schema" schema "k8s.io/apimachinery/pkg/runtime/schema"
types "k8s.io/apimachinery/pkg/types" types "k8s.io/apimachinery/pkg/types"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
v1 "k8s.io/client-go/pkg/api/v1"
v1beta1 "k8s.io/client-go/pkg/apis/apps/v1beta1" v1beta1 "k8s.io/client-go/pkg/apis/apps/v1beta1"
testing "k8s.io/client-go/testing" testing "k8s.io/client-go/testing"
) )
@ -72,14 +71,14 @@ func (c *FakeStatefulSets) Delete(name string, options *v1.DeleteOptions) error
return err return err
} }
func (c *FakeStatefulSets) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *FakeStatefulSets) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
action := testing.NewDeleteCollectionAction(statefulsetsResource, c.ns, listOptions) action := testing.NewDeleteCollectionAction(statefulsetsResource, c.ns, listOptions)
_, err := c.Fake.Invokes(action, &v1beta1.StatefulSetList{}) _, err := c.Fake.Invokes(action, &v1beta1.StatefulSetList{})
return err return err
} }
func (c *FakeStatefulSets) Get(name string, options meta_v1.GetOptions) (result *v1beta1.StatefulSet, err error) { func (c *FakeStatefulSets) Get(name string, options v1.GetOptions) (result *v1beta1.StatefulSet, err error) {
obj, err := c.Fake. obj, err := c.Fake.
Invokes(testing.NewGetAction(statefulsetsResource, c.ns, name), &v1beta1.StatefulSet{}) Invokes(testing.NewGetAction(statefulsetsResource, c.ns, name), &v1beta1.StatefulSet{})
@ -89,7 +88,7 @@ func (c *FakeStatefulSets) Get(name string, options meta_v1.GetOptions) (result
return obj.(*v1beta1.StatefulSet), err return obj.(*v1beta1.StatefulSet), err
} }
func (c *FakeStatefulSets) List(opts meta_v1.ListOptions) (result *v1beta1.StatefulSetList, err error) { func (c *FakeStatefulSets) List(opts v1.ListOptions) (result *v1beta1.StatefulSetList, err error) {
obj, err := c.Fake. obj, err := c.Fake.
Invokes(testing.NewListAction(statefulsetsResource, c.ns, opts), &v1beta1.StatefulSetList{}) Invokes(testing.NewListAction(statefulsetsResource, c.ns, opts), &v1beta1.StatefulSetList{})
@ -111,7 +110,7 @@ func (c *FakeStatefulSets) List(opts meta_v1.ListOptions) (result *v1beta1.State
} }
// Watch returns a watch.Interface that watches the requested statefulSets. // Watch returns a watch.Interface that watches the requested statefulSets.
func (c *FakeStatefulSets) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { func (c *FakeStatefulSets) Watch(opts v1.ListOptions) (watch.Interface, error) {
return c.Fake. return c.Fake.
InvokesWatch(testing.NewWatchAction(statefulsetsResource, c.ns, opts)) InvokesWatch(testing.NewWatchAction(statefulsetsResource, c.ns, opts))

19
kubernetes/typed/apps/v1beta1/statefulset.go
View File

@ -17,11 +17,10 @@ limitations under the License.
package v1beta1 package v1beta1
import ( import (
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
types "k8s.io/apimachinery/pkg/types" types "k8s.io/apimachinery/pkg/types"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
api "k8s.io/client-go/pkg/api" api "k8s.io/client-go/pkg/api"
v1 "k8s.io/client-go/pkg/api/v1"
v1beta1 "k8s.io/client-go/pkg/apis/apps/v1beta1" v1beta1 "k8s.io/client-go/pkg/apis/apps/v1beta1"
rest "k8s.io/client-go/rest" rest "k8s.io/client-go/rest"
) )
@ -38,10 +37,10 @@ type StatefulSetInterface interface {
Update(*v1beta1.StatefulSet) (*v1beta1.StatefulSet, error) Update(*v1beta1.StatefulSet) (*v1beta1.StatefulSet, error)
UpdateStatus(*v1beta1.StatefulSet) (*v1beta1.StatefulSet, error) UpdateStatus(*v1beta1.StatefulSet) (*v1beta1.StatefulSet, error)
Delete(name string, options *v1.DeleteOptions) error Delete(name string, options *v1.DeleteOptions) error
DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
Get(name string, options meta_v1.GetOptions) (*v1beta1.StatefulSet, error) Get(name string, options v1.GetOptions) (*v1beta1.StatefulSet, error)
List(opts meta_v1.ListOptions) (*v1beta1.StatefulSetList, error) List(opts v1.ListOptions) (*v1beta1.StatefulSetList, error)
Watch(opts meta_v1.ListOptions) (watch.Interface, error) Watch(opts v1.ListOptions) (watch.Interface, error)
Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.StatefulSet, err error) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.StatefulSet, err error)
StatefulSetExpansion StatefulSetExpansion
} }
@ -113,7 +112,7 @@ func (c *statefulSets) Delete(name string, options *v1.DeleteOptions) error {
} }
// DeleteCollection deletes a collection of objects. // DeleteCollection deletes a collection of objects.
func (c *statefulSets) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *statefulSets) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
return c.client.Delete(). return c.client.Delete().
Namespace(c.ns). Namespace(c.ns).
Resource("statefulsets"). Resource("statefulsets").
@ -124,7 +123,7 @@ func (c *statefulSets) DeleteCollection(options *v1.DeleteOptions, listOptions m
} }
// Get takes name of the statefulSet, and returns the corresponding statefulSet object, and an error if there is any. // Get takes name of the statefulSet, and returns the corresponding statefulSet object, and an error if there is any.
func (c *statefulSets) Get(name string, options meta_v1.GetOptions) (result *v1beta1.StatefulSet, err error) { func (c *statefulSets) Get(name string, options v1.GetOptions) (result *v1beta1.StatefulSet, err error) {
result = &v1beta1.StatefulSet{} result = &v1beta1.StatefulSet{}
err = c.client.Get(). err = c.client.Get().
Namespace(c.ns). Namespace(c.ns).
@ -137,7 +136,7 @@ func (c *statefulSets) Get(name string, options meta_v1.GetOptions) (result *v1b
} }
// List takes label and field selectors, and returns the list of StatefulSets that match those selectors. // List takes label and field selectors, and returns the list of StatefulSets that match those selectors.
func (c *statefulSets) List(opts meta_v1.ListOptions) (result *v1beta1.StatefulSetList, err error) { func (c *statefulSets) List(opts v1.ListOptions) (result *v1beta1.StatefulSetList, err error) {
result = &v1beta1.StatefulSetList{} result = &v1beta1.StatefulSetList{}
err = c.client.Get(). err = c.client.Get().
Namespace(c.ns). Namespace(c.ns).
@ -149,7 +148,7 @@ func (c *statefulSets) List(opts meta_v1.ListOptions) (result *v1beta1.StatefulS
} }
// Watch returns a watch.Interface that watches the requested statefulSets. // Watch returns a watch.Interface that watches the requested statefulSets.
func (c *statefulSets) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { func (c *statefulSets) Watch(opts v1.ListOptions) (watch.Interface, error) {
return c.client.Get(). return c.client.Get().
Prefix("watch"). Prefix("watch").
Namespace(c.ns). Namespace(c.ns).

5
kubernetes/typed/autoscaling/v1/fake/fake_horizontalpodautoscaler.go
View File

@ -22,7 +22,6 @@ import (
schema "k8s.io/apimachinery/pkg/runtime/schema" schema "k8s.io/apimachinery/pkg/runtime/schema"
types "k8s.io/apimachinery/pkg/types" types "k8s.io/apimachinery/pkg/types"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
api_v1 "k8s.io/client-go/pkg/api/v1"
v1 "k8s.io/client-go/pkg/apis/autoscaling/v1" v1 "k8s.io/client-go/pkg/apis/autoscaling/v1"
testing "k8s.io/client-go/testing" testing "k8s.io/client-go/testing"
) )
@ -65,14 +64,14 @@ func (c *FakeHorizontalPodAutoscalers) UpdateStatus(horizontalPodAutoscaler *v1.
return obj.(*v1.HorizontalPodAutoscaler), err return obj.(*v1.HorizontalPodAutoscaler), err
} }
func (c *FakeHorizontalPodAutoscalers) Delete(name string, options *api_v1.DeleteOptions) error { func (c *FakeHorizontalPodAutoscalers) Delete(name string, options *meta_v1.DeleteOptions) error {
_, err := c.Fake. _, err := c.Fake.
Invokes(testing.NewDeleteAction(horizontalpodautoscalersResource, c.ns, name), &v1.HorizontalPodAutoscaler{}) Invokes(testing.NewDeleteAction(horizontalpodautoscalersResource, c.ns, name), &v1.HorizontalPodAutoscaler{})
return err return err
} }
func (c *FakeHorizontalPodAutoscalers) DeleteCollection(options *api_v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *FakeHorizontalPodAutoscalers) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
action := testing.NewDeleteCollectionAction(horizontalpodautoscalersResource, c.ns, listOptions) action := testing.NewDeleteCollectionAction(horizontalpodautoscalersResource, c.ns, listOptions)
_, err := c.Fake.Invokes(action, &v1.HorizontalPodAutoscalerList{}) _, err := c.Fake.Invokes(action, &v1.HorizontalPodAutoscalerList{})

9
kubernetes/typed/autoscaling/v1/horizontalpodautoscaler.go
View File

@ -21,7 +21,6 @@ import (
types "k8s.io/apimachinery/pkg/types" types "k8s.io/apimachinery/pkg/types"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
api "k8s.io/client-go/pkg/api" api "k8s.io/client-go/pkg/api"
api_v1 "k8s.io/client-go/pkg/api/v1"
v1 "k8s.io/client-go/pkg/apis/autoscaling/v1" v1 "k8s.io/client-go/pkg/apis/autoscaling/v1"
rest "k8s.io/client-go/rest" rest "k8s.io/client-go/rest"
) )
@ -37,8 +36,8 @@ type HorizontalPodAutoscalerInterface interface {
Create(*v1.HorizontalPodAutoscaler) (*v1.HorizontalPodAutoscaler, error) Create(*v1.HorizontalPodAutoscaler) (*v1.HorizontalPodAutoscaler, error)
Update(*v1.HorizontalPodAutoscaler) (*v1.HorizontalPodAutoscaler, error) Update(*v1.HorizontalPodAutoscaler) (*v1.HorizontalPodAutoscaler, error)
UpdateStatus(*v1.HorizontalPodAutoscaler) (*v1.HorizontalPodAutoscaler, error) UpdateStatus(*v1.HorizontalPodAutoscaler) (*v1.HorizontalPodAutoscaler, error)
Delete(name string, options *api_v1.DeleteOptions) error Delete(name string, options *meta_v1.DeleteOptions) error
DeleteCollection(options *api_v1.DeleteOptions, listOptions meta_v1.ListOptions) error DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error
Get(name string, options meta_v1.GetOptions) (*v1.HorizontalPodAutoscaler, error) Get(name string, options meta_v1.GetOptions) (*v1.HorizontalPodAutoscaler, error)
List(opts meta_v1.ListOptions) (*v1.HorizontalPodAutoscalerList, error) List(opts meta_v1.ListOptions) (*v1.HorizontalPodAutoscalerList, error)
Watch(opts meta_v1.ListOptions) (watch.Interface, error) Watch(opts meta_v1.ListOptions) (watch.Interface, error)
@ -102,7 +101,7 @@ func (c *horizontalPodAutoscalers) UpdateStatus(horizontalPodAutoscaler *v1.Hori
} }
// Delete takes name of the horizontalPodAutoscaler and deletes it. Returns an error if one occurs. // Delete takes name of the horizontalPodAutoscaler and deletes it. Returns an error if one occurs.
func (c *horizontalPodAutoscalers) Delete(name string, options *api_v1.DeleteOptions) error { func (c *horizontalPodAutoscalers) Delete(name string, options *meta_v1.DeleteOptions) error {
return c.client.Delete(). return c.client.Delete().
Namespace(c.ns). Namespace(c.ns).
Resource("horizontalpodautoscalers"). Resource("horizontalpodautoscalers").
@ -113,7 +112,7 @@ func (c *horizontalPodAutoscalers) Delete(name string, options *api_v1.DeleteOpt
} }
// DeleteCollection deletes a collection of objects. // DeleteCollection deletes a collection of objects.
func (c *horizontalPodAutoscalers) DeleteCollection(options *api_v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *horizontalPodAutoscalers) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
return c.client.Delete(). return c.client.Delete().
Namespace(c.ns). Namespace(c.ns).
Resource("horizontalpodautoscalers"). Resource("horizontalpodautoscalers").

5
kubernetes/typed/batch/v1/fake/fake_job.go
View File

@ -22,7 +22,6 @@ import (
schema "k8s.io/apimachinery/pkg/runtime/schema" schema "k8s.io/apimachinery/pkg/runtime/schema"
types "k8s.io/apimachinery/pkg/types" types "k8s.io/apimachinery/pkg/types"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
api_v1 "k8s.io/client-go/pkg/api/v1"
v1 "k8s.io/client-go/pkg/apis/batch/v1" v1 "k8s.io/client-go/pkg/apis/batch/v1"
testing "k8s.io/client-go/testing" testing "k8s.io/client-go/testing"
) )
@ -65,14 +64,14 @@ func (c *FakeJobs) UpdateStatus(job *v1.Job) (*v1.Job, error) {
return obj.(*v1.Job), err return obj.(*v1.Job), err
} }
func (c *FakeJobs) Delete(name string, options *api_v1.DeleteOptions) error { func (c *FakeJobs) Delete(name string, options *meta_v1.DeleteOptions) error {
_, err := c.Fake. _, err := c.Fake.
Invokes(testing.NewDeleteAction(jobsResource, c.ns, name), &v1.Job{}) Invokes(testing.NewDeleteAction(jobsResource, c.ns, name), &v1.Job{})
return err return err
} }
func (c *FakeJobs) DeleteCollection(options *api_v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *FakeJobs) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
action := testing.NewDeleteCollectionAction(jobsResource, c.ns, listOptions) action := testing.NewDeleteCollectionAction(jobsResource, c.ns, listOptions)
_, err := c.Fake.Invokes(action, &v1.JobList{}) _, err := c.Fake.Invokes(action, &v1.JobList{})

9
kubernetes/typed/batch/v1/job.go
View File

@ -21,7 +21,6 @@ import (
types "k8s.io/apimachinery/pkg/types" types "k8s.io/apimachinery/pkg/types"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
api "k8s.io/client-go/pkg/api" api "k8s.io/client-go/pkg/api"
api_v1 "k8s.io/client-go/pkg/api/v1"
v1 "k8s.io/client-go/pkg/apis/batch/v1" v1 "k8s.io/client-go/pkg/apis/batch/v1"
rest "k8s.io/client-go/rest" rest "k8s.io/client-go/rest"
) )
@ -37,8 +36,8 @@ type JobInterface interface {
Create(*v1.Job) (*v1.Job, error) Create(*v1.Job) (*v1.Job, error)
Update(*v1.Job) (*v1.Job, error) Update(*v1.Job) (*v1.Job, error)
UpdateStatus(*v1.Job) (*v1.Job, error) UpdateStatus(*v1.Job) (*v1.Job, error)
Delete(name string, options *api_v1.DeleteOptions) error Delete(name string, options *meta_v1.DeleteOptions) error
DeleteCollection(options *api_v1.DeleteOptions, listOptions meta_v1.ListOptions) error DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error
Get(name string, options meta_v1.GetOptions) (*v1.Job, error) Get(name string, options meta_v1.GetOptions) (*v1.Job, error)
List(opts meta_v1.ListOptions) (*v1.JobList, error) List(opts meta_v1.ListOptions) (*v1.JobList, error)
Watch(opts meta_v1.ListOptions) (watch.Interface, error) Watch(opts meta_v1.ListOptions) (watch.Interface, error)
@ -102,7 +101,7 @@ func (c *jobs) UpdateStatus(job *v1.Job) (result *v1.Job, err error) {
} }
// Delete takes name of the job and deletes it. Returns an error if one occurs. // Delete takes name of the job and deletes it. Returns an error if one occurs.
func (c *jobs) Delete(name string, options *api_v1.DeleteOptions) error { func (c *jobs) Delete(name string, options *meta_v1.DeleteOptions) error {
return c.client.Delete(). return c.client.Delete().
Namespace(c.ns). Namespace(c.ns).
Resource("jobs"). Resource("jobs").
@ -113,7 +112,7 @@ func (c *jobs) Delete(name string, options *api_v1.DeleteOptions) error {
} }
// DeleteCollection deletes a collection of objects. // DeleteCollection deletes a collection of objects.
func (c *jobs) DeleteCollection(options *api_v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *jobs) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
return c.client.Delete(). return c.client.Delete().
Namespace(c.ns). Namespace(c.ns).
Resource("jobs"). Resource("jobs").

19
kubernetes/typed/batch/v2alpha1/cronjob.go
View File

@ -17,11 +17,10 @@ limitations under the License.
package v2alpha1 package v2alpha1
import ( import (
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
types "k8s.io/apimachinery/pkg/types" types "k8s.io/apimachinery/pkg/types"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
api "k8s.io/client-go/pkg/api" api "k8s.io/client-go/pkg/api"
v1 "k8s.io/client-go/pkg/api/v1"
v2alpha1 "k8s.io/client-go/pkg/apis/batch/v2alpha1" v2alpha1 "k8s.io/client-go/pkg/apis/batch/v2alpha1"
rest "k8s.io/client-go/rest" rest "k8s.io/client-go/rest"
) )
@ -38,10 +37,10 @@ type CronJobInterface interface {
Update(*v2alpha1.CronJob) (*v2alpha1.CronJob, error) Update(*v2alpha1.CronJob) (*v2alpha1.CronJob, error)
UpdateStatus(*v2alpha1.CronJob) (*v2alpha1.CronJob, error) UpdateStatus(*v2alpha1.CronJob) (*v2alpha1.CronJob, error)
Delete(name string, options *v1.DeleteOptions) error Delete(name string, options *v1.DeleteOptions) error
DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
Get(name string, options meta_v1.GetOptions) (*v2alpha1.CronJob, error) Get(name string, options v1.GetOptions) (*v2alpha1.CronJob, error)
List(opts meta_v1.ListOptions) (*v2alpha1.CronJobList, error) List(opts v1.ListOptions) (*v2alpha1.CronJobList, error)
Watch(opts meta_v1.ListOptions) (watch.Interface, error) Watch(opts v1.ListOptions) (watch.Interface, error)
Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v2alpha1.CronJob, err error) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v2alpha1.CronJob, err error)
CronJobExpansion CronJobExpansion
} }
@ -113,7 +112,7 @@ func (c *cronJobs) Delete(name string, options *v1.DeleteOptions) error {
} }
// DeleteCollection deletes a collection of objects. // DeleteCollection deletes a collection of objects.
func (c *cronJobs) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *cronJobs) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
return c.client.Delete(). return c.client.Delete().
Namespace(c.ns). Namespace(c.ns).
Resource("cronjobs"). Resource("cronjobs").
@ -124,7 +123,7 @@ func (c *cronJobs) DeleteCollection(options *v1.DeleteOptions, listOptions meta_
} }
// Get takes name of the cronJob, and returns the corresponding cronJob object, and an error if there is any. // Get takes name of the cronJob, and returns the corresponding cronJob object, and an error if there is any.
func (c *cronJobs) Get(name string, options meta_v1.GetOptions) (result *v2alpha1.CronJob, err error) { func (c *cronJobs) Get(name string, options v1.GetOptions) (result *v2alpha1.CronJob, err error) {
result = &v2alpha1.CronJob{} result = &v2alpha1.CronJob{}
err = c.client.Get(). err = c.client.Get().
Namespace(c.ns). Namespace(c.ns).
@ -137,7 +136,7 @@ func (c *cronJobs) Get(name string, options meta_v1.GetOptions) (result *v2alpha
} }
// List takes label and field selectors, and returns the list of CronJobs that match those selectors. // List takes label and field selectors, and returns the list of CronJobs that match those selectors.
func (c *cronJobs) List(opts meta_v1.ListOptions) (result *v2alpha1.CronJobList, err error) { func (c *cronJobs) List(opts v1.ListOptions) (result *v2alpha1.CronJobList, err error) {
result = &v2alpha1.CronJobList{} result = &v2alpha1.CronJobList{}
err = c.client.Get(). err = c.client.Get().
Namespace(c.ns). Namespace(c.ns).
@ -149,7 +148,7 @@ func (c *cronJobs) List(opts meta_v1.ListOptions) (result *v2alpha1.CronJobList,
} }
// Watch returns a watch.Interface that watches the requested cronJobs. // Watch returns a watch.Interface that watches the requested cronJobs.
func (c *cronJobs) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { func (c *cronJobs) Watch(opts v1.ListOptions) (watch.Interface, error) {
return c.client.Get(). return c.client.Get().
Prefix("watch"). Prefix("watch").
Namespace(c.ns). Namespace(c.ns).

11
kubernetes/typed/batch/v2alpha1/fake/fake_cronjob.go
View File

@ -17,12 +17,11 @@ limitations under the License.
package fake package fake
import ( import (
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
labels "k8s.io/apimachinery/pkg/labels" labels "k8s.io/apimachinery/pkg/labels"
schema "k8s.io/apimachinery/pkg/runtime/schema" schema "k8s.io/apimachinery/pkg/runtime/schema"
types "k8s.io/apimachinery/pkg/types" types "k8s.io/apimachinery/pkg/types"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
v1 "k8s.io/client-go/pkg/api/v1"
v2alpha1 "k8s.io/client-go/pkg/apis/batch/v2alpha1" v2alpha1 "k8s.io/client-go/pkg/apis/batch/v2alpha1"
testing "k8s.io/client-go/testing" testing "k8s.io/client-go/testing"
) )
@ -72,14 +71,14 @@ func (c *FakeCronJobs) Delete(name string, options *v1.DeleteOptions) error {
return err return err
} }
func (c *FakeCronJobs) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *FakeCronJobs) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
action := testing.NewDeleteCollectionAction(cronjobsResource, c.ns, listOptions) action := testing.NewDeleteCollectionAction(cronjobsResource, c.ns, listOptions)
_, err := c.Fake.Invokes(action, &v2alpha1.CronJobList{}) _, err := c.Fake.Invokes(action, &v2alpha1.CronJobList{})
return err return err
} }
func (c *FakeCronJobs) Get(name string, options meta_v1.GetOptions) (result *v2alpha1.CronJob, err error) { func (c *FakeCronJobs) Get(name string, options v1.GetOptions) (result *v2alpha1.CronJob, err error) {
obj, err := c.Fake. obj, err := c.Fake.
Invokes(testing.NewGetAction(cronjobsResource, c.ns, name), &v2alpha1.CronJob{}) Invokes(testing.NewGetAction(cronjobsResource, c.ns, name), &v2alpha1.CronJob{})
@ -89,7 +88,7 @@ func (c *FakeCronJobs) Get(name string, options meta_v1.GetOptions) (result *v2a
return obj.(*v2alpha1.CronJob), err return obj.(*v2alpha1.CronJob), err
} }
func (c *FakeCronJobs) List(opts meta_v1.ListOptions) (result *v2alpha1.CronJobList, err error) { func (c *FakeCronJobs) List(opts v1.ListOptions) (result *v2alpha1.CronJobList, err error) {
obj, err := c.Fake. obj, err := c.Fake.
Invokes(testing.NewListAction(cronjobsResource, c.ns, opts), &v2alpha1.CronJobList{}) Invokes(testing.NewListAction(cronjobsResource, c.ns, opts), &v2alpha1.CronJobList{})
@ -111,7 +110,7 @@ func (c *FakeCronJobs) List(opts meta_v1.ListOptions) (result *v2alpha1.CronJobL
} }
// Watch returns a watch.Interface that watches the requested cronJobs. // Watch returns a watch.Interface that watches the requested cronJobs.
func (c *FakeCronJobs) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { func (c *FakeCronJobs) Watch(opts v1.ListOptions) (watch.Interface, error) {
return c.Fake. return c.Fake.
InvokesWatch(testing.NewWatchAction(cronjobsResource, c.ns, opts)) InvokesWatch(testing.NewWatchAction(cronjobsResource, c.ns, opts))

11
kubernetes/typed/batch/v2alpha1/fake/fake_job.go
View File

@ -17,12 +17,11 @@ limitations under the License.
package fake package fake
import ( import (
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
labels "k8s.io/apimachinery/pkg/labels" labels "k8s.io/apimachinery/pkg/labels"
schema "k8s.io/apimachinery/pkg/runtime/schema" schema "k8s.io/apimachinery/pkg/runtime/schema"
types "k8s.io/apimachinery/pkg/types" types "k8s.io/apimachinery/pkg/types"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
v1 "k8s.io/client-go/pkg/api/v1"
v2alpha1 "k8s.io/client-go/pkg/apis/batch/v2alpha1" v2alpha1 "k8s.io/client-go/pkg/apis/batch/v2alpha1"
testing "k8s.io/client-go/testing" testing "k8s.io/client-go/testing"
) )
@ -72,14 +71,14 @@ func (c *FakeJobs) Delete(name string, options *v1.DeleteOptions) error {
return err return err
} }
func (c *FakeJobs) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *FakeJobs) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
action := testing.NewDeleteCollectionAction(jobsResource, c.ns, listOptions) action := testing.NewDeleteCollectionAction(jobsResource, c.ns, listOptions)
_, err := c.Fake.Invokes(action, &v2alpha1.JobList{}) _, err := c.Fake.Invokes(action, &v2alpha1.JobList{})
return err return err
} }
func (c *FakeJobs) Get(name string, options meta_v1.GetOptions) (result *v2alpha1.Job, err error) { func (c *FakeJobs) Get(name string, options v1.GetOptions) (result *v2alpha1.Job, err error) {
obj, err := c.Fake. obj, err := c.Fake.
Invokes(testing.NewGetAction(jobsResource, c.ns, name), &v2alpha1.Job{}) Invokes(testing.NewGetAction(jobsResource, c.ns, name), &v2alpha1.Job{})
@ -89,7 +88,7 @@ func (c *FakeJobs) Get(name string, options meta_v1.GetOptions) (result *v2alpha
return obj.(*v2alpha1.Job), err return obj.(*v2alpha1.Job), err
} }
func (c *FakeJobs) List(opts meta_v1.ListOptions) (result *v2alpha1.JobList, err error) { func (c *FakeJobs) List(opts v1.ListOptions) (result *v2alpha1.JobList, err error) {
obj, err := c.Fake. obj, err := c.Fake.
Invokes(testing.NewListAction(jobsResource, c.ns, opts), &v2alpha1.JobList{}) Invokes(testing.NewListAction(jobsResource, c.ns, opts), &v2alpha1.JobList{})
@ -111,7 +110,7 @@ func (c *FakeJobs) List(opts meta_v1.ListOptions) (result *v2alpha1.JobList, err
} }
// Watch returns a watch.Interface that watches the requested jobs. // Watch returns a watch.Interface that watches the requested jobs.
func (c *FakeJobs) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { func (c *FakeJobs) Watch(opts v1.ListOptions) (watch.Interface, error) {
return c.Fake. return c.Fake.
InvokesWatch(testing.NewWatchAction(jobsResource, c.ns, opts)) InvokesWatch(testing.NewWatchAction(jobsResource, c.ns, opts))

19
kubernetes/typed/batch/v2alpha1/job.go
View File

@ -17,11 +17,10 @@ limitations under the License.
package v2alpha1 package v2alpha1
import ( import (
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
types "k8s.io/apimachinery/pkg/types" types "k8s.io/apimachinery/pkg/types"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
api "k8s.io/client-go/pkg/api" api "k8s.io/client-go/pkg/api"
v1 "k8s.io/client-go/pkg/api/v1"
v2alpha1 "k8s.io/client-go/pkg/apis/batch/v2alpha1" v2alpha1 "k8s.io/client-go/pkg/apis/batch/v2alpha1"
rest "k8s.io/client-go/rest" rest "k8s.io/client-go/rest"
) )
@ -38,10 +37,10 @@ type JobInterface interface {
Update(*v2alpha1.Job) (*v2alpha1.Job, error) Update(*v2alpha1.Job) (*v2alpha1.Job, error)
UpdateStatus(*v2alpha1.Job) (*v2alpha1.Job, error) UpdateStatus(*v2alpha1.Job) (*v2alpha1.Job, error)
Delete(name string, options *v1.DeleteOptions) error Delete(name string, options *v1.DeleteOptions) error
DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
Get(name string, options meta_v1.GetOptions) (*v2alpha1.Job, error) Get(name string, options v1.GetOptions) (*v2alpha1.Job, error)
List(opts meta_v1.ListOptions) (*v2alpha1.JobList, error) List(opts v1.ListOptions) (*v2alpha1.JobList, error)
Watch(opts meta_v1.ListOptions) (watch.Interface, error) Watch(opts v1.ListOptions) (watch.Interface, error)
Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v2alpha1.Job, err error) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v2alpha1.Job, err error)
JobExpansion JobExpansion
} }
@ -113,7 +112,7 @@ func (c *jobs) Delete(name string, options *v1.DeleteOptions) error {
} }
// DeleteCollection deletes a collection of objects. // DeleteCollection deletes a collection of objects.
func (c *jobs) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *jobs) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
return c.client.Delete(). return c.client.Delete().
Namespace(c.ns). Namespace(c.ns).
Resource("jobs"). Resource("jobs").
@ -124,7 +123,7 @@ func (c *jobs) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.L
} }
// Get takes name of the job, and returns the corresponding job object, and an error if there is any. // Get takes name of the job, and returns the corresponding job object, and an error if there is any.
func (c *jobs) Get(name string, options meta_v1.GetOptions) (result *v2alpha1.Job, err error) { func (c *jobs) Get(name string, options v1.GetOptions) (result *v2alpha1.Job, err error) {
result = &v2alpha1.Job{} result = &v2alpha1.Job{}
err = c.client.Get(). err = c.client.Get().
Namespace(c.ns). Namespace(c.ns).
@ -137,7 +136,7 @@ func (c *jobs) Get(name string, options meta_v1.GetOptions) (result *v2alpha1.Jo
} }
// List takes label and field selectors, and returns the list of Jobs that match those selectors. // List takes label and field selectors, and returns the list of Jobs that match those selectors.
func (c *jobs) List(opts meta_v1.ListOptions) (result *v2alpha1.JobList, err error) { func (c *jobs) List(opts v1.ListOptions) (result *v2alpha1.JobList, err error) {
result = &v2alpha1.JobList{} result = &v2alpha1.JobList{}
err = c.client.Get(). err = c.client.Get().
Namespace(c.ns). Namespace(c.ns).
@ -149,7 +148,7 @@ func (c *jobs) List(opts meta_v1.ListOptions) (result *v2alpha1.JobList, err err
} }
// Watch returns a watch.Interface that watches the requested jobs. // Watch returns a watch.Interface that watches the requested jobs.
func (c *jobs) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { func (c *jobs) Watch(opts v1.ListOptions) (watch.Interface, error) {
return c.client.Get(). return c.client.Get().
Prefix("watch"). Prefix("watch").
Namespace(c.ns). Namespace(c.ns).

19
kubernetes/typed/certificates/v1beta1/certificatesigningrequest.go
View File

@ -17,11 +17,10 @@ limitations under the License.
package v1beta1 package v1beta1
import ( import (
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
types "k8s.io/apimachinery/pkg/types" types "k8s.io/apimachinery/pkg/types"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
api "k8s.io/client-go/pkg/api" api "k8s.io/client-go/pkg/api"
v1 "k8s.io/client-go/pkg/api/v1"
v1beta1 "k8s.io/client-go/pkg/apis/certificates/v1beta1" v1beta1 "k8s.io/client-go/pkg/apis/certificates/v1beta1"
rest "k8s.io/client-go/rest" rest "k8s.io/client-go/rest"
) )
@ -38,10 +37,10 @@ type CertificateSigningRequestInterface interface {
Update(*v1beta1.CertificateSigningRequest) (*v1beta1.CertificateSigningRequest, error) Update(*v1beta1.CertificateSigningRequest) (*v1beta1.CertificateSigningRequest, error)
UpdateStatus(*v1beta1.CertificateSigningRequest) (*v1beta1.CertificateSigningRequest, error) UpdateStatus(*v1beta1.CertificateSigningRequest) (*v1beta1.CertificateSigningRequest, error)
Delete(name string, options *v1.DeleteOptions) error Delete(name string, options *v1.DeleteOptions) error
DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
Get(name string, options meta_v1.GetOptions) (*v1beta1.CertificateSigningRequest, error) Get(name string, options v1.GetOptions) (*v1beta1.CertificateSigningRequest, error)
List(opts meta_v1.ListOptions) (*v1beta1.CertificateSigningRequestList, error) List(opts v1.ListOptions) (*v1beta1.CertificateSigningRequestList, error)
Watch(opts meta_v1.ListOptions) (watch.Interface, error) Watch(opts v1.ListOptions) (watch.Interface, error)
Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.CertificateSigningRequest, err error) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.CertificateSigningRequest, err error)
CertificateSigningRequestExpansion CertificateSigningRequestExpansion
} }
@ -107,7 +106,7 @@ func (c *certificateSigningRequests) Delete(name string, options *v1.DeleteOptio
} }
// DeleteCollection deletes a collection of objects. // DeleteCollection deletes a collection of objects.
func (c *certificateSigningRequests) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *certificateSigningRequests) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
return c.client.Delete(). return c.client.Delete().
Resource("certificatesigningrequests"). Resource("certificatesigningrequests").
VersionedParams(&listOptions, api.ParameterCodec). VersionedParams(&listOptions, api.ParameterCodec).
@ -117,7 +116,7 @@ func (c *certificateSigningRequests) DeleteCollection(options *v1.DeleteOptions,
} }
// Get takes name of the certificateSigningRequest, and returns the corresponding certificateSigningRequest object, and an error if there is any. // Get takes name of the certificateSigningRequest, and returns the corresponding certificateSigningRequest object, and an error if there is any.
func (c *certificateSigningRequests) Get(name string, options meta_v1.GetOptions) (result *v1beta1.CertificateSigningRequest, err error) { func (c *certificateSigningRequests) Get(name string, options v1.GetOptions) (result *v1beta1.CertificateSigningRequest, err error) {
result = &v1beta1.CertificateSigningRequest{} result = &v1beta1.CertificateSigningRequest{}
err = c.client.Get(). err = c.client.Get().
Resource("certificatesigningrequests"). Resource("certificatesigningrequests").
@ -129,7 +128,7 @@ func (c *certificateSigningRequests) Get(name string, options meta_v1.GetOptions
} }
// List takes label and field selectors, and returns the list of CertificateSigningRequests that match those selectors. // List takes label and field selectors, and returns the list of CertificateSigningRequests that match those selectors.
func (c *certificateSigningRequests) List(opts meta_v1.ListOptions) (result *v1beta1.CertificateSigningRequestList, err error) { func (c *certificateSigningRequests) List(opts v1.ListOptions) (result *v1beta1.CertificateSigningRequestList, err error) {
result = &v1beta1.CertificateSigningRequestList{} result = &v1beta1.CertificateSigningRequestList{}
err = c.client.Get(). err = c.client.Get().
Resource("certificatesigningrequests"). Resource("certificatesigningrequests").
@ -140,7 +139,7 @@ func (c *certificateSigningRequests) List(opts meta_v1.ListOptions) (result *v1b
} }
// Watch returns a watch.Interface that watches the requested certificateSigningRequests. // Watch returns a watch.Interface that watches the requested certificateSigningRequests.
func (c *certificateSigningRequests) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { func (c *certificateSigningRequests) Watch(opts v1.ListOptions) (watch.Interface, error) {
return c.client.Get(). return c.client.Get().
Prefix("watch"). Prefix("watch").
Resource("certificatesigningrequests"). Resource("certificatesigningrequests").

11
kubernetes/typed/certificates/v1beta1/fake/fake_certificatesigningrequest.go
View File

@ -17,12 +17,11 @@ limitations under the License.
package fake package fake
import ( import (
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
labels "k8s.io/apimachinery/pkg/labels" labels "k8s.io/apimachinery/pkg/labels"
schema "k8s.io/apimachinery/pkg/runtime/schema" schema "k8s.io/apimachinery/pkg/runtime/schema"
types "k8s.io/apimachinery/pkg/types" types "k8s.io/apimachinery/pkg/types"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
v1 "k8s.io/client-go/pkg/api/v1"
v1beta1 "k8s.io/client-go/pkg/apis/certificates/v1beta1" v1beta1 "k8s.io/client-go/pkg/apis/certificates/v1beta1"
testing "k8s.io/client-go/testing" testing "k8s.io/client-go/testing"
) )
@ -67,14 +66,14 @@ func (c *FakeCertificateSigningRequests) Delete(name string, options *v1.DeleteO
return err return err
} }
func (c *FakeCertificateSigningRequests) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *FakeCertificateSigningRequests) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
action := testing.NewRootDeleteCollectionAction(certificatesigningrequestsResource, listOptions) action := testing.NewRootDeleteCollectionAction(certificatesigningrequestsResource, listOptions)
_, err := c.Fake.Invokes(action, &v1beta1.CertificateSigningRequestList{}) _, err := c.Fake.Invokes(action, &v1beta1.CertificateSigningRequestList{})
return err return err
} }
func (c *FakeCertificateSigningRequests) Get(name string, options meta_v1.GetOptions) (result *v1beta1.CertificateSigningRequest, err error) { func (c *FakeCertificateSigningRequests) Get(name string, options v1.GetOptions) (result *v1beta1.CertificateSigningRequest, err error) {
obj, err := c.Fake. obj, err := c.Fake.
Invokes(testing.NewRootGetAction(certificatesigningrequestsResource, name), &v1beta1.CertificateSigningRequest{}) Invokes(testing.NewRootGetAction(certificatesigningrequestsResource, name), &v1beta1.CertificateSigningRequest{})
if obj == nil { if obj == nil {
@ -83,7 +82,7 @@ func (c *FakeCertificateSigningRequests) Get(name string, options meta_v1.GetOpt
return obj.(*v1beta1.CertificateSigningRequest), err return obj.(*v1beta1.CertificateSigningRequest), err
} }
func (c *FakeCertificateSigningRequests) List(opts meta_v1.ListOptions) (result *v1beta1.CertificateSigningRequestList, err error) { func (c *FakeCertificateSigningRequests) List(opts v1.ListOptions) (result *v1beta1.CertificateSigningRequestList, err error) {
obj, err := c.Fake. obj, err := c.Fake.
Invokes(testing.NewRootListAction(certificatesigningrequestsResource, opts), &v1beta1.CertificateSigningRequestList{}) Invokes(testing.NewRootListAction(certificatesigningrequestsResource, opts), &v1beta1.CertificateSigningRequestList{})
if obj == nil { if obj == nil {
@ -104,7 +103,7 @@ func (c *FakeCertificateSigningRequests) List(opts meta_v1.ListOptions) (result
} }
// Watch returns a watch.Interface that watches the requested certificateSigningRequests. // Watch returns a watch.Interface that watches the requested certificateSigningRequests.
func (c *FakeCertificateSigningRequests) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { func (c *FakeCertificateSigningRequests) Watch(opts v1.ListOptions) (watch.Interface, error) {
return c.Fake. return c.Fake.
InvokesWatch(testing.NewRootWatchAction(certificatesigningrequestsResource, opts)) InvokesWatch(testing.NewRootWatchAction(certificatesigningrequestsResource, opts))
} }

8
kubernetes/typed/core/v1/componentstatus.go
View File

@ -35,8 +35,8 @@ type ComponentStatusesGetter interface {
type ComponentStatusInterface interface { type ComponentStatusInterface interface {
Create(*v1.ComponentStatus) (*v1.ComponentStatus, error) Create(*v1.ComponentStatus) (*v1.ComponentStatus, error)
Update(*v1.ComponentStatus) (*v1.ComponentStatus, error) Update(*v1.ComponentStatus) (*v1.ComponentStatus, error)
Delete(name string, options *v1.DeleteOptions) error Delete(name string, options *meta_v1.DeleteOptions) error
DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error
Get(name string, options meta_v1.GetOptions) (*v1.ComponentStatus, error) Get(name string, options meta_v1.GetOptions) (*v1.ComponentStatus, error)
List(opts meta_v1.ListOptions) (*v1.ComponentStatusList, error) List(opts meta_v1.ListOptions) (*v1.ComponentStatusList, error)
Watch(opts meta_v1.ListOptions) (watch.Interface, error) Watch(opts meta_v1.ListOptions) (watch.Interface, error)
@ -80,7 +80,7 @@ func (c *componentStatuses) Update(componentStatus *v1.ComponentStatus) (result
} }
// Delete takes name of the componentStatus and deletes it. Returns an error if one occurs. // Delete takes name of the componentStatus and deletes it. Returns an error if one occurs.
func (c *componentStatuses) Delete(name string, options *v1.DeleteOptions) error { func (c *componentStatuses) Delete(name string, options *meta_v1.DeleteOptions) error {
return c.client.Delete(). return c.client.Delete().
Resource("componentstatuses"). Resource("componentstatuses").
Name(name). Name(name).
@ -90,7 +90,7 @@ func (c *componentStatuses) Delete(name string, options *v1.DeleteOptions) error
} }
// DeleteCollection deletes a collection of objects. // DeleteCollection deletes a collection of objects.
func (c *componentStatuses) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *componentStatuses) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
return c.client.Delete(). return c.client.Delete().
Resource("componentstatuses"). Resource("componentstatuses").
VersionedParams(&listOptions, api.ParameterCodec). VersionedParams(&listOptions, api.ParameterCodec).

8
kubernetes/typed/core/v1/configmap.go
View File

@ -35,8 +35,8 @@ type ConfigMapsGetter interface {
type ConfigMapInterface interface { type ConfigMapInterface interface {
Create(*v1.ConfigMap) (*v1.ConfigMap, error) Create(*v1.ConfigMap) (*v1.ConfigMap, error)
Update(*v1.ConfigMap) (*v1.ConfigMap, error) Update(*v1.ConfigMap) (*v1.ConfigMap, error)
Delete(name string, options *v1.DeleteOptions) error Delete(name string, options *meta_v1.DeleteOptions) error
DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error
Get(name string, options meta_v1.GetOptions) (*v1.ConfigMap, error) Get(name string, options meta_v1.GetOptions) (*v1.ConfigMap, error)
List(opts meta_v1.ListOptions) (*v1.ConfigMapList, error) List(opts meta_v1.ListOptions) (*v1.ConfigMapList, error)
Watch(opts meta_v1.ListOptions) (watch.Interface, error) Watch(opts meta_v1.ListOptions) (watch.Interface, error)
@ -84,7 +84,7 @@ func (c *configMaps) Update(configMap *v1.ConfigMap) (result *v1.ConfigMap, err
} }
// Delete takes name of the configMap and deletes it. Returns an error if one occurs. // Delete takes name of the configMap and deletes it. Returns an error if one occurs.
func (c *configMaps) Delete(name string, options *v1.DeleteOptions) error { func (c *configMaps) Delete(name string, options *meta_v1.DeleteOptions) error {
return c.client.Delete(). return c.client.Delete().
Namespace(c.ns). Namespace(c.ns).
Resource("configmaps"). Resource("configmaps").
@ -95,7 +95,7 @@ func (c *configMaps) Delete(name string, options *v1.DeleteOptions) error {
} }
// DeleteCollection deletes a collection of objects. // DeleteCollection deletes a collection of objects.
func (c *configMaps) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *configMaps) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
return c.client.Delete(). return c.client.Delete().
Namespace(c.ns). Namespace(c.ns).
Resource("configmaps"). Resource("configmaps").

8
kubernetes/typed/core/v1/endpoints.go
View File

@ -35,8 +35,8 @@ type EndpointsGetter interface {
type EndpointsInterface interface { type EndpointsInterface interface {
Create(*v1.Endpoints) (*v1.Endpoints, error) Create(*v1.Endpoints) (*v1.Endpoints, error)
Update(*v1.Endpoints) (*v1.Endpoints, error) Update(*v1.Endpoints) (*v1.Endpoints, error)
Delete(name string, options *v1.DeleteOptions) error Delete(name string, options *meta_v1.DeleteOptions) error
DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error
Get(name string, options meta_v1.GetOptions) (*v1.Endpoints, error) Get(name string, options meta_v1.GetOptions) (*v1.Endpoints, error)
List(opts meta_v1.ListOptions) (*v1.EndpointsList, error) List(opts meta_v1.ListOptions) (*v1.EndpointsList, error)
Watch(opts meta_v1.ListOptions) (watch.Interface, error) Watch(opts meta_v1.ListOptions) (watch.Interface, error)
@ -84,7 +84,7 @@ func (c *endpoints) Update(endpoints *v1.Endpoints) (result *v1.Endpoints, err e
} }
// Delete takes name of the endpoints and deletes it. Returns an error if one occurs. // Delete takes name of the endpoints and deletes it. Returns an error if one occurs.
func (c *endpoints) Delete(name string, options *v1.DeleteOptions) error { func (c *endpoints) Delete(name string, options *meta_v1.DeleteOptions) error {
return c.client.Delete(). return c.client.Delete().
Namespace(c.ns). Namespace(c.ns).
Resource("endpoints"). Resource("endpoints").
@ -95,7 +95,7 @@ func (c *endpoints) Delete(name string, options *v1.DeleteOptions) error {
} }
// DeleteCollection deletes a collection of objects. // DeleteCollection deletes a collection of objects.
func (c *endpoints) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *endpoints) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
return c.client.Delete(). return c.client.Delete().
Namespace(c.ns). Namespace(c.ns).
Resource("endpoints"). Resource("endpoints").

8
kubernetes/typed/core/v1/event.go
View File

@ -35,8 +35,8 @@ type EventsGetter interface {
type EventInterface interface { type EventInterface interface {
Create(*v1.Event) (*v1.Event, error) Create(*v1.Event) (*v1.Event, error)
Update(*v1.Event) (*v1.Event, error) Update(*v1.Event) (*v1.Event, error)
Delete(name string, options *v1.DeleteOptions) error Delete(name string, options *meta_v1.DeleteOptions) error
DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error
Get(name string, options meta_v1.GetOptions) (*v1.Event, error) Get(name string, options meta_v1.GetOptions) (*v1.Event, error)
List(opts meta_v1.ListOptions) (*v1.EventList, error) List(opts meta_v1.ListOptions) (*v1.EventList, error)
Watch(opts meta_v1.ListOptions) (watch.Interface, error) Watch(opts meta_v1.ListOptions) (watch.Interface, error)
@ -84,7 +84,7 @@ func (c *events) Update(event *v1.Event) (result *v1.Event, err error) {
} }
// Delete takes name of the event and deletes it. Returns an error if one occurs. // Delete takes name of the event and deletes it. Returns an error if one occurs.
func (c *events) Delete(name string, options *v1.DeleteOptions) error { func (c *events) Delete(name string, options *meta_v1.DeleteOptions) error {
return c.client.Delete(). return c.client.Delete().
Namespace(c.ns). Namespace(c.ns).
Resource("events"). Resource("events").
@ -95,7 +95,7 @@ func (c *events) Delete(name string, options *v1.DeleteOptions) error {
} }
// DeleteCollection deletes a collection of objects. // DeleteCollection deletes a collection of objects.
func (c *events) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *events) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
return c.client.Delete(). return c.client.Delete().
Namespace(c.ns). Namespace(c.ns).
Resource("events"). Resource("events").

4
kubernetes/typed/core/v1/fake/fake_componentstatus.go
View File

@ -51,13 +51,13 @@ func (c *FakeComponentStatuses) Update(componentStatus *v1.ComponentStatus) (res
return obj.(*v1.ComponentStatus), err return obj.(*v1.ComponentStatus), err
} }
func (c *FakeComponentStatuses) Delete(name string, options *v1.DeleteOptions) error { func (c *FakeComponentStatuses) Delete(name string, options *meta_v1.DeleteOptions) error {
_, err := c.Fake. _, err := c.Fake.
Invokes(testing.NewRootDeleteAction(componentstatusesResource, name), &v1.ComponentStatus{}) Invokes(testing.NewRootDeleteAction(componentstatusesResource, name), &v1.ComponentStatus{})
return err return err
} }
func (c *FakeComponentStatuses) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *FakeComponentStatuses) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
action := testing.NewRootDeleteCollectionAction(componentstatusesResource, listOptions) action := testing.NewRootDeleteCollectionAction(componentstatusesResource, listOptions)
_, err := c.Fake.Invokes(action, &v1.ComponentStatusList{}) _, err := c.Fake.Invokes(action, &v1.ComponentStatusList{})

4
kubernetes/typed/core/v1/fake/fake_configmap.go
View File

@ -54,14 +54,14 @@ func (c *FakeConfigMaps) Update(configMap *v1.ConfigMap) (result *v1.ConfigMap,
return obj.(*v1.ConfigMap), err return obj.(*v1.ConfigMap), err
} }
func (c *FakeConfigMaps) Delete(name string, options *v1.DeleteOptions) error { func (c *FakeConfigMaps) Delete(name string, options *meta_v1.DeleteOptions) error {
_, err := c.Fake. _, err := c.Fake.
Invokes(testing.NewDeleteAction(configmapsResource, c.ns, name), &v1.ConfigMap{}) Invokes(testing.NewDeleteAction(configmapsResource, c.ns, name), &v1.ConfigMap{})
return err return err
} }
func (c *FakeConfigMaps) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *FakeConfigMaps) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
action := testing.NewDeleteCollectionAction(configmapsResource, c.ns, listOptions) action := testing.NewDeleteCollectionAction(configmapsResource, c.ns, listOptions)
_, err := c.Fake.Invokes(action, &v1.ConfigMapList{}) _, err := c.Fake.Invokes(action, &v1.ConfigMapList{})

4
kubernetes/typed/core/v1/fake/fake_endpoints.go
View File

@ -54,14 +54,14 @@ func (c *FakeEndpoints) Update(endpoints *v1.Endpoints) (result *v1.Endpoints, e
return obj.(*v1.Endpoints), err return obj.(*v1.Endpoints), err
} }
func (c *FakeEndpoints) Delete(name string, options *v1.DeleteOptions) error { func (c *FakeEndpoints) Delete(name string, options *meta_v1.DeleteOptions) error {
_, err := c.Fake. _, err := c.Fake.
Invokes(testing.NewDeleteAction(endpointsResource, c.ns, name), &v1.Endpoints{}) Invokes(testing.NewDeleteAction(endpointsResource, c.ns, name), &v1.Endpoints{})
return err return err
} }
func (c *FakeEndpoints) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *FakeEndpoints) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
action := testing.NewDeleteCollectionAction(endpointsResource, c.ns, listOptions) action := testing.NewDeleteCollectionAction(endpointsResource, c.ns, listOptions)
_, err := c.Fake.Invokes(action, &v1.EndpointsList{}) _, err := c.Fake.Invokes(action, &v1.EndpointsList{})

4
kubernetes/typed/core/v1/fake/fake_event.go
View File

@ -54,14 +54,14 @@ func (c *FakeEvents) Update(event *v1.Event) (result *v1.Event, err error) {
return obj.(*v1.Event), err return obj.(*v1.Event), err
} }
func (c *FakeEvents) Delete(name string, options *v1.DeleteOptions) error { func (c *FakeEvents) Delete(name string, options *meta_v1.DeleteOptions) error {
_, err := c.Fake. _, err := c.Fake.
Invokes(testing.NewDeleteAction(eventsResource, c.ns, name), &v1.Event{}) Invokes(testing.NewDeleteAction(eventsResource, c.ns, name), &v1.Event{})
return err return err
} }
func (c *FakeEvents) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *FakeEvents) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
action := testing.NewDeleteCollectionAction(eventsResource, c.ns, listOptions) action := testing.NewDeleteCollectionAction(eventsResource, c.ns, listOptions)
_, err := c.Fake.Invokes(action, &v1.EventList{}) _, err := c.Fake.Invokes(action, &v1.EventList{})

4
kubernetes/typed/core/v1/fake/fake_limitrange.go
View File

@ -54,14 +54,14 @@ func (c *FakeLimitRanges) Update(limitRange *v1.LimitRange) (result *v1.LimitRan
return obj.(*v1.LimitRange), err return obj.(*v1.LimitRange), err
} }
func (c *FakeLimitRanges) Delete(name string, options *v1.DeleteOptions) error { func (c *FakeLimitRanges) Delete(name string, options *meta_v1.DeleteOptions) error {
_, err := c.Fake. _, err := c.Fake.
Invokes(testing.NewDeleteAction(limitrangesResource, c.ns, name), &v1.LimitRange{}) Invokes(testing.NewDeleteAction(limitrangesResource, c.ns, name), &v1.LimitRange{})
return err return err
} }
func (c *FakeLimitRanges) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *FakeLimitRanges) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
action := testing.NewDeleteCollectionAction(limitrangesResource, c.ns, listOptions) action := testing.NewDeleteCollectionAction(limitrangesResource, c.ns, listOptions)
_, err := c.Fake.Invokes(action, &v1.LimitRangeList{}) _, err := c.Fake.Invokes(action, &v1.LimitRangeList{})

4
kubernetes/typed/core/v1/fake/fake_namespace.go
View File

@ -60,13 +60,13 @@ func (c *FakeNamespaces) UpdateStatus(namespace *v1.Namespace) (*v1.Namespace, e
return obj.(*v1.Namespace), err return obj.(*v1.Namespace), err
} }
func (c *FakeNamespaces) Delete(name string, options *v1.DeleteOptions) error { func (c *FakeNamespaces) Delete(name string, options *meta_v1.DeleteOptions) error {
_, err := c.Fake. _, err := c.Fake.
Invokes(testing.NewRootDeleteAction(namespacesResource, name), &v1.Namespace{}) Invokes(testing.NewRootDeleteAction(namespacesResource, name), &v1.Namespace{})
return err return err
} }
func (c *FakeNamespaces) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *FakeNamespaces) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
action := testing.NewRootDeleteCollectionAction(namespacesResource, listOptions) action := testing.NewRootDeleteCollectionAction(namespacesResource, listOptions)
_, err := c.Fake.Invokes(action, &v1.NamespaceList{}) _, err := c.Fake.Invokes(action, &v1.NamespaceList{})

4
kubernetes/typed/core/v1/fake/fake_node.go
View File

@ -60,13 +60,13 @@ func (c *FakeNodes) UpdateStatus(node *v1.Node) (*v1.Node, error) {
return obj.(*v1.Node), err return obj.(*v1.Node), err
} }
func (c *FakeNodes) Delete(name string, options *v1.DeleteOptions) error { func (c *FakeNodes) Delete(name string, options *meta_v1.DeleteOptions) error {
_, err := c.Fake. _, err := c.Fake.
Invokes(testing.NewRootDeleteAction(nodesResource, name), &v1.Node{}) Invokes(testing.NewRootDeleteAction(nodesResource, name), &v1.Node{})
return err return err
} }
func (c *FakeNodes) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *FakeNodes) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
action := testing.NewRootDeleteCollectionAction(nodesResource, listOptions) action := testing.NewRootDeleteCollectionAction(nodesResource, listOptions)
_, err := c.Fake.Invokes(action, &v1.NodeList{}) _, err := c.Fake.Invokes(action, &v1.NodeList{})

4
kubernetes/typed/core/v1/fake/fake_persistentvolume.go
View File

@ -60,13 +60,13 @@ func (c *FakePersistentVolumes) UpdateStatus(persistentVolume *v1.PersistentVolu
return obj.(*v1.PersistentVolume), err return obj.(*v1.PersistentVolume), err
} }
func (c *FakePersistentVolumes) Delete(name string, options *v1.DeleteOptions) error { func (c *FakePersistentVolumes) Delete(name string, options *meta_v1.DeleteOptions) error {
_, err := c.Fake. _, err := c.Fake.
Invokes(testing.NewRootDeleteAction(persistentvolumesResource, name), &v1.PersistentVolume{}) Invokes(testing.NewRootDeleteAction(persistentvolumesResource, name), &v1.PersistentVolume{})
return err return err
} }
func (c *FakePersistentVolumes) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *FakePersistentVolumes) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
action := testing.NewRootDeleteCollectionAction(persistentvolumesResource, listOptions) action := testing.NewRootDeleteCollectionAction(persistentvolumesResource, listOptions)
_, err := c.Fake.Invokes(action, &v1.PersistentVolumeList{}) _, err := c.Fake.Invokes(action, &v1.PersistentVolumeList{})

4
kubernetes/typed/core/v1/fake/fake_persistentvolumeclaim.go
View File

@ -64,14 +64,14 @@ func (c *FakePersistentVolumeClaims) UpdateStatus(persistentVolumeClaim *v1.Pers
return obj.(*v1.PersistentVolumeClaim), err return obj.(*v1.PersistentVolumeClaim), err
} }
func (c *FakePersistentVolumeClaims) Delete(name string, options *v1.DeleteOptions) error { func (c *FakePersistentVolumeClaims) Delete(name string, options *meta_v1.DeleteOptions) error {
_, err := c.Fake. _, err := c.Fake.
Invokes(testing.NewDeleteAction(persistentvolumeclaimsResource, c.ns, name), &v1.PersistentVolumeClaim{}) Invokes(testing.NewDeleteAction(persistentvolumeclaimsResource, c.ns, name), &v1.PersistentVolumeClaim{})
return err return err
} }
func (c *FakePersistentVolumeClaims) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *FakePersistentVolumeClaims) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
action := testing.NewDeleteCollectionAction(persistentvolumeclaimsResource, c.ns, listOptions) action := testing.NewDeleteCollectionAction(persistentvolumeclaimsResource, c.ns, listOptions)
_, err := c.Fake.Invokes(action, &v1.PersistentVolumeClaimList{}) _, err := c.Fake.Invokes(action, &v1.PersistentVolumeClaimList{})

4
kubernetes/typed/core/v1/fake/fake_pod.go
View File

@ -64,14 +64,14 @@ func (c *FakePods) UpdateStatus(pod *v1.Pod) (*v1.Pod, error) {
return obj.(*v1.Pod), err return obj.(*v1.Pod), err
} }
func (c *FakePods) Delete(name string, options *v1.DeleteOptions) error { func (c *FakePods) Delete(name string, options *meta_v1.DeleteOptions) error {
_, err := c.Fake. _, err := c.Fake.
Invokes(testing.NewDeleteAction(podsResource, c.ns, name), &v1.Pod{}) Invokes(testing.NewDeleteAction(podsResource, c.ns, name), &v1.Pod{})
return err return err
} }
func (c *FakePods) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *FakePods) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
action := testing.NewDeleteCollectionAction(podsResource, c.ns, listOptions) action := testing.NewDeleteCollectionAction(podsResource, c.ns, listOptions)
_, err := c.Fake.Invokes(action, &v1.PodList{}) _, err := c.Fake.Invokes(action, &v1.PodList{})

4
kubernetes/typed/core/v1/fake/fake_podtemplate.go
View File

@ -54,14 +54,14 @@ func (c *FakePodTemplates) Update(podTemplate *v1.PodTemplate) (result *v1.PodTe
return obj.(*v1.PodTemplate), err return obj.(*v1.PodTemplate), err
} }
func (c *FakePodTemplates) Delete(name string, options *v1.DeleteOptions) error { func (c *FakePodTemplates) Delete(name string, options *meta_v1.DeleteOptions) error {
_, err := c.Fake. _, err := c.Fake.
Invokes(testing.NewDeleteAction(podtemplatesResource, c.ns, name), &v1.PodTemplate{}) Invokes(testing.NewDeleteAction(podtemplatesResource, c.ns, name), &v1.PodTemplate{})
return err return err
} }
func (c *FakePodTemplates) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *FakePodTemplates) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
action := testing.NewDeleteCollectionAction(podtemplatesResource, c.ns, listOptions) action := testing.NewDeleteCollectionAction(podtemplatesResource, c.ns, listOptions)
_, err := c.Fake.Invokes(action, &v1.PodTemplateList{}) _, err := c.Fake.Invokes(action, &v1.PodTemplateList{})

4
kubernetes/typed/core/v1/fake/fake_replicationcontroller.go
View File

@ -64,14 +64,14 @@ func (c *FakeReplicationControllers) UpdateStatus(replicationController *v1.Repl
return obj.(*v1.ReplicationController), err return obj.(*v1.ReplicationController), err
} }
func (c *FakeReplicationControllers) Delete(name string, options *v1.DeleteOptions) error { func (c *FakeReplicationControllers) Delete(name string, options *meta_v1.DeleteOptions) error {
_, err := c.Fake. _, err := c.Fake.
Invokes(testing.NewDeleteAction(replicationcontrollersResource, c.ns, name), &v1.ReplicationController{}) Invokes(testing.NewDeleteAction(replicationcontrollersResource, c.ns, name), &v1.ReplicationController{})
return err return err
} }
func (c *FakeReplicationControllers) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *FakeReplicationControllers) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
action := testing.NewDeleteCollectionAction(replicationcontrollersResource, c.ns, listOptions) action := testing.NewDeleteCollectionAction(replicationcontrollersResource, c.ns, listOptions)
_, err := c.Fake.Invokes(action, &v1.ReplicationControllerList{}) _, err := c.Fake.Invokes(action, &v1.ReplicationControllerList{})

4
kubernetes/typed/core/v1/fake/fake_resourcequota.go
View File

@ -64,14 +64,14 @@ func (c *FakeResourceQuotas) UpdateStatus(resourceQuota *v1.ResourceQuota) (*v1.
return obj.(*v1.ResourceQuota), err return obj.(*v1.ResourceQuota), err
} }
func (c *FakeResourceQuotas) Delete(name string, options *v1.DeleteOptions) error { func (c *FakeResourceQuotas) Delete(name string, options *meta_v1.DeleteOptions) error {
_, err := c.Fake. _, err := c.Fake.
Invokes(testing.NewDeleteAction(resourcequotasResource, c.ns, name), &v1.ResourceQuota{}) Invokes(testing.NewDeleteAction(resourcequotasResource, c.ns, name), &v1.ResourceQuota{})
return err return err
} }
func (c *FakeResourceQuotas) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *FakeResourceQuotas) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
action := testing.NewDeleteCollectionAction(resourcequotasResource, c.ns, listOptions) action := testing.NewDeleteCollectionAction(resourcequotasResource, c.ns, listOptions)
_, err := c.Fake.Invokes(action, &v1.ResourceQuotaList{}) _, err := c.Fake.Invokes(action, &v1.ResourceQuotaList{})

4
kubernetes/typed/core/v1/fake/fake_secret.go
View File

@ -54,14 +54,14 @@ func (c *FakeSecrets) Update(secret *v1.Secret) (result *v1.Secret, err error) {
return obj.(*v1.Secret), err return obj.(*v1.Secret), err
} }
func (c *FakeSecrets) Delete(name string, options *v1.DeleteOptions) error { func (c *FakeSecrets) Delete(name string, options *meta_v1.DeleteOptions) error {
_, err := c.Fake. _, err := c.Fake.
Invokes(testing.NewDeleteAction(secretsResource, c.ns, name), &v1.Secret{}) Invokes(testing.NewDeleteAction(secretsResource, c.ns, name), &v1.Secret{})
return err return err
} }
func (c *FakeSecrets) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *FakeSecrets) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
action := testing.NewDeleteCollectionAction(secretsResource, c.ns, listOptions) action := testing.NewDeleteCollectionAction(secretsResource, c.ns, listOptions)
_, err := c.Fake.Invokes(action, &v1.SecretList{}) _, err := c.Fake.Invokes(action, &v1.SecretList{})

4
kubernetes/typed/core/v1/fake/fake_service.go
View File

@ -64,14 +64,14 @@ func (c *FakeServices) UpdateStatus(service *v1.Service) (*v1.Service, error) {
return obj.(*v1.Service), err return obj.(*v1.Service), err
} }
func (c *FakeServices) Delete(name string, options *v1.DeleteOptions) error { func (c *FakeServices) Delete(name string, options *meta_v1.DeleteOptions) error {
_, err := c.Fake. _, err := c.Fake.
Invokes(testing.NewDeleteAction(servicesResource, c.ns, name), &v1.Service{}) Invokes(testing.NewDeleteAction(servicesResource, c.ns, name), &v1.Service{})
return err return err
} }
func (c *FakeServices) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *FakeServices) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
action := testing.NewDeleteCollectionAction(servicesResource, c.ns, listOptions) action := testing.NewDeleteCollectionAction(servicesResource, c.ns, listOptions)
_, err := c.Fake.Invokes(action, &v1.ServiceList{}) _, err := c.Fake.Invokes(action, &v1.ServiceList{})

4
kubernetes/typed/core/v1/fake/fake_serviceaccount.go
View File

@ -54,14 +54,14 @@ func (c *FakeServiceAccounts) Update(serviceAccount *v1.ServiceAccount) (result
return obj.(*v1.ServiceAccount), err return obj.(*v1.ServiceAccount), err
} }
func (c *FakeServiceAccounts) Delete(name string, options *v1.DeleteOptions) error { func (c *FakeServiceAccounts) Delete(name string, options *meta_v1.DeleteOptions) error {
_, err := c.Fake. _, err := c.Fake.
Invokes(testing.NewDeleteAction(serviceaccountsResource, c.ns, name), &v1.ServiceAccount{}) Invokes(testing.NewDeleteAction(serviceaccountsResource, c.ns, name), &v1.ServiceAccount{})
return err return err
} }
func (c *FakeServiceAccounts) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *FakeServiceAccounts) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
action := testing.NewDeleteCollectionAction(serviceaccountsResource, c.ns, listOptions) action := testing.NewDeleteCollectionAction(serviceaccountsResource, c.ns, listOptions)
_, err := c.Fake.Invokes(action, &v1.ServiceAccountList{}) _, err := c.Fake.Invokes(action, &v1.ServiceAccountList{})

8
kubernetes/typed/core/v1/limitrange.go
View File

@ -35,8 +35,8 @@ type LimitRangesGetter interface {
type LimitRangeInterface interface { type LimitRangeInterface interface {
Create(*v1.LimitRange) (*v1.LimitRange, error) Create(*v1.LimitRange) (*v1.LimitRange, error)
Update(*v1.LimitRange) (*v1.LimitRange, error) Update(*v1.LimitRange) (*v1.LimitRange, error)
Delete(name string, options *v1.DeleteOptions) error Delete(name string, options *meta_v1.DeleteOptions) error
DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error
Get(name string, options meta_v1.GetOptions) (*v1.LimitRange, error) Get(name string, options meta_v1.GetOptions) (*v1.LimitRange, error)
List(opts meta_v1.ListOptions) (*v1.LimitRangeList, error) List(opts meta_v1.ListOptions) (*v1.LimitRangeList, error)
Watch(opts meta_v1.ListOptions) (watch.Interface, error) Watch(opts meta_v1.ListOptions) (watch.Interface, error)
@ -84,7 +84,7 @@ func (c *limitRanges) Update(limitRange *v1.LimitRange) (result *v1.LimitRange,
} }
// Delete takes name of the limitRange and deletes it. Returns an error if one occurs. // Delete takes name of the limitRange and deletes it. Returns an error if one occurs.
func (c *limitRanges) Delete(name string, options *v1.DeleteOptions) error { func (c *limitRanges) Delete(name string, options *meta_v1.DeleteOptions) error {
return c.client.Delete(). return c.client.Delete().
Namespace(c.ns). Namespace(c.ns).
Resource("limitranges"). Resource("limitranges").
@ -95,7 +95,7 @@ func (c *limitRanges) Delete(name string, options *v1.DeleteOptions) error {
} }
// DeleteCollection deletes a collection of objects. // DeleteCollection deletes a collection of objects.
func (c *limitRanges) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *limitRanges) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
return c.client.Delete(). return c.client.Delete().
Namespace(c.ns). Namespace(c.ns).
Resource("limitranges"). Resource("limitranges").

8
kubernetes/typed/core/v1/namespace.go
View File

@ -36,8 +36,8 @@ type NamespaceInterface interface {
Create(*v1.Namespace) (*v1.Namespace, error) Create(*v1.Namespace) (*v1.Namespace, error)
Update(*v1.Namespace) (*v1.Namespace, error) Update(*v1.Namespace) (*v1.Namespace, error)
UpdateStatus(*v1.Namespace) (*v1.Namespace, error) UpdateStatus(*v1.Namespace) (*v1.Namespace, error)
Delete(name string, options *v1.DeleteOptions) error Delete(name string, options *meta_v1.DeleteOptions) error
DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error
Get(name string, options meta_v1.GetOptions) (*v1.Namespace, error) Get(name string, options meta_v1.GetOptions) (*v1.Namespace, error)
List(opts meta_v1.ListOptions) (*v1.NamespaceList, error) List(opts meta_v1.ListOptions) (*v1.NamespaceList, error)
Watch(opts meta_v1.ListOptions) (watch.Interface, error) Watch(opts meta_v1.ListOptions) (watch.Interface, error)
@ -96,7 +96,7 @@ func (c *namespaces) UpdateStatus(namespace *v1.Namespace) (result *v1.Namespace
} }
// Delete takes name of the namespace and deletes it. Returns an error if one occurs. // Delete takes name of the namespace and deletes it. Returns an error if one occurs.
func (c *namespaces) Delete(name string, options *v1.DeleteOptions) error { func (c *namespaces) Delete(name string, options *meta_v1.DeleteOptions) error {
return c.client.Delete(). return c.client.Delete().
Resource("namespaces"). Resource("namespaces").
Name(name). Name(name).
@ -106,7 +106,7 @@ func (c *namespaces) Delete(name string, options *v1.DeleteOptions) error {
} }
// DeleteCollection deletes a collection of objects. // DeleteCollection deletes a collection of objects.
func (c *namespaces) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *namespaces) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
return c.client.Delete(). return c.client.Delete().
Resource("namespaces"). Resource("namespaces").
VersionedParams(&listOptions, api.ParameterCodec). VersionedParams(&listOptions, api.ParameterCodec).

8
kubernetes/typed/core/v1/node.go
View File

@ -36,8 +36,8 @@ type NodeInterface interface {
Create(*v1.Node) (*v1.Node, error) Create(*v1.Node) (*v1.Node, error)
Update(*v1.Node) (*v1.Node, error) Update(*v1.Node) (*v1.Node, error)
UpdateStatus(*v1.Node) (*v1.Node, error) UpdateStatus(*v1.Node) (*v1.Node, error)
Delete(name string, options *v1.DeleteOptions) error Delete(name string, options *meta_v1.DeleteOptions) error
DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error
Get(name string, options meta_v1.GetOptions) (*v1.Node, error) Get(name string, options meta_v1.GetOptions) (*v1.Node, error)
List(opts meta_v1.ListOptions) (*v1.NodeList, error) List(opts meta_v1.ListOptions) (*v1.NodeList, error)
Watch(opts meta_v1.ListOptions) (watch.Interface, error) Watch(opts meta_v1.ListOptions) (watch.Interface, error)
@ -96,7 +96,7 @@ func (c *nodes) UpdateStatus(node *v1.Node) (result *v1.Node, err error) {
} }
// Delete takes name of the node and deletes it. Returns an error if one occurs. // Delete takes name of the node and deletes it. Returns an error if one occurs.
func (c *nodes) Delete(name string, options *v1.DeleteOptions) error { func (c *nodes) Delete(name string, options *meta_v1.DeleteOptions) error {
return c.client.Delete(). return c.client.Delete().
Resource("nodes"). Resource("nodes").
Name(name). Name(name).
@ -106,7 +106,7 @@ func (c *nodes) Delete(name string, options *v1.DeleteOptions) error {
} }
// DeleteCollection deletes a collection of objects. // DeleteCollection deletes a collection of objects.
func (c *nodes) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *nodes) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
return c.client.Delete(). return c.client.Delete().
Resource("nodes"). Resource("nodes").
VersionedParams(&listOptions, api.ParameterCodec). VersionedParams(&listOptions, api.ParameterCodec).

8
kubernetes/typed/core/v1/persistentvolume.go
View File

@ -36,8 +36,8 @@ type PersistentVolumeInterface interface {
Create(*v1.PersistentVolume) (*v1.PersistentVolume, error) Create(*v1.PersistentVolume) (*v1.PersistentVolume, error)
Update(*v1.PersistentVolume) (*v1.PersistentVolume, error) Update(*v1.PersistentVolume) (*v1.PersistentVolume, error)
UpdateStatus(*v1.PersistentVolume) (*v1.PersistentVolume, error) UpdateStatus(*v1.PersistentVolume) (*v1.PersistentVolume, error)
Delete(name string, options *v1.DeleteOptions) error Delete(name string, options *meta_v1.DeleteOptions) error
DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error
Get(name string, options meta_v1.GetOptions) (*v1.PersistentVolume, error) Get(name string, options meta_v1.GetOptions) (*v1.PersistentVolume, error)
List(opts meta_v1.ListOptions) (*v1.PersistentVolumeList, error) List(opts meta_v1.ListOptions) (*v1.PersistentVolumeList, error)
Watch(opts meta_v1.ListOptions) (watch.Interface, error) Watch(opts meta_v1.ListOptions) (watch.Interface, error)
@ -96,7 +96,7 @@ func (c *persistentVolumes) UpdateStatus(persistentVolume *v1.PersistentVolume)
} }
// Delete takes name of the persistentVolume and deletes it. Returns an error if one occurs. // Delete takes name of the persistentVolume and deletes it. Returns an error if one occurs.
func (c *persistentVolumes) Delete(name string, options *v1.DeleteOptions) error { func (c *persistentVolumes) Delete(name string, options *meta_v1.DeleteOptions) error {
return c.client.Delete(). return c.client.Delete().
Resource("persistentvolumes"). Resource("persistentvolumes").
Name(name). Name(name).
@ -106,7 +106,7 @@ func (c *persistentVolumes) Delete(name string, options *v1.DeleteOptions) error
} }
// DeleteCollection deletes a collection of objects. // DeleteCollection deletes a collection of objects.
func (c *persistentVolumes) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *persistentVolumes) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
return c.client.Delete(). return c.client.Delete().
Resource("persistentvolumes"). Resource("persistentvolumes").
VersionedParams(&listOptions, api.ParameterCodec). VersionedParams(&listOptions, api.ParameterCodec).

8
kubernetes/typed/core/v1/persistentvolumeclaim.go
View File

@ -36,8 +36,8 @@ type PersistentVolumeClaimInterface interface {
Create(*v1.PersistentVolumeClaim) (*v1.PersistentVolumeClaim, error) Create(*v1.PersistentVolumeClaim) (*v1.PersistentVolumeClaim, error)
Update(*v1.PersistentVolumeClaim) (*v1.PersistentVolumeClaim, error) Update(*v1.PersistentVolumeClaim) (*v1.PersistentVolumeClaim, error)
UpdateStatus(*v1.PersistentVolumeClaim) (*v1.PersistentVolumeClaim, error) UpdateStatus(*v1.PersistentVolumeClaim) (*v1.PersistentVolumeClaim, error)
Delete(name string, options *v1.DeleteOptions) error Delete(name string, options *meta_v1.DeleteOptions) error
DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error
Get(name string, options meta_v1.GetOptions) (*v1.PersistentVolumeClaim, error) Get(name string, options meta_v1.GetOptions) (*v1.PersistentVolumeClaim, error)
List(opts meta_v1.ListOptions) (*v1.PersistentVolumeClaimList, error) List(opts meta_v1.ListOptions) (*v1.PersistentVolumeClaimList, error)
Watch(opts meta_v1.ListOptions) (watch.Interface, error) Watch(opts meta_v1.ListOptions) (watch.Interface, error)
@ -101,7 +101,7 @@ func (c *persistentVolumeClaims) UpdateStatus(persistentVolumeClaim *v1.Persiste
} }
// Delete takes name of the persistentVolumeClaim and deletes it. Returns an error if one occurs. // Delete takes name of the persistentVolumeClaim and deletes it. Returns an error if one occurs.
func (c *persistentVolumeClaims) Delete(name string, options *v1.DeleteOptions) error { func (c *persistentVolumeClaims) Delete(name string, options *meta_v1.DeleteOptions) error {
return c.client.Delete(). return c.client.Delete().
Namespace(c.ns). Namespace(c.ns).
Resource("persistentvolumeclaims"). Resource("persistentvolumeclaims").
@ -112,7 +112,7 @@ func (c *persistentVolumeClaims) Delete(name string, options *v1.DeleteOptions)
} }
// DeleteCollection deletes a collection of objects. // DeleteCollection deletes a collection of objects.
func (c *persistentVolumeClaims) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *persistentVolumeClaims) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
return c.client.Delete(). return c.client.Delete().
Namespace(c.ns). Namespace(c.ns).
Resource("persistentvolumeclaims"). Resource("persistentvolumeclaims").

8
kubernetes/typed/core/v1/pod.go
View File

@ -36,8 +36,8 @@ type PodInterface interface {
Create(*v1.Pod) (*v1.Pod, error) Create(*v1.Pod) (*v1.Pod, error)
Update(*v1.Pod) (*v1.Pod, error) Update(*v1.Pod) (*v1.Pod, error)
UpdateStatus(*v1.Pod) (*v1.Pod, error) UpdateStatus(*v1.Pod) (*v1.Pod, error)
Delete(name string, options *v1.DeleteOptions) error Delete(name string, options *meta_v1.DeleteOptions) error
DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error
Get(name string, options meta_v1.GetOptions) (*v1.Pod, error) Get(name string, options meta_v1.GetOptions) (*v1.Pod, error)
List(opts meta_v1.ListOptions) (*v1.PodList, error) List(opts meta_v1.ListOptions) (*v1.PodList, error)
Watch(opts meta_v1.ListOptions) (watch.Interface, error) Watch(opts meta_v1.ListOptions) (watch.Interface, error)
@ -101,7 +101,7 @@ func (c *pods) UpdateStatus(pod *v1.Pod) (result *v1.Pod, err error) {
} }
// Delete takes name of the pod and deletes it. Returns an error if one occurs. // Delete takes name of the pod and deletes it. Returns an error if one occurs.
func (c *pods) Delete(name string, options *v1.DeleteOptions) error { func (c *pods) Delete(name string, options *meta_v1.DeleteOptions) error {
return c.client.Delete(). return c.client.Delete().
Namespace(c.ns). Namespace(c.ns).
Resource("pods"). Resource("pods").
@ -112,7 +112,7 @@ func (c *pods) Delete(name string, options *v1.DeleteOptions) error {
} }
// DeleteCollection deletes a collection of objects. // DeleteCollection deletes a collection of objects.
func (c *pods) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *pods) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
return c.client.Delete(). return c.client.Delete().
Namespace(c.ns). Namespace(c.ns).
Resource("pods"). Resource("pods").

8
kubernetes/typed/core/v1/podtemplate.go
View File

@ -35,8 +35,8 @@ type PodTemplatesGetter interface {
type PodTemplateInterface interface { type PodTemplateInterface interface {
Create(*v1.PodTemplate) (*v1.PodTemplate, error) Create(*v1.PodTemplate) (*v1.PodTemplate, error)
Update(*v1.PodTemplate) (*v1.PodTemplate, error) Update(*v1.PodTemplate) (*v1.PodTemplate, error)
Delete(name string, options *v1.DeleteOptions) error Delete(name string, options *meta_v1.DeleteOptions) error
DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error
Get(name string, options meta_v1.GetOptions) (*v1.PodTemplate, error) Get(name string, options meta_v1.GetOptions) (*v1.PodTemplate, error)
List(opts meta_v1.ListOptions) (*v1.PodTemplateList, error) List(opts meta_v1.ListOptions) (*v1.PodTemplateList, error)
Watch(opts meta_v1.ListOptions) (watch.Interface, error) Watch(opts meta_v1.ListOptions) (watch.Interface, error)
@ -84,7 +84,7 @@ func (c *podTemplates) Update(podTemplate *v1.PodTemplate) (result *v1.PodTempla
} }
// Delete takes name of the podTemplate and deletes it. Returns an error if one occurs. // Delete takes name of the podTemplate and deletes it. Returns an error if one occurs.
func (c *podTemplates) Delete(name string, options *v1.DeleteOptions) error { func (c *podTemplates) Delete(name string, options *meta_v1.DeleteOptions) error {
return c.client.Delete(). return c.client.Delete().
Namespace(c.ns). Namespace(c.ns).
Resource("podtemplates"). Resource("podtemplates").
@ -95,7 +95,7 @@ func (c *podTemplates) Delete(name string, options *v1.DeleteOptions) error {
} }
// DeleteCollection deletes a collection of objects. // DeleteCollection deletes a collection of objects.
func (c *podTemplates) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *podTemplates) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
return c.client.Delete(). return c.client.Delete().
Namespace(c.ns). Namespace(c.ns).
Resource("podtemplates"). Resource("podtemplates").

8
kubernetes/typed/core/v1/replicationcontroller.go
View File

@ -36,8 +36,8 @@ type ReplicationControllerInterface interface {
Create(*v1.ReplicationController) (*v1.ReplicationController, error) Create(*v1.ReplicationController) (*v1.ReplicationController, error)
Update(*v1.ReplicationController) (*v1.ReplicationController, error) Update(*v1.ReplicationController) (*v1.ReplicationController, error)
UpdateStatus(*v1.ReplicationController) (*v1.ReplicationController, error) UpdateStatus(*v1.ReplicationController) (*v1.ReplicationController, error)
Delete(name string, options *v1.DeleteOptions) error Delete(name string, options *meta_v1.DeleteOptions) error
DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error
Get(name string, options meta_v1.GetOptions) (*v1.ReplicationController, error) Get(name string, options meta_v1.GetOptions) (*v1.ReplicationController, error)
List(opts meta_v1.ListOptions) (*v1.ReplicationControllerList, error) List(opts meta_v1.ListOptions) (*v1.ReplicationControllerList, error)
Watch(opts meta_v1.ListOptions) (watch.Interface, error) Watch(opts meta_v1.ListOptions) (watch.Interface, error)
@ -101,7 +101,7 @@ func (c *replicationControllers) UpdateStatus(replicationController *v1.Replicat
} }
// Delete takes name of the replicationController and deletes it. Returns an error if one occurs. // Delete takes name of the replicationController and deletes it. Returns an error if one occurs.
func (c *replicationControllers) Delete(name string, options *v1.DeleteOptions) error { func (c *replicationControllers) Delete(name string, options *meta_v1.DeleteOptions) error {
return c.client.Delete(). return c.client.Delete().
Namespace(c.ns). Namespace(c.ns).
Resource("replicationcontrollers"). Resource("replicationcontrollers").
@ -112,7 +112,7 @@ func (c *replicationControllers) Delete(name string, options *v1.DeleteOptions)
} }
// DeleteCollection deletes a collection of objects. // DeleteCollection deletes a collection of objects.
func (c *replicationControllers) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *replicationControllers) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
return c.client.Delete(). return c.client.Delete().
Namespace(c.ns). Namespace(c.ns).
Resource("replicationcontrollers"). Resource("replicationcontrollers").

8
kubernetes/typed/core/v1/resourcequota.go
View File

@ -36,8 +36,8 @@ type ResourceQuotaInterface interface {
Create(*v1.ResourceQuota) (*v1.ResourceQuota, error) Create(*v1.ResourceQuota) (*v1.ResourceQuota, error)
Update(*v1.ResourceQuota) (*v1.ResourceQuota, error) Update(*v1.ResourceQuota) (*v1.ResourceQuota, error)
UpdateStatus(*v1.ResourceQuota) (*v1.ResourceQuota, error) UpdateStatus(*v1.ResourceQuota) (*v1.ResourceQuota, error)
Delete(name string, options *v1.DeleteOptions) error Delete(name string, options *meta_v1.DeleteOptions) error
DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error
Get(name string, options meta_v1.GetOptions) (*v1.ResourceQuota, error) Get(name string, options meta_v1.GetOptions) (*v1.ResourceQuota, error)
List(opts meta_v1.ListOptions) (*v1.ResourceQuotaList, error) List(opts meta_v1.ListOptions) (*v1.ResourceQuotaList, error)
Watch(opts meta_v1.ListOptions) (watch.Interface, error) Watch(opts meta_v1.ListOptions) (watch.Interface, error)
@ -101,7 +101,7 @@ func (c *resourceQuotas) UpdateStatus(resourceQuota *v1.ResourceQuota) (result *
} }
// Delete takes name of the resourceQuota and deletes it. Returns an error if one occurs. // Delete takes name of the resourceQuota and deletes it. Returns an error if one occurs.
func (c *resourceQuotas) Delete(name string, options *v1.DeleteOptions) error { func (c *resourceQuotas) Delete(name string, options *meta_v1.DeleteOptions) error {
return c.client.Delete(). return c.client.Delete().
Namespace(c.ns). Namespace(c.ns).
Resource("resourcequotas"). Resource("resourcequotas").
@ -112,7 +112,7 @@ func (c *resourceQuotas) Delete(name string, options *v1.DeleteOptions) error {
} }
// DeleteCollection deletes a collection of objects. // DeleteCollection deletes a collection of objects.
func (c *resourceQuotas) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *resourceQuotas) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
return c.client.Delete(). return c.client.Delete().
Namespace(c.ns). Namespace(c.ns).
Resource("resourcequotas"). Resource("resourcequotas").

8
kubernetes/typed/core/v1/secret.go
View File

@ -35,8 +35,8 @@ type SecretsGetter interface {
type SecretInterface interface { type SecretInterface interface {
Create(*v1.Secret) (*v1.Secret, error) Create(*v1.Secret) (*v1.Secret, error)
Update(*v1.Secret) (*v1.Secret, error) Update(*v1.Secret) (*v1.Secret, error)
Delete(name string, options *v1.DeleteOptions) error Delete(name string, options *meta_v1.DeleteOptions) error
DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error
Get(name string, options meta_v1.GetOptions) (*v1.Secret, error) Get(name string, options meta_v1.GetOptions) (*v1.Secret, error)
List(opts meta_v1.ListOptions) (*v1.SecretList, error) List(opts meta_v1.ListOptions) (*v1.SecretList, error)
Watch(opts meta_v1.ListOptions) (watch.Interface, error) Watch(opts meta_v1.ListOptions) (watch.Interface, error)
@ -84,7 +84,7 @@ func (c *secrets) Update(secret *v1.Secret) (result *v1.Secret, err error) {
} }
// Delete takes name of the secret and deletes it. Returns an error if one occurs. // Delete takes name of the secret and deletes it. Returns an error if one occurs.
func (c *secrets) Delete(name string, options *v1.DeleteOptions) error { func (c *secrets) Delete(name string, options *meta_v1.DeleteOptions) error {
return c.client.Delete(). return c.client.Delete().
Namespace(c.ns). Namespace(c.ns).
Resource("secrets"). Resource("secrets").
@ -95,7 +95,7 @@ func (c *secrets) Delete(name string, options *v1.DeleteOptions) error {
} }
// DeleteCollection deletes a collection of objects. // DeleteCollection deletes a collection of objects.
func (c *secrets) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *secrets) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
return c.client.Delete(). return c.client.Delete().
Namespace(c.ns). Namespace(c.ns).
Resource("secrets"). Resource("secrets").

8
kubernetes/typed/core/v1/service.go
View File

@ -36,8 +36,8 @@ type ServiceInterface interface {
Create(*v1.Service) (*v1.Service, error) Create(*v1.Service) (*v1.Service, error)
Update(*v1.Service) (*v1.Service, error) Update(*v1.Service) (*v1.Service, error)
UpdateStatus(*v1.Service) (*v1.Service, error) UpdateStatus(*v1.Service) (*v1.Service, error)
Delete(name string, options *v1.DeleteOptions) error Delete(name string, options *meta_v1.DeleteOptions) error
DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error
Get(name string, options meta_v1.GetOptions) (*v1.Service, error) Get(name string, options meta_v1.GetOptions) (*v1.Service, error)
List(opts meta_v1.ListOptions) (*v1.ServiceList, error) List(opts meta_v1.ListOptions) (*v1.ServiceList, error)
Watch(opts meta_v1.ListOptions) (watch.Interface, error) Watch(opts meta_v1.ListOptions) (watch.Interface, error)
@ -101,7 +101,7 @@ 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. // Delete takes name of the service and deletes it. Returns an error if one occurs.
func (c *services) Delete(name string, options *v1.DeleteOptions) error { func (c *services) Delete(name string, options *meta_v1.DeleteOptions) error {
return c.client.Delete(). return c.client.Delete().
Namespace(c.ns). Namespace(c.ns).
Resource("services"). Resource("services").
@ -112,7 +112,7 @@ func (c *services) Delete(name string, options *v1.DeleteOptions) error {
} }
// DeleteCollection deletes a collection of objects. // DeleteCollection deletes a collection of objects.
func (c *services) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *services) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
return c.client.Delete(). return c.client.Delete().
Namespace(c.ns). Namespace(c.ns).
Resource("services"). Resource("services").

8
kubernetes/typed/core/v1/serviceaccount.go
View File

@ -35,8 +35,8 @@ type ServiceAccountsGetter interface {
type ServiceAccountInterface interface { type ServiceAccountInterface interface {
Create(*v1.ServiceAccount) (*v1.ServiceAccount, error) Create(*v1.ServiceAccount) (*v1.ServiceAccount, error)
Update(*v1.ServiceAccount) (*v1.ServiceAccount, error) Update(*v1.ServiceAccount) (*v1.ServiceAccount, error)
Delete(name string, options *v1.DeleteOptions) error Delete(name string, options *meta_v1.DeleteOptions) error
DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error
Get(name string, options meta_v1.GetOptions) (*v1.ServiceAccount, error) Get(name string, options meta_v1.GetOptions) (*v1.ServiceAccount, error)
List(opts meta_v1.ListOptions) (*v1.ServiceAccountList, error) List(opts meta_v1.ListOptions) (*v1.ServiceAccountList, error)
Watch(opts meta_v1.ListOptions) (watch.Interface, error) Watch(opts meta_v1.ListOptions) (watch.Interface, error)
@ -84,7 +84,7 @@ func (c *serviceAccounts) Update(serviceAccount *v1.ServiceAccount) (result *v1.
} }
// Delete takes name of the serviceAccount and deletes it. Returns an error if one occurs. // Delete takes name of the serviceAccount and deletes it. Returns an error if one occurs.
func (c *serviceAccounts) Delete(name string, options *v1.DeleteOptions) error { func (c *serviceAccounts) Delete(name string, options *meta_v1.DeleteOptions) error {
return c.client.Delete(). return c.client.Delete().
Namespace(c.ns). Namespace(c.ns).
Resource("serviceaccounts"). Resource("serviceaccounts").
@ -95,7 +95,7 @@ func (c *serviceAccounts) Delete(name string, options *v1.DeleteOptions) error {
} }
// DeleteCollection deletes a collection of objects. // DeleteCollection deletes a collection of objects.
func (c *serviceAccounts) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *serviceAccounts) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
return c.client.Delete(). return c.client.Delete().
Namespace(c.ns). Namespace(c.ns).
Resource("serviceaccounts"). Resource("serviceaccounts").

19
kubernetes/typed/extensions/v1beta1/daemonset.go
View File

@ -17,11 +17,10 @@ limitations under the License.
package v1beta1 package v1beta1
import ( import (
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
types "k8s.io/apimachinery/pkg/types" types "k8s.io/apimachinery/pkg/types"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
api "k8s.io/client-go/pkg/api" api "k8s.io/client-go/pkg/api"
v1 "k8s.io/client-go/pkg/api/v1"
v1beta1 "k8s.io/client-go/pkg/apis/extensions/v1beta1" v1beta1 "k8s.io/client-go/pkg/apis/extensions/v1beta1"
rest "k8s.io/client-go/rest" rest "k8s.io/client-go/rest"
) )
@ -38,10 +37,10 @@ type DaemonSetInterface interface {
Update(*v1beta1.DaemonSet) (*v1beta1.DaemonSet, error) Update(*v1beta1.DaemonSet) (*v1beta1.DaemonSet, error)
UpdateStatus(*v1beta1.DaemonSet) (*v1beta1.DaemonSet, error) UpdateStatus(*v1beta1.DaemonSet) (*v1beta1.DaemonSet, error)
Delete(name string, options *v1.DeleteOptions) error Delete(name string, options *v1.DeleteOptions) error
DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
Get(name string, options meta_v1.GetOptions) (*v1beta1.DaemonSet, error) Get(name string, options v1.GetOptions) (*v1beta1.DaemonSet, error)
List(opts meta_v1.ListOptions) (*v1beta1.DaemonSetList, error) List(opts v1.ListOptions) (*v1beta1.DaemonSetList, error)
Watch(opts meta_v1.ListOptions) (watch.Interface, error) Watch(opts v1.ListOptions) (watch.Interface, error)
Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.DaemonSet, err error) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.DaemonSet, err error)
DaemonSetExpansion DaemonSetExpansion
} }
@ -113,7 +112,7 @@ func (c *daemonSets) Delete(name string, options *v1.DeleteOptions) error {
} }
// DeleteCollection deletes a collection of objects. // DeleteCollection deletes a collection of objects.
func (c *daemonSets) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *daemonSets) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
return c.client.Delete(). return c.client.Delete().
Namespace(c.ns). Namespace(c.ns).
Resource("daemonsets"). Resource("daemonsets").
@ -124,7 +123,7 @@ func (c *daemonSets) DeleteCollection(options *v1.DeleteOptions, listOptions met
} }
// Get takes name of the daemonSet, and returns the corresponding daemonSet object, and an error if there is any. // Get takes name of the daemonSet, and returns the corresponding daemonSet object, and an error if there is any.
func (c *daemonSets) Get(name string, options meta_v1.GetOptions) (result *v1beta1.DaemonSet, err error) { func (c *daemonSets) Get(name string, options v1.GetOptions) (result *v1beta1.DaemonSet, err error) {
result = &v1beta1.DaemonSet{} result = &v1beta1.DaemonSet{}
err = c.client.Get(). err = c.client.Get().
Namespace(c.ns). Namespace(c.ns).
@ -137,7 +136,7 @@ func (c *daemonSets) Get(name string, options meta_v1.GetOptions) (result *v1bet
} }
// List takes label and field selectors, and returns the list of DaemonSets that match those selectors. // List takes label and field selectors, and returns the list of DaemonSets that match those selectors.
func (c *daemonSets) List(opts meta_v1.ListOptions) (result *v1beta1.DaemonSetList, err error) { func (c *daemonSets) List(opts v1.ListOptions) (result *v1beta1.DaemonSetList, err error) {
result = &v1beta1.DaemonSetList{} result = &v1beta1.DaemonSetList{}
err = c.client.Get(). err = c.client.Get().
Namespace(c.ns). Namespace(c.ns).
@ -149,7 +148,7 @@ func (c *daemonSets) List(opts meta_v1.ListOptions) (result *v1beta1.DaemonSetLi
} }
// Watch returns a watch.Interface that watches the requested daemonSets. // Watch returns a watch.Interface that watches the requested daemonSets.
func (c *daemonSets) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { func (c *daemonSets) Watch(opts v1.ListOptions) (watch.Interface, error) {
return c.client.Get(). return c.client.Get().
Prefix("watch"). Prefix("watch").
Namespace(c.ns). Namespace(c.ns).

19
kubernetes/typed/extensions/v1beta1/deployment.go
View File

@ -17,11 +17,10 @@ limitations under the License.
package v1beta1 package v1beta1
import ( import (
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
types "k8s.io/apimachinery/pkg/types" types "k8s.io/apimachinery/pkg/types"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
api "k8s.io/client-go/pkg/api" api "k8s.io/client-go/pkg/api"
v1 "k8s.io/client-go/pkg/api/v1"
v1beta1 "k8s.io/client-go/pkg/apis/extensions/v1beta1" v1beta1 "k8s.io/client-go/pkg/apis/extensions/v1beta1"
rest "k8s.io/client-go/rest" rest "k8s.io/client-go/rest"
) )
@ -38,10 +37,10 @@ type DeploymentInterface interface {
Update(*v1beta1.Deployment) (*v1beta1.Deployment, error) Update(*v1beta1.Deployment) (*v1beta1.Deployment, error)
UpdateStatus(*v1beta1.Deployment) (*v1beta1.Deployment, error) UpdateStatus(*v1beta1.Deployment) (*v1beta1.Deployment, error)
Delete(name string, options *v1.DeleteOptions) error Delete(name string, options *v1.DeleteOptions) error
DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
Get(name string, options meta_v1.GetOptions) (*v1beta1.Deployment, error) Get(name string, options v1.GetOptions) (*v1beta1.Deployment, error)
List(opts meta_v1.ListOptions) (*v1beta1.DeploymentList, error) List(opts v1.ListOptions) (*v1beta1.DeploymentList, error)
Watch(opts meta_v1.ListOptions) (watch.Interface, error) Watch(opts v1.ListOptions) (watch.Interface, error)
Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.Deployment, err error) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.Deployment, err error)
DeploymentExpansion DeploymentExpansion
} }
@ -113,7 +112,7 @@ func (c *deployments) Delete(name string, options *v1.DeleteOptions) error {
} }
// DeleteCollection deletes a collection of objects. // DeleteCollection deletes a collection of objects.
func (c *deployments) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *deployments) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
return c.client.Delete(). return c.client.Delete().
Namespace(c.ns). Namespace(c.ns).
Resource("deployments"). Resource("deployments").
@ -124,7 +123,7 @@ func (c *deployments) DeleteCollection(options *v1.DeleteOptions, listOptions me
} }
// Get takes name of the deployment, and returns the corresponding deployment object, and an error if there is any. // Get takes name of the deployment, and returns the corresponding deployment object, and an error if there is any.
func (c *deployments) Get(name string, options meta_v1.GetOptions) (result *v1beta1.Deployment, err error) { func (c *deployments) Get(name string, options v1.GetOptions) (result *v1beta1.Deployment, err error) {
result = &v1beta1.Deployment{} result = &v1beta1.Deployment{}
err = c.client.Get(). err = c.client.Get().
Namespace(c.ns). Namespace(c.ns).
@ -137,7 +136,7 @@ func (c *deployments) Get(name string, options meta_v1.GetOptions) (result *v1be
} }
// List takes label and field selectors, and returns the list of Deployments that match those selectors. // List takes label and field selectors, and returns the list of Deployments that match those selectors.
func (c *deployments) List(opts meta_v1.ListOptions) (result *v1beta1.DeploymentList, err error) { func (c *deployments) List(opts v1.ListOptions) (result *v1beta1.DeploymentList, err error) {
result = &v1beta1.DeploymentList{} result = &v1beta1.DeploymentList{}
err = c.client.Get(). err = c.client.Get().
Namespace(c.ns). Namespace(c.ns).
@ -149,7 +148,7 @@ func (c *deployments) List(opts meta_v1.ListOptions) (result *v1beta1.Deployment
} }
// Watch returns a watch.Interface that watches the requested deployments. // Watch returns a watch.Interface that watches the requested deployments.
func (c *deployments) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { func (c *deployments) Watch(opts v1.ListOptions) (watch.Interface, error) {
return c.client.Get(). return c.client.Get().
Prefix("watch"). Prefix("watch").
Namespace(c.ns). Namespace(c.ns).

11
kubernetes/typed/extensions/v1beta1/fake/fake_daemonset.go
View File

@ -17,12 +17,11 @@ limitations under the License.
package fake package fake
import ( import (
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
labels "k8s.io/apimachinery/pkg/labels" labels "k8s.io/apimachinery/pkg/labels"
schema "k8s.io/apimachinery/pkg/runtime/schema" schema "k8s.io/apimachinery/pkg/runtime/schema"
types "k8s.io/apimachinery/pkg/types" types "k8s.io/apimachinery/pkg/types"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
v1 "k8s.io/client-go/pkg/api/v1"
v1beta1 "k8s.io/client-go/pkg/apis/extensions/v1beta1" v1beta1 "k8s.io/client-go/pkg/apis/extensions/v1beta1"
testing "k8s.io/client-go/testing" testing "k8s.io/client-go/testing"
) )
@ -72,14 +71,14 @@ func (c *FakeDaemonSets) Delete(name string, options *v1.DeleteOptions) error {
return err return err
} }
func (c *FakeDaemonSets) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *FakeDaemonSets) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
action := testing.NewDeleteCollectionAction(daemonsetsResource, c.ns, listOptions) action := testing.NewDeleteCollectionAction(daemonsetsResource, c.ns, listOptions)
_, err := c.Fake.Invokes(action, &v1beta1.DaemonSetList{}) _, err := c.Fake.Invokes(action, &v1beta1.DaemonSetList{})
return err return err
} }
func (c *FakeDaemonSets) Get(name string, options meta_v1.GetOptions) (result *v1beta1.DaemonSet, err error) { func (c *FakeDaemonSets) Get(name string, options v1.GetOptions) (result *v1beta1.DaemonSet, err error) {
obj, err := c.Fake. obj, err := c.Fake.
Invokes(testing.NewGetAction(daemonsetsResource, c.ns, name), &v1beta1.DaemonSet{}) Invokes(testing.NewGetAction(daemonsetsResource, c.ns, name), &v1beta1.DaemonSet{})
@ -89,7 +88,7 @@ func (c *FakeDaemonSets) Get(name string, options meta_v1.GetOptions) (result *v
return obj.(*v1beta1.DaemonSet), err return obj.(*v1beta1.DaemonSet), err
} }
func (c *FakeDaemonSets) List(opts meta_v1.ListOptions) (result *v1beta1.DaemonSetList, err error) { func (c *FakeDaemonSets) List(opts v1.ListOptions) (result *v1beta1.DaemonSetList, err error) {
obj, err := c.Fake. obj, err := c.Fake.
Invokes(testing.NewListAction(daemonsetsResource, c.ns, opts), &v1beta1.DaemonSetList{}) Invokes(testing.NewListAction(daemonsetsResource, c.ns, opts), &v1beta1.DaemonSetList{})
@ -111,7 +110,7 @@ func (c *FakeDaemonSets) List(opts meta_v1.ListOptions) (result *v1beta1.DaemonS
} }
// Watch returns a watch.Interface that watches the requested daemonSets. // Watch returns a watch.Interface that watches the requested daemonSets.
func (c *FakeDaemonSets) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { func (c *FakeDaemonSets) Watch(opts v1.ListOptions) (watch.Interface, error) {
return c.Fake. return c.Fake.
InvokesWatch(testing.NewWatchAction(daemonsetsResource, c.ns, opts)) InvokesWatch(testing.NewWatchAction(daemonsetsResource, c.ns, opts))

11
kubernetes/typed/extensions/v1beta1/fake/fake_deployment.go
View File

@ -17,12 +17,11 @@ limitations under the License.
package fake package fake
import ( import (
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
labels "k8s.io/apimachinery/pkg/labels" labels "k8s.io/apimachinery/pkg/labels"
schema "k8s.io/apimachinery/pkg/runtime/schema" schema "k8s.io/apimachinery/pkg/runtime/schema"
types "k8s.io/apimachinery/pkg/types" types "k8s.io/apimachinery/pkg/types"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
v1 "k8s.io/client-go/pkg/api/v1"
v1beta1 "k8s.io/client-go/pkg/apis/extensions/v1beta1" v1beta1 "k8s.io/client-go/pkg/apis/extensions/v1beta1"
testing "k8s.io/client-go/testing" testing "k8s.io/client-go/testing"
) )
@ -72,14 +71,14 @@ func (c *FakeDeployments) Delete(name string, options *v1.DeleteOptions) error {
return err return err
} }
func (c *FakeDeployments) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *FakeDeployments) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
action := testing.NewDeleteCollectionAction(deploymentsResource, c.ns, listOptions) action := testing.NewDeleteCollectionAction(deploymentsResource, c.ns, listOptions)
_, err := c.Fake.Invokes(action, &v1beta1.DeploymentList{}) _, err := c.Fake.Invokes(action, &v1beta1.DeploymentList{})
return err return err
} }
func (c *FakeDeployments) Get(name string, options meta_v1.GetOptions) (result *v1beta1.Deployment, err error) { func (c *FakeDeployments) Get(name string, options v1.GetOptions) (result *v1beta1.Deployment, err error) {
obj, err := c.Fake. obj, err := c.Fake.
Invokes(testing.NewGetAction(deploymentsResource, c.ns, name), &v1beta1.Deployment{}) Invokes(testing.NewGetAction(deploymentsResource, c.ns, name), &v1beta1.Deployment{})
@ -89,7 +88,7 @@ func (c *FakeDeployments) Get(name string, options meta_v1.GetOptions) (result *
return obj.(*v1beta1.Deployment), err return obj.(*v1beta1.Deployment), err
} }
func (c *FakeDeployments) List(opts meta_v1.ListOptions) (result *v1beta1.DeploymentList, err error) { func (c *FakeDeployments) List(opts v1.ListOptions) (result *v1beta1.DeploymentList, err error) {
obj, err := c.Fake. obj, err := c.Fake.
Invokes(testing.NewListAction(deploymentsResource, c.ns, opts), &v1beta1.DeploymentList{}) Invokes(testing.NewListAction(deploymentsResource, c.ns, opts), &v1beta1.DeploymentList{})
@ -111,7 +110,7 @@ func (c *FakeDeployments) List(opts meta_v1.ListOptions) (result *v1beta1.Deploy
} }
// Watch returns a watch.Interface that watches the requested deployments. // Watch returns a watch.Interface that watches the requested deployments.
func (c *FakeDeployments) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { func (c *FakeDeployments) Watch(opts v1.ListOptions) (watch.Interface, error) {
return c.Fake. return c.Fake.
InvokesWatch(testing.NewWatchAction(deploymentsResource, c.ns, opts)) InvokesWatch(testing.NewWatchAction(deploymentsResource, c.ns, opts))

11
kubernetes/typed/extensions/v1beta1/fake/fake_ingress.go
View File

@ -17,12 +17,11 @@ limitations under the License.
package fake package fake
import ( import (
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
labels "k8s.io/apimachinery/pkg/labels" labels "k8s.io/apimachinery/pkg/labels"
schema "k8s.io/apimachinery/pkg/runtime/schema" schema "k8s.io/apimachinery/pkg/runtime/schema"
types "k8s.io/apimachinery/pkg/types" types "k8s.io/apimachinery/pkg/types"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
v1 "k8s.io/client-go/pkg/api/v1"
v1beta1 "k8s.io/client-go/pkg/apis/extensions/v1beta1" v1beta1 "k8s.io/client-go/pkg/apis/extensions/v1beta1"
testing "k8s.io/client-go/testing" testing "k8s.io/client-go/testing"
) )
@ -72,14 +71,14 @@ func (c *FakeIngresses) Delete(name string, options *v1.DeleteOptions) error {
return err return err
} }
func (c *FakeIngresses) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *FakeIngresses) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
action := testing.NewDeleteCollectionAction(ingressesResource, c.ns, listOptions) action := testing.NewDeleteCollectionAction(ingressesResource, c.ns, listOptions)
_, err := c.Fake.Invokes(action, &v1beta1.IngressList{}) _, err := c.Fake.Invokes(action, &v1beta1.IngressList{})
return err return err
} }
func (c *FakeIngresses) Get(name string, options meta_v1.GetOptions) (result *v1beta1.Ingress, err error) { func (c *FakeIngresses) Get(name string, options v1.GetOptions) (result *v1beta1.Ingress, err error) {
obj, err := c.Fake. obj, err := c.Fake.
Invokes(testing.NewGetAction(ingressesResource, c.ns, name), &v1beta1.Ingress{}) Invokes(testing.NewGetAction(ingressesResource, c.ns, name), &v1beta1.Ingress{})
@ -89,7 +88,7 @@ func (c *FakeIngresses) Get(name string, options meta_v1.GetOptions) (result *v1
return obj.(*v1beta1.Ingress), err return obj.(*v1beta1.Ingress), err
} }
func (c *FakeIngresses) List(opts meta_v1.ListOptions) (result *v1beta1.IngressList, err error) { func (c *FakeIngresses) List(opts v1.ListOptions) (result *v1beta1.IngressList, err error) {
obj, err := c.Fake. obj, err := c.Fake.
Invokes(testing.NewListAction(ingressesResource, c.ns, opts), &v1beta1.IngressList{}) Invokes(testing.NewListAction(ingressesResource, c.ns, opts), &v1beta1.IngressList{})
@ -111,7 +110,7 @@ func (c *FakeIngresses) List(opts meta_v1.ListOptions) (result *v1beta1.IngressL
} }
// Watch returns a watch.Interface that watches the requested ingresses. // Watch returns a watch.Interface that watches the requested ingresses.
func (c *FakeIngresses) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { func (c *FakeIngresses) Watch(opts v1.ListOptions) (watch.Interface, error) {
return c.Fake. return c.Fake.
InvokesWatch(testing.NewWatchAction(ingressesResource, c.ns, opts)) InvokesWatch(testing.NewWatchAction(ingressesResource, c.ns, opts))

11
kubernetes/typed/extensions/v1beta1/fake/fake_podsecuritypolicy.go
View File

@ -17,12 +17,11 @@ limitations under the License.
package fake package fake
import ( import (
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
labels "k8s.io/apimachinery/pkg/labels" labels "k8s.io/apimachinery/pkg/labels"
schema "k8s.io/apimachinery/pkg/runtime/schema" schema "k8s.io/apimachinery/pkg/runtime/schema"
types "k8s.io/apimachinery/pkg/types" types "k8s.io/apimachinery/pkg/types"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
v1 "k8s.io/client-go/pkg/api/v1"
v1beta1 "k8s.io/client-go/pkg/apis/extensions/v1beta1" v1beta1 "k8s.io/client-go/pkg/apis/extensions/v1beta1"
testing "k8s.io/client-go/testing" testing "k8s.io/client-go/testing"
) )
@ -58,14 +57,14 @@ func (c *FakePodSecurityPolicies) Delete(name string, options *v1.DeleteOptions)
return err return err
} }
func (c *FakePodSecurityPolicies) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *FakePodSecurityPolicies) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
action := testing.NewRootDeleteCollectionAction(podsecuritypoliciesResource, listOptions) action := testing.NewRootDeleteCollectionAction(podsecuritypoliciesResource, listOptions)
_, err := c.Fake.Invokes(action, &v1beta1.PodSecurityPolicyList{}) _, err := c.Fake.Invokes(action, &v1beta1.PodSecurityPolicyList{})
return err return err
} }
func (c *FakePodSecurityPolicies) Get(name string, options meta_v1.GetOptions) (result *v1beta1.PodSecurityPolicy, err error) { func (c *FakePodSecurityPolicies) Get(name string, options v1.GetOptions) (result *v1beta1.PodSecurityPolicy, err error) {
obj, err := c.Fake. obj, err := c.Fake.
Invokes(testing.NewRootGetAction(podsecuritypoliciesResource, name), &v1beta1.PodSecurityPolicy{}) Invokes(testing.NewRootGetAction(podsecuritypoliciesResource, name), &v1beta1.PodSecurityPolicy{})
if obj == nil { if obj == nil {
@ -74,7 +73,7 @@ func (c *FakePodSecurityPolicies) Get(name string, options meta_v1.GetOptions) (
return obj.(*v1beta1.PodSecurityPolicy), err return obj.(*v1beta1.PodSecurityPolicy), err
} }
func (c *FakePodSecurityPolicies) List(opts meta_v1.ListOptions) (result *v1beta1.PodSecurityPolicyList, err error) { func (c *FakePodSecurityPolicies) List(opts v1.ListOptions) (result *v1beta1.PodSecurityPolicyList, err error) {
obj, err := c.Fake. obj, err := c.Fake.
Invokes(testing.NewRootListAction(podsecuritypoliciesResource, opts), &v1beta1.PodSecurityPolicyList{}) Invokes(testing.NewRootListAction(podsecuritypoliciesResource, opts), &v1beta1.PodSecurityPolicyList{})
if obj == nil { if obj == nil {
@ -95,7 +94,7 @@ func (c *FakePodSecurityPolicies) List(opts meta_v1.ListOptions) (result *v1beta
} }
// Watch returns a watch.Interface that watches the requested podSecurityPolicies. // Watch returns a watch.Interface that watches the requested podSecurityPolicies.
func (c *FakePodSecurityPolicies) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { func (c *FakePodSecurityPolicies) Watch(opts v1.ListOptions) (watch.Interface, error) {
return c.Fake. return c.Fake.
InvokesWatch(testing.NewRootWatchAction(podsecuritypoliciesResource, opts)) InvokesWatch(testing.NewRootWatchAction(podsecuritypoliciesResource, opts))
} }

11
kubernetes/typed/extensions/v1beta1/fake/fake_replicaset.go
View File

@ -17,12 +17,11 @@ limitations under the License.
package fake package fake
import ( import (
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
labels "k8s.io/apimachinery/pkg/labels" labels "k8s.io/apimachinery/pkg/labels"
schema "k8s.io/apimachinery/pkg/runtime/schema" schema "k8s.io/apimachinery/pkg/runtime/schema"
types "k8s.io/apimachinery/pkg/types" types "k8s.io/apimachinery/pkg/types"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
v1 "k8s.io/client-go/pkg/api/v1"
v1beta1 "k8s.io/client-go/pkg/apis/extensions/v1beta1" v1beta1 "k8s.io/client-go/pkg/apis/extensions/v1beta1"
testing "k8s.io/client-go/testing" testing "k8s.io/client-go/testing"
) )
@ -72,14 +71,14 @@ func (c *FakeReplicaSets) Delete(name string, options *v1.DeleteOptions) error {
return err return err
} }
func (c *FakeReplicaSets) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *FakeReplicaSets) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
action := testing.NewDeleteCollectionAction(replicasetsResource, c.ns, listOptions) action := testing.NewDeleteCollectionAction(replicasetsResource, c.ns, listOptions)
_, err := c.Fake.Invokes(action, &v1beta1.ReplicaSetList{}) _, err := c.Fake.Invokes(action, &v1beta1.ReplicaSetList{})
return err return err
} }
func (c *FakeReplicaSets) Get(name string, options meta_v1.GetOptions) (result *v1beta1.ReplicaSet, err error) { func (c *FakeReplicaSets) Get(name string, options v1.GetOptions) (result *v1beta1.ReplicaSet, err error) {
obj, err := c.Fake. obj, err := c.Fake.
Invokes(testing.NewGetAction(replicasetsResource, c.ns, name), &v1beta1.ReplicaSet{}) Invokes(testing.NewGetAction(replicasetsResource, c.ns, name), &v1beta1.ReplicaSet{})
@ -89,7 +88,7 @@ func (c *FakeReplicaSets) Get(name string, options meta_v1.GetOptions) (result *
return obj.(*v1beta1.ReplicaSet), err return obj.(*v1beta1.ReplicaSet), err
} }
func (c *FakeReplicaSets) List(opts meta_v1.ListOptions) (result *v1beta1.ReplicaSetList, err error) { func (c *FakeReplicaSets) List(opts v1.ListOptions) (result *v1beta1.ReplicaSetList, err error) {
obj, err := c.Fake. obj, err := c.Fake.
Invokes(testing.NewListAction(replicasetsResource, c.ns, opts), &v1beta1.ReplicaSetList{}) Invokes(testing.NewListAction(replicasetsResource, c.ns, opts), &v1beta1.ReplicaSetList{})
@ -111,7 +110,7 @@ func (c *FakeReplicaSets) List(opts meta_v1.ListOptions) (result *v1beta1.Replic
} }
// Watch returns a watch.Interface that watches the requested replicaSets. // Watch returns a watch.Interface that watches the requested replicaSets.
func (c *FakeReplicaSets) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { func (c *FakeReplicaSets) Watch(opts v1.ListOptions) (watch.Interface, error) {
return c.Fake. return c.Fake.
InvokesWatch(testing.NewWatchAction(replicasetsResource, c.ns, opts)) InvokesWatch(testing.NewWatchAction(replicasetsResource, c.ns, opts))

11
kubernetes/typed/extensions/v1beta1/fake/fake_thirdpartyresource.go
View File

@ -17,12 +17,11 @@ limitations under the License.
package fake package fake
import ( import (
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
labels "k8s.io/apimachinery/pkg/labels" labels "k8s.io/apimachinery/pkg/labels"
schema "k8s.io/apimachinery/pkg/runtime/schema" schema "k8s.io/apimachinery/pkg/runtime/schema"
types "k8s.io/apimachinery/pkg/types" types "k8s.io/apimachinery/pkg/types"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
v1 "k8s.io/client-go/pkg/api/v1"
v1beta1 "k8s.io/client-go/pkg/apis/extensions/v1beta1" v1beta1 "k8s.io/client-go/pkg/apis/extensions/v1beta1"
testing "k8s.io/client-go/testing" testing "k8s.io/client-go/testing"
) )
@ -58,14 +57,14 @@ func (c *FakeThirdPartyResources) Delete(name string, options *v1.DeleteOptions)
return err return err
} }
func (c *FakeThirdPartyResources) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *FakeThirdPartyResources) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
action := testing.NewRootDeleteCollectionAction(thirdpartyresourcesResource, listOptions) action := testing.NewRootDeleteCollectionAction(thirdpartyresourcesResource, listOptions)
_, err := c.Fake.Invokes(action, &v1beta1.ThirdPartyResourceList{}) _, err := c.Fake.Invokes(action, &v1beta1.ThirdPartyResourceList{})
return err return err
} }
func (c *FakeThirdPartyResources) Get(name string, options meta_v1.GetOptions) (result *v1beta1.ThirdPartyResource, err error) { func (c *FakeThirdPartyResources) Get(name string, options v1.GetOptions) (result *v1beta1.ThirdPartyResource, err error) {
obj, err := c.Fake. obj, err := c.Fake.
Invokes(testing.NewRootGetAction(thirdpartyresourcesResource, name), &v1beta1.ThirdPartyResource{}) Invokes(testing.NewRootGetAction(thirdpartyresourcesResource, name), &v1beta1.ThirdPartyResource{})
if obj == nil { if obj == nil {
@ -74,7 +73,7 @@ func (c *FakeThirdPartyResources) Get(name string, options meta_v1.GetOptions) (
return obj.(*v1beta1.ThirdPartyResource), err return obj.(*v1beta1.ThirdPartyResource), err
} }
func (c *FakeThirdPartyResources) List(opts meta_v1.ListOptions) (result *v1beta1.ThirdPartyResourceList, err error) { func (c *FakeThirdPartyResources) List(opts v1.ListOptions) (result *v1beta1.ThirdPartyResourceList, err error) {
obj, err := c.Fake. obj, err := c.Fake.
Invokes(testing.NewRootListAction(thirdpartyresourcesResource, opts), &v1beta1.ThirdPartyResourceList{}) Invokes(testing.NewRootListAction(thirdpartyresourcesResource, opts), &v1beta1.ThirdPartyResourceList{})
if obj == nil { if obj == nil {
@ -95,7 +94,7 @@ func (c *FakeThirdPartyResources) List(opts meta_v1.ListOptions) (result *v1beta
} }
// Watch returns a watch.Interface that watches the requested thirdPartyResources. // Watch returns a watch.Interface that watches the requested thirdPartyResources.
func (c *FakeThirdPartyResources) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { func (c *FakeThirdPartyResources) Watch(opts v1.ListOptions) (watch.Interface, error) {
return c.Fake. return c.Fake.
InvokesWatch(testing.NewRootWatchAction(thirdpartyresourcesResource, opts)) InvokesWatch(testing.NewRootWatchAction(thirdpartyresourcesResource, opts))
} }

19
kubernetes/typed/extensions/v1beta1/ingress.go
View File

@ -17,11 +17,10 @@ limitations under the License.
package v1beta1 package v1beta1
import ( import (
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
types "k8s.io/apimachinery/pkg/types" types "k8s.io/apimachinery/pkg/types"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
api "k8s.io/client-go/pkg/api" api "k8s.io/client-go/pkg/api"
v1 "k8s.io/client-go/pkg/api/v1"
v1beta1 "k8s.io/client-go/pkg/apis/extensions/v1beta1" v1beta1 "k8s.io/client-go/pkg/apis/extensions/v1beta1"
rest "k8s.io/client-go/rest" rest "k8s.io/client-go/rest"
) )
@ -38,10 +37,10 @@ type IngressInterface interface {
Update(*v1beta1.Ingress) (*v1beta1.Ingress, error) Update(*v1beta1.Ingress) (*v1beta1.Ingress, error)
UpdateStatus(*v1beta1.Ingress) (*v1beta1.Ingress, error) UpdateStatus(*v1beta1.Ingress) (*v1beta1.Ingress, error)
Delete(name string, options *v1.DeleteOptions) error Delete(name string, options *v1.DeleteOptions) error
DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
Get(name string, options meta_v1.GetOptions) (*v1beta1.Ingress, error) Get(name string, options v1.GetOptions) (*v1beta1.Ingress, error)
List(opts meta_v1.ListOptions) (*v1beta1.IngressList, error) List(opts v1.ListOptions) (*v1beta1.IngressList, error)
Watch(opts meta_v1.ListOptions) (watch.Interface, error) Watch(opts v1.ListOptions) (watch.Interface, error)
Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.Ingress, err error) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.Ingress, err error)
IngressExpansion IngressExpansion
} }
@ -113,7 +112,7 @@ func (c *ingresses) Delete(name string, options *v1.DeleteOptions) error {
} }
// DeleteCollection deletes a collection of objects. // DeleteCollection deletes a collection of objects.
func (c *ingresses) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *ingresses) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
return c.client.Delete(). return c.client.Delete().
Namespace(c.ns). Namespace(c.ns).
Resource("ingresses"). Resource("ingresses").
@ -124,7 +123,7 @@ func (c *ingresses) DeleteCollection(options *v1.DeleteOptions, listOptions meta
} }
// Get takes name of the ingress, and returns the corresponding ingress object, and an error if there is any. // Get takes name of the ingress, and returns the corresponding ingress object, and an error if there is any.
func (c *ingresses) Get(name string, options meta_v1.GetOptions) (result *v1beta1.Ingress, err error) { func (c *ingresses) Get(name string, options v1.GetOptions) (result *v1beta1.Ingress, err error) {
result = &v1beta1.Ingress{} result = &v1beta1.Ingress{}
err = c.client.Get(). err = c.client.Get().
Namespace(c.ns). Namespace(c.ns).
@ -137,7 +136,7 @@ func (c *ingresses) Get(name string, options meta_v1.GetOptions) (result *v1beta
} }
// List takes label and field selectors, and returns the list of Ingresses that match those selectors. // List takes label and field selectors, and returns the list of Ingresses that match those selectors.
func (c *ingresses) List(opts meta_v1.ListOptions) (result *v1beta1.IngressList, err error) { func (c *ingresses) List(opts v1.ListOptions) (result *v1beta1.IngressList, err error) {
result = &v1beta1.IngressList{} result = &v1beta1.IngressList{}
err = c.client.Get(). err = c.client.Get().
Namespace(c.ns). Namespace(c.ns).
@ -149,7 +148,7 @@ func (c *ingresses) List(opts meta_v1.ListOptions) (result *v1beta1.IngressList,
} }
// Watch returns a watch.Interface that watches the requested ingresses. // Watch returns a watch.Interface that watches the requested ingresses.
func (c *ingresses) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { func (c *ingresses) Watch(opts v1.ListOptions) (watch.Interface, error) {
return c.client.Get(). return c.client.Get().
Prefix("watch"). Prefix("watch").
Namespace(c.ns). Namespace(c.ns).

19
kubernetes/typed/extensions/v1beta1/podsecuritypolicy.go
View File

@ -17,11 +17,10 @@ limitations under the License.
package v1beta1 package v1beta1
import ( import (
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
types "k8s.io/apimachinery/pkg/types" types "k8s.io/apimachinery/pkg/types"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
api "k8s.io/client-go/pkg/api" api "k8s.io/client-go/pkg/api"
v1 "k8s.io/client-go/pkg/api/v1"
v1beta1 "k8s.io/client-go/pkg/apis/extensions/v1beta1" v1beta1 "k8s.io/client-go/pkg/apis/extensions/v1beta1"
rest "k8s.io/client-go/rest" rest "k8s.io/client-go/rest"
) )
@ -37,10 +36,10 @@ type PodSecurityPolicyInterface interface {
Create(*v1beta1.PodSecurityPolicy) (*v1beta1.PodSecurityPolicy, error) Create(*v1beta1.PodSecurityPolicy) (*v1beta1.PodSecurityPolicy, error)
Update(*v1beta1.PodSecurityPolicy) (*v1beta1.PodSecurityPolicy, error) Update(*v1beta1.PodSecurityPolicy) (*v1beta1.PodSecurityPolicy, error)
Delete(name string, options *v1.DeleteOptions) error Delete(name string, options *v1.DeleteOptions) error
DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
Get(name string, options meta_v1.GetOptions) (*v1beta1.PodSecurityPolicy, error) Get(name string, options v1.GetOptions) (*v1beta1.PodSecurityPolicy, error)
List(opts meta_v1.ListOptions) (*v1beta1.PodSecurityPolicyList, error) List(opts v1.ListOptions) (*v1beta1.PodSecurityPolicyList, error)
Watch(opts meta_v1.ListOptions) (watch.Interface, error) Watch(opts v1.ListOptions) (watch.Interface, error)
Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.PodSecurityPolicy, err error) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.PodSecurityPolicy, err error)
PodSecurityPolicyExpansion PodSecurityPolicyExpansion
} }
@ -91,7 +90,7 @@ func (c *podSecurityPolicies) Delete(name string, options *v1.DeleteOptions) err
} }
// DeleteCollection deletes a collection of objects. // DeleteCollection deletes a collection of objects.
func (c *podSecurityPolicies) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *podSecurityPolicies) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
return c.client.Delete(). return c.client.Delete().
Resource("podsecuritypolicies"). Resource("podsecuritypolicies").
VersionedParams(&listOptions, api.ParameterCodec). VersionedParams(&listOptions, api.ParameterCodec).
@ -101,7 +100,7 @@ func (c *podSecurityPolicies) DeleteCollection(options *v1.DeleteOptions, listOp
} }
// Get takes name of the podSecurityPolicy, and returns the corresponding podSecurityPolicy object, and an error if there is any. // Get takes name of the podSecurityPolicy, and returns the corresponding podSecurityPolicy object, and an error if there is any.
func (c *podSecurityPolicies) Get(name string, options meta_v1.GetOptions) (result *v1beta1.PodSecurityPolicy, err error) { func (c *podSecurityPolicies) Get(name string, options v1.GetOptions) (result *v1beta1.PodSecurityPolicy, err error) {
result = &v1beta1.PodSecurityPolicy{} result = &v1beta1.PodSecurityPolicy{}
err = c.client.Get(). err = c.client.Get().
Resource("podsecuritypolicies"). Resource("podsecuritypolicies").
@ -113,7 +112,7 @@ func (c *podSecurityPolicies) Get(name string, options meta_v1.GetOptions) (resu
} }
// List takes label and field selectors, and returns the list of PodSecurityPolicies that match those selectors. // List takes label and field selectors, and returns the list of PodSecurityPolicies that match those selectors.
func (c *podSecurityPolicies) List(opts meta_v1.ListOptions) (result *v1beta1.PodSecurityPolicyList, err error) { func (c *podSecurityPolicies) List(opts v1.ListOptions) (result *v1beta1.PodSecurityPolicyList, err error) {
result = &v1beta1.PodSecurityPolicyList{} result = &v1beta1.PodSecurityPolicyList{}
err = c.client.Get(). err = c.client.Get().
Resource("podsecuritypolicies"). Resource("podsecuritypolicies").
@ -124,7 +123,7 @@ func (c *podSecurityPolicies) List(opts meta_v1.ListOptions) (result *v1beta1.Po
} }
// Watch returns a watch.Interface that watches the requested podSecurityPolicies. // Watch returns a watch.Interface that watches the requested podSecurityPolicies.
func (c *podSecurityPolicies) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { func (c *podSecurityPolicies) Watch(opts v1.ListOptions) (watch.Interface, error) {
return c.client.Get(). return c.client.Get().
Prefix("watch"). Prefix("watch").
Resource("podsecuritypolicies"). Resource("podsecuritypolicies").

19
kubernetes/typed/extensions/v1beta1/replicaset.go
View File

@ -17,11 +17,10 @@ limitations under the License.
package v1beta1 package v1beta1
import ( import (
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
types "k8s.io/apimachinery/pkg/types" types "k8s.io/apimachinery/pkg/types"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
api "k8s.io/client-go/pkg/api" api "k8s.io/client-go/pkg/api"
v1 "k8s.io/client-go/pkg/api/v1"
v1beta1 "k8s.io/client-go/pkg/apis/extensions/v1beta1" v1beta1 "k8s.io/client-go/pkg/apis/extensions/v1beta1"
rest "k8s.io/client-go/rest" rest "k8s.io/client-go/rest"
) )
@ -38,10 +37,10 @@ type ReplicaSetInterface interface {
Update(*v1beta1.ReplicaSet) (*v1beta1.ReplicaSet, error) Update(*v1beta1.ReplicaSet) (*v1beta1.ReplicaSet, error)
UpdateStatus(*v1beta1.ReplicaSet) (*v1beta1.ReplicaSet, error) UpdateStatus(*v1beta1.ReplicaSet) (*v1beta1.ReplicaSet, error)
Delete(name string, options *v1.DeleteOptions) error Delete(name string, options *v1.DeleteOptions) error
DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
Get(name string, options meta_v1.GetOptions) (*v1beta1.ReplicaSet, error) Get(name string, options v1.GetOptions) (*v1beta1.ReplicaSet, error)
List(opts meta_v1.ListOptions) (*v1beta1.ReplicaSetList, error) List(opts v1.ListOptions) (*v1beta1.ReplicaSetList, error)
Watch(opts meta_v1.ListOptions) (watch.Interface, error) Watch(opts v1.ListOptions) (watch.Interface, error)
Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.ReplicaSet, err error) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.ReplicaSet, err error)
ReplicaSetExpansion ReplicaSetExpansion
} }
@ -113,7 +112,7 @@ func (c *replicaSets) Delete(name string, options *v1.DeleteOptions) error {
} }
// DeleteCollection deletes a collection of objects. // DeleteCollection deletes a collection of objects.
func (c *replicaSets) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *replicaSets) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
return c.client.Delete(). return c.client.Delete().
Namespace(c.ns). Namespace(c.ns).
Resource("replicasets"). Resource("replicasets").
@ -124,7 +123,7 @@ func (c *replicaSets) DeleteCollection(options *v1.DeleteOptions, listOptions me
} }
// Get takes name of the replicaSet, and returns the corresponding replicaSet object, and an error if there is any. // Get takes name of the replicaSet, and returns the corresponding replicaSet object, and an error if there is any.
func (c *replicaSets) Get(name string, options meta_v1.GetOptions) (result *v1beta1.ReplicaSet, err error) { func (c *replicaSets) Get(name string, options v1.GetOptions) (result *v1beta1.ReplicaSet, err error) {
result = &v1beta1.ReplicaSet{} result = &v1beta1.ReplicaSet{}
err = c.client.Get(). err = c.client.Get().
Namespace(c.ns). Namespace(c.ns).
@ -137,7 +136,7 @@ func (c *replicaSets) Get(name string, options meta_v1.GetOptions) (result *v1be
} }
// List takes label and field selectors, and returns the list of ReplicaSets that match those selectors. // List takes label and field selectors, and returns the list of ReplicaSets that match those selectors.
func (c *replicaSets) List(opts meta_v1.ListOptions) (result *v1beta1.ReplicaSetList, err error) { func (c *replicaSets) List(opts v1.ListOptions) (result *v1beta1.ReplicaSetList, err error) {
result = &v1beta1.ReplicaSetList{} result = &v1beta1.ReplicaSetList{}
err = c.client.Get(). err = c.client.Get().
Namespace(c.ns). Namespace(c.ns).
@ -149,7 +148,7 @@ func (c *replicaSets) List(opts meta_v1.ListOptions) (result *v1beta1.ReplicaSet
} }
// Watch returns a watch.Interface that watches the requested replicaSets. // Watch returns a watch.Interface that watches the requested replicaSets.
func (c *replicaSets) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { func (c *replicaSets) Watch(opts v1.ListOptions) (watch.Interface, error) {
return c.client.Get(). return c.client.Get().
Prefix("watch"). Prefix("watch").
Namespace(c.ns). Namespace(c.ns).

19
kubernetes/typed/extensions/v1beta1/thirdpartyresource.go
View File

@ -17,11 +17,10 @@ limitations under the License.
package v1beta1 package v1beta1
import ( import (
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
types "k8s.io/apimachinery/pkg/types" types "k8s.io/apimachinery/pkg/types"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
api "k8s.io/client-go/pkg/api" api "k8s.io/client-go/pkg/api"
v1 "k8s.io/client-go/pkg/api/v1"
v1beta1 "k8s.io/client-go/pkg/apis/extensions/v1beta1" v1beta1 "k8s.io/client-go/pkg/apis/extensions/v1beta1"
rest "k8s.io/client-go/rest" rest "k8s.io/client-go/rest"
) )
@ -37,10 +36,10 @@ type ThirdPartyResourceInterface interface {
Create(*v1beta1.ThirdPartyResource) (*v1beta1.ThirdPartyResource, error) Create(*v1beta1.ThirdPartyResource) (*v1beta1.ThirdPartyResource, error)
Update(*v1beta1.ThirdPartyResource) (*v1beta1.ThirdPartyResource, error) Update(*v1beta1.ThirdPartyResource) (*v1beta1.ThirdPartyResource, error)
Delete(name string, options *v1.DeleteOptions) error Delete(name string, options *v1.DeleteOptions) error
DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
Get(name string, options meta_v1.GetOptions) (*v1beta1.ThirdPartyResource, error) Get(name string, options v1.GetOptions) (*v1beta1.ThirdPartyResource, error)
List(opts meta_v1.ListOptions) (*v1beta1.ThirdPartyResourceList, error) List(opts v1.ListOptions) (*v1beta1.ThirdPartyResourceList, error)
Watch(opts meta_v1.ListOptions) (watch.Interface, error) Watch(opts v1.ListOptions) (watch.Interface, error)
Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.ThirdPartyResource, err error) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.ThirdPartyResource, err error)
ThirdPartyResourceExpansion ThirdPartyResourceExpansion
} }
@ -91,7 +90,7 @@ func (c *thirdPartyResources) Delete(name string, options *v1.DeleteOptions) err
} }
// DeleteCollection deletes a collection of objects. // DeleteCollection deletes a collection of objects.
func (c *thirdPartyResources) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *thirdPartyResources) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
return c.client.Delete(). return c.client.Delete().
Resource("thirdpartyresources"). Resource("thirdpartyresources").
VersionedParams(&listOptions, api.ParameterCodec). VersionedParams(&listOptions, api.ParameterCodec).
@ -101,7 +100,7 @@ func (c *thirdPartyResources) DeleteCollection(options *v1.DeleteOptions, listOp
} }
// Get takes name of the thirdPartyResource, and returns the corresponding thirdPartyResource object, and an error if there is any. // Get takes name of the thirdPartyResource, and returns the corresponding thirdPartyResource object, and an error if there is any.
func (c *thirdPartyResources) Get(name string, options meta_v1.GetOptions) (result *v1beta1.ThirdPartyResource, err error) { func (c *thirdPartyResources) Get(name string, options v1.GetOptions) (result *v1beta1.ThirdPartyResource, err error) {
result = &v1beta1.ThirdPartyResource{} result = &v1beta1.ThirdPartyResource{}
err = c.client.Get(). err = c.client.Get().
Resource("thirdpartyresources"). Resource("thirdpartyresources").
@ -113,7 +112,7 @@ func (c *thirdPartyResources) Get(name string, options meta_v1.GetOptions) (resu
} }
// List takes label and field selectors, and returns the list of ThirdPartyResources that match those selectors. // List takes label and field selectors, and returns the list of ThirdPartyResources that match those selectors.
func (c *thirdPartyResources) List(opts meta_v1.ListOptions) (result *v1beta1.ThirdPartyResourceList, err error) { func (c *thirdPartyResources) List(opts v1.ListOptions) (result *v1beta1.ThirdPartyResourceList, err error) {
result = &v1beta1.ThirdPartyResourceList{} result = &v1beta1.ThirdPartyResourceList{}
err = c.client.Get(). err = c.client.Get().
Resource("thirdpartyresources"). Resource("thirdpartyresources").
@ -124,7 +123,7 @@ func (c *thirdPartyResources) List(opts meta_v1.ListOptions) (result *v1beta1.Th
} }
// Watch returns a watch.Interface that watches the requested thirdPartyResources. // Watch returns a watch.Interface that watches the requested thirdPartyResources.
func (c *thirdPartyResources) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { func (c *thirdPartyResources) Watch(opts v1.ListOptions) (watch.Interface, error) {
return c.client.Get(). return c.client.Get().
Prefix("watch"). Prefix("watch").
Resource("thirdpartyresources"). Resource("thirdpartyresources").

11
kubernetes/typed/policy/v1beta1/fake/fake_poddisruptionbudget.go
View File

@ -17,12 +17,11 @@ limitations under the License.
package fake package fake
import ( import (
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
labels "k8s.io/apimachinery/pkg/labels" labels "k8s.io/apimachinery/pkg/labels"
schema "k8s.io/apimachinery/pkg/runtime/schema" schema "k8s.io/apimachinery/pkg/runtime/schema"
types "k8s.io/apimachinery/pkg/types" types "k8s.io/apimachinery/pkg/types"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
v1 "k8s.io/client-go/pkg/api/v1"
v1beta1 "k8s.io/client-go/pkg/apis/policy/v1beta1" v1beta1 "k8s.io/client-go/pkg/apis/policy/v1beta1"
testing "k8s.io/client-go/testing" testing "k8s.io/client-go/testing"
) )
@ -72,14 +71,14 @@ func (c *FakePodDisruptionBudgets) Delete(name string, options *v1.DeleteOptions
return err return err
} }
func (c *FakePodDisruptionBudgets) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *FakePodDisruptionBudgets) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
action := testing.NewDeleteCollectionAction(poddisruptionbudgetsResource, c.ns, listOptions) action := testing.NewDeleteCollectionAction(poddisruptionbudgetsResource, c.ns, listOptions)
_, err := c.Fake.Invokes(action, &v1beta1.PodDisruptionBudgetList{}) _, err := c.Fake.Invokes(action, &v1beta1.PodDisruptionBudgetList{})
return err return err
} }
func (c *FakePodDisruptionBudgets) Get(name string, options meta_v1.GetOptions) (result *v1beta1.PodDisruptionBudget, err error) { func (c *FakePodDisruptionBudgets) Get(name string, options v1.GetOptions) (result *v1beta1.PodDisruptionBudget, err error) {
obj, err := c.Fake. obj, err := c.Fake.
Invokes(testing.NewGetAction(poddisruptionbudgetsResource, c.ns, name), &v1beta1.PodDisruptionBudget{}) Invokes(testing.NewGetAction(poddisruptionbudgetsResource, c.ns, name), &v1beta1.PodDisruptionBudget{})
@ -89,7 +88,7 @@ func (c *FakePodDisruptionBudgets) Get(name string, options meta_v1.GetOptions)
return obj.(*v1beta1.PodDisruptionBudget), err return obj.(*v1beta1.PodDisruptionBudget), err
} }
func (c *FakePodDisruptionBudgets) List(opts meta_v1.ListOptions) (result *v1beta1.PodDisruptionBudgetList, err error) { func (c *FakePodDisruptionBudgets) List(opts v1.ListOptions) (result *v1beta1.PodDisruptionBudgetList, err error) {
obj, err := c.Fake. obj, err := c.Fake.
Invokes(testing.NewListAction(poddisruptionbudgetsResource, c.ns, opts), &v1beta1.PodDisruptionBudgetList{}) Invokes(testing.NewListAction(poddisruptionbudgetsResource, c.ns, opts), &v1beta1.PodDisruptionBudgetList{})
@ -111,7 +110,7 @@ func (c *FakePodDisruptionBudgets) List(opts meta_v1.ListOptions) (result *v1bet
} }
// Watch returns a watch.Interface that watches the requested podDisruptionBudgets. // Watch returns a watch.Interface that watches the requested podDisruptionBudgets.
func (c *FakePodDisruptionBudgets) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { func (c *FakePodDisruptionBudgets) Watch(opts v1.ListOptions) (watch.Interface, error) {
return c.Fake. return c.Fake.
InvokesWatch(testing.NewWatchAction(poddisruptionbudgetsResource, c.ns, opts)) InvokesWatch(testing.NewWatchAction(poddisruptionbudgetsResource, c.ns, opts))

19
kubernetes/typed/policy/v1beta1/poddisruptionbudget.go
View File

@ -17,11 +17,10 @@ limitations under the License.
package v1beta1 package v1beta1
import ( import (
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
types "k8s.io/apimachinery/pkg/types" types "k8s.io/apimachinery/pkg/types"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
api "k8s.io/client-go/pkg/api" api "k8s.io/client-go/pkg/api"
v1 "k8s.io/client-go/pkg/api/v1"
v1beta1 "k8s.io/client-go/pkg/apis/policy/v1beta1" v1beta1 "k8s.io/client-go/pkg/apis/policy/v1beta1"
rest "k8s.io/client-go/rest" rest "k8s.io/client-go/rest"
) )
@ -38,10 +37,10 @@ type PodDisruptionBudgetInterface interface {
Update(*v1beta1.PodDisruptionBudget) (*v1beta1.PodDisruptionBudget, error) Update(*v1beta1.PodDisruptionBudget) (*v1beta1.PodDisruptionBudget, error)
UpdateStatus(*v1beta1.PodDisruptionBudget) (*v1beta1.PodDisruptionBudget, error) UpdateStatus(*v1beta1.PodDisruptionBudget) (*v1beta1.PodDisruptionBudget, error)
Delete(name string, options *v1.DeleteOptions) error Delete(name string, options *v1.DeleteOptions) error
DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
Get(name string, options meta_v1.GetOptions) (*v1beta1.PodDisruptionBudget, error) Get(name string, options v1.GetOptions) (*v1beta1.PodDisruptionBudget, error)
List(opts meta_v1.ListOptions) (*v1beta1.PodDisruptionBudgetList, error) List(opts v1.ListOptions) (*v1beta1.PodDisruptionBudgetList, error)
Watch(opts meta_v1.ListOptions) (watch.Interface, error) Watch(opts v1.ListOptions) (watch.Interface, error)
Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.PodDisruptionBudget, err error) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.PodDisruptionBudget, err error)
PodDisruptionBudgetExpansion PodDisruptionBudgetExpansion
} }
@ -113,7 +112,7 @@ func (c *podDisruptionBudgets) Delete(name string, options *v1.DeleteOptions) er
} }
// DeleteCollection deletes a collection of objects. // DeleteCollection deletes a collection of objects.
func (c *podDisruptionBudgets) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *podDisruptionBudgets) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
return c.client.Delete(). return c.client.Delete().
Namespace(c.ns). Namespace(c.ns).
Resource("poddisruptionbudgets"). Resource("poddisruptionbudgets").
@ -124,7 +123,7 @@ func (c *podDisruptionBudgets) DeleteCollection(options *v1.DeleteOptions, listO
} }
// Get takes name of the podDisruptionBudget, and returns the corresponding podDisruptionBudget object, and an error if there is any. // Get takes name of the podDisruptionBudget, and returns the corresponding podDisruptionBudget object, and an error if there is any.
func (c *podDisruptionBudgets) Get(name string, options meta_v1.GetOptions) (result *v1beta1.PodDisruptionBudget, err error) { func (c *podDisruptionBudgets) Get(name string, options v1.GetOptions) (result *v1beta1.PodDisruptionBudget, err error) {
result = &v1beta1.PodDisruptionBudget{} result = &v1beta1.PodDisruptionBudget{}
err = c.client.Get(). err = c.client.Get().
Namespace(c.ns). Namespace(c.ns).
@ -137,7 +136,7 @@ func (c *podDisruptionBudgets) Get(name string, options meta_v1.GetOptions) (res
} }
// List takes label and field selectors, and returns the list of PodDisruptionBudgets that match those selectors. // List takes label and field selectors, and returns the list of PodDisruptionBudgets that match those selectors.
func (c *podDisruptionBudgets) List(opts meta_v1.ListOptions) (result *v1beta1.PodDisruptionBudgetList, err error) { func (c *podDisruptionBudgets) List(opts v1.ListOptions) (result *v1beta1.PodDisruptionBudgetList, err error) {
result = &v1beta1.PodDisruptionBudgetList{} result = &v1beta1.PodDisruptionBudgetList{}
err = c.client.Get(). err = c.client.Get().
Namespace(c.ns). Namespace(c.ns).
@ -149,7 +148,7 @@ func (c *podDisruptionBudgets) List(opts meta_v1.ListOptions) (result *v1beta1.P
} }
// Watch returns a watch.Interface that watches the requested podDisruptionBudgets. // Watch returns a watch.Interface that watches the requested podDisruptionBudgets.
func (c *podDisruptionBudgets) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { func (c *podDisruptionBudgets) Watch(opts v1.ListOptions) (watch.Interface, error) {
return c.client.Get(). return c.client.Get().
Prefix("watch"). Prefix("watch").
Namespace(c.ns). Namespace(c.ns).

19
kubernetes/typed/rbac/v1alpha1/clusterrole.go
View File

@ -17,11 +17,10 @@ limitations under the License.
package v1alpha1 package v1alpha1
import ( import (
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
types "k8s.io/apimachinery/pkg/types" types "k8s.io/apimachinery/pkg/types"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
api "k8s.io/client-go/pkg/api" api "k8s.io/client-go/pkg/api"
v1 "k8s.io/client-go/pkg/api/v1"
v1alpha1 "k8s.io/client-go/pkg/apis/rbac/v1alpha1" v1alpha1 "k8s.io/client-go/pkg/apis/rbac/v1alpha1"
rest "k8s.io/client-go/rest" rest "k8s.io/client-go/rest"
) )
@ -37,10 +36,10 @@ type ClusterRoleInterface interface {
Create(*v1alpha1.ClusterRole) (*v1alpha1.ClusterRole, error) Create(*v1alpha1.ClusterRole) (*v1alpha1.ClusterRole, error)
Update(*v1alpha1.ClusterRole) (*v1alpha1.ClusterRole, error) Update(*v1alpha1.ClusterRole) (*v1alpha1.ClusterRole, error)
Delete(name string, options *v1.DeleteOptions) error Delete(name string, options *v1.DeleteOptions) error
DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
Get(name string, options meta_v1.GetOptions) (*v1alpha1.ClusterRole, error) Get(name string, options v1.GetOptions) (*v1alpha1.ClusterRole, error)
List(opts meta_v1.ListOptions) (*v1alpha1.ClusterRoleList, error) List(opts v1.ListOptions) (*v1alpha1.ClusterRoleList, error)
Watch(opts meta_v1.ListOptions) (watch.Interface, error) Watch(opts v1.ListOptions) (watch.Interface, error)
Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1alpha1.ClusterRole, err error) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1alpha1.ClusterRole, err error)
ClusterRoleExpansion ClusterRoleExpansion
} }
@ -91,7 +90,7 @@ func (c *clusterRoles) Delete(name string, options *v1.DeleteOptions) error {
} }
// DeleteCollection deletes a collection of objects. // DeleteCollection deletes a collection of objects.
func (c *clusterRoles) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *clusterRoles) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
return c.client.Delete(). return c.client.Delete().
Resource("clusterroles"). Resource("clusterroles").
VersionedParams(&listOptions, api.ParameterCodec). VersionedParams(&listOptions, api.ParameterCodec).
@ -101,7 +100,7 @@ func (c *clusterRoles) DeleteCollection(options *v1.DeleteOptions, listOptions m
} }
// Get takes name of the clusterRole, and returns the corresponding clusterRole object, and an error if there is any. // Get takes name of the clusterRole, and returns the corresponding clusterRole object, and an error if there is any.
func (c *clusterRoles) Get(name string, options meta_v1.GetOptions) (result *v1alpha1.ClusterRole, err error) { func (c *clusterRoles) Get(name string, options v1.GetOptions) (result *v1alpha1.ClusterRole, err error) {
result = &v1alpha1.ClusterRole{} result = &v1alpha1.ClusterRole{}
err = c.client.Get(). err = c.client.Get().
Resource("clusterroles"). Resource("clusterroles").
@ -113,7 +112,7 @@ func (c *clusterRoles) Get(name string, options meta_v1.GetOptions) (result *v1a
} }
// List takes label and field selectors, and returns the list of ClusterRoles that match those selectors. // List takes label and field selectors, and returns the list of ClusterRoles that match those selectors.
func (c *clusterRoles) List(opts meta_v1.ListOptions) (result *v1alpha1.ClusterRoleList, err error) { func (c *clusterRoles) List(opts v1.ListOptions) (result *v1alpha1.ClusterRoleList, err error) {
result = &v1alpha1.ClusterRoleList{} result = &v1alpha1.ClusterRoleList{}
err = c.client.Get(). err = c.client.Get().
Resource("clusterroles"). Resource("clusterroles").
@ -124,7 +123,7 @@ func (c *clusterRoles) List(opts meta_v1.ListOptions) (result *v1alpha1.ClusterR
} }
// Watch returns a watch.Interface that watches the requested clusterRoles. // Watch returns a watch.Interface that watches the requested clusterRoles.
func (c *clusterRoles) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { func (c *clusterRoles) Watch(opts v1.ListOptions) (watch.Interface, error) {
return c.client.Get(). return c.client.Get().
Prefix("watch"). Prefix("watch").
Resource("clusterroles"). Resource("clusterroles").

19
kubernetes/typed/rbac/v1alpha1/clusterrolebinding.go
View File

@ -17,11 +17,10 @@ limitations under the License.
package v1alpha1 package v1alpha1
import ( import (
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
types "k8s.io/apimachinery/pkg/types" types "k8s.io/apimachinery/pkg/types"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
api "k8s.io/client-go/pkg/api" api "k8s.io/client-go/pkg/api"
v1 "k8s.io/client-go/pkg/api/v1"
v1alpha1 "k8s.io/client-go/pkg/apis/rbac/v1alpha1" v1alpha1 "k8s.io/client-go/pkg/apis/rbac/v1alpha1"
rest "k8s.io/client-go/rest" rest "k8s.io/client-go/rest"
) )
@ -37,10 +36,10 @@ type ClusterRoleBindingInterface interface {
Create(*v1alpha1.ClusterRoleBinding) (*v1alpha1.ClusterRoleBinding, error) Create(*v1alpha1.ClusterRoleBinding) (*v1alpha1.ClusterRoleBinding, error)
Update(*v1alpha1.ClusterRoleBinding) (*v1alpha1.ClusterRoleBinding, error) Update(*v1alpha1.ClusterRoleBinding) (*v1alpha1.ClusterRoleBinding, error)
Delete(name string, options *v1.DeleteOptions) error Delete(name string, options *v1.DeleteOptions) error
DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
Get(name string, options meta_v1.GetOptions) (*v1alpha1.ClusterRoleBinding, error) Get(name string, options v1.GetOptions) (*v1alpha1.ClusterRoleBinding, error)
List(opts meta_v1.ListOptions) (*v1alpha1.ClusterRoleBindingList, error) List(opts v1.ListOptions) (*v1alpha1.ClusterRoleBindingList, error)
Watch(opts meta_v1.ListOptions) (watch.Interface, error) Watch(opts v1.ListOptions) (watch.Interface, error)
Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1alpha1.ClusterRoleBinding, err error) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1alpha1.ClusterRoleBinding, err error)
ClusterRoleBindingExpansion ClusterRoleBindingExpansion
} }
@ -91,7 +90,7 @@ func (c *clusterRoleBindings) Delete(name string, options *v1.DeleteOptions) err
} }
// DeleteCollection deletes a collection of objects. // DeleteCollection deletes a collection of objects.
func (c *clusterRoleBindings) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *clusterRoleBindings) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
return c.client.Delete(). return c.client.Delete().
Resource("clusterrolebindings"). Resource("clusterrolebindings").
VersionedParams(&listOptions, api.ParameterCodec). VersionedParams(&listOptions, api.ParameterCodec).
@ -101,7 +100,7 @@ func (c *clusterRoleBindings) DeleteCollection(options *v1.DeleteOptions, listOp
} }
// Get takes name of the clusterRoleBinding, and returns the corresponding clusterRoleBinding object, and an error if there is any. // Get takes name of the clusterRoleBinding, and returns the corresponding clusterRoleBinding object, and an error if there is any.
func (c *clusterRoleBindings) Get(name string, options meta_v1.GetOptions) (result *v1alpha1.ClusterRoleBinding, err error) { func (c *clusterRoleBindings) Get(name string, options v1.GetOptions) (result *v1alpha1.ClusterRoleBinding, err error) {
result = &v1alpha1.ClusterRoleBinding{} result = &v1alpha1.ClusterRoleBinding{}
err = c.client.Get(). err = c.client.Get().
Resource("clusterrolebindings"). Resource("clusterrolebindings").
@ -113,7 +112,7 @@ func (c *clusterRoleBindings) Get(name string, options meta_v1.GetOptions) (resu
} }
// List takes label and field selectors, and returns the list of ClusterRoleBindings that match those selectors. // List takes label and field selectors, and returns the list of ClusterRoleBindings that match those selectors.
func (c *clusterRoleBindings) List(opts meta_v1.ListOptions) (result *v1alpha1.ClusterRoleBindingList, err error) { func (c *clusterRoleBindings) List(opts v1.ListOptions) (result *v1alpha1.ClusterRoleBindingList, err error) {
result = &v1alpha1.ClusterRoleBindingList{} result = &v1alpha1.ClusterRoleBindingList{}
err = c.client.Get(). err = c.client.Get().
Resource("clusterrolebindings"). Resource("clusterrolebindings").
@ -124,7 +123,7 @@ func (c *clusterRoleBindings) List(opts meta_v1.ListOptions) (result *v1alpha1.C
} }
// Watch returns a watch.Interface that watches the requested clusterRoleBindings. // Watch returns a watch.Interface that watches the requested clusterRoleBindings.
func (c *clusterRoleBindings) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { func (c *clusterRoleBindings) Watch(opts v1.ListOptions) (watch.Interface, error) {
return c.client.Get(). return c.client.Get().
Prefix("watch"). Prefix("watch").
Resource("clusterrolebindings"). Resource("clusterrolebindings").

11
kubernetes/typed/rbac/v1alpha1/fake/fake_clusterrole.go
View File

@ -17,12 +17,11 @@ limitations under the License.
package fake package fake
import ( import (
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
labels "k8s.io/apimachinery/pkg/labels" labels "k8s.io/apimachinery/pkg/labels"
schema "k8s.io/apimachinery/pkg/runtime/schema" schema "k8s.io/apimachinery/pkg/runtime/schema"
types "k8s.io/apimachinery/pkg/types" types "k8s.io/apimachinery/pkg/types"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
v1 "k8s.io/client-go/pkg/api/v1"
v1alpha1 "k8s.io/client-go/pkg/apis/rbac/v1alpha1" v1alpha1 "k8s.io/client-go/pkg/apis/rbac/v1alpha1"
testing "k8s.io/client-go/testing" testing "k8s.io/client-go/testing"
) )
@ -58,14 +57,14 @@ func (c *FakeClusterRoles) Delete(name string, options *v1.DeleteOptions) error
return err return err
} }
func (c *FakeClusterRoles) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *FakeClusterRoles) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
action := testing.NewRootDeleteCollectionAction(clusterrolesResource, listOptions) action := testing.NewRootDeleteCollectionAction(clusterrolesResource, listOptions)
_, err := c.Fake.Invokes(action, &v1alpha1.ClusterRoleList{}) _, err := c.Fake.Invokes(action, &v1alpha1.ClusterRoleList{})
return err return err
} }
func (c *FakeClusterRoles) Get(name string, options meta_v1.GetOptions) (result *v1alpha1.ClusterRole, err error) { func (c *FakeClusterRoles) Get(name string, options v1.GetOptions) (result *v1alpha1.ClusterRole, err error) {
obj, err := c.Fake. obj, err := c.Fake.
Invokes(testing.NewRootGetAction(clusterrolesResource, name), &v1alpha1.ClusterRole{}) Invokes(testing.NewRootGetAction(clusterrolesResource, name), &v1alpha1.ClusterRole{})
if obj == nil { if obj == nil {
@ -74,7 +73,7 @@ func (c *FakeClusterRoles) Get(name string, options meta_v1.GetOptions) (result
return obj.(*v1alpha1.ClusterRole), err return obj.(*v1alpha1.ClusterRole), err
} }
func (c *FakeClusterRoles) List(opts meta_v1.ListOptions) (result *v1alpha1.ClusterRoleList, err error) { func (c *FakeClusterRoles) List(opts v1.ListOptions) (result *v1alpha1.ClusterRoleList, err error) {
obj, err := c.Fake. obj, err := c.Fake.
Invokes(testing.NewRootListAction(clusterrolesResource, opts), &v1alpha1.ClusterRoleList{}) Invokes(testing.NewRootListAction(clusterrolesResource, opts), &v1alpha1.ClusterRoleList{})
if obj == nil { if obj == nil {
@ -95,7 +94,7 @@ func (c *FakeClusterRoles) List(opts meta_v1.ListOptions) (result *v1alpha1.Clus
} }
// Watch returns a watch.Interface that watches the requested clusterRoles. // Watch returns a watch.Interface that watches the requested clusterRoles.
func (c *FakeClusterRoles) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { func (c *FakeClusterRoles) Watch(opts v1.ListOptions) (watch.Interface, error) {
return c.Fake. return c.Fake.
InvokesWatch(testing.NewRootWatchAction(clusterrolesResource, opts)) InvokesWatch(testing.NewRootWatchAction(clusterrolesResource, opts))
} }

11
kubernetes/typed/rbac/v1alpha1/fake/fake_clusterrolebinding.go
View File

@ -17,12 +17,11 @@ limitations under the License.
package fake package fake
import ( import (
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
labels "k8s.io/apimachinery/pkg/labels" labels "k8s.io/apimachinery/pkg/labels"
schema "k8s.io/apimachinery/pkg/runtime/schema" schema "k8s.io/apimachinery/pkg/runtime/schema"
types "k8s.io/apimachinery/pkg/types" types "k8s.io/apimachinery/pkg/types"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
v1 "k8s.io/client-go/pkg/api/v1"
v1alpha1 "k8s.io/client-go/pkg/apis/rbac/v1alpha1" v1alpha1 "k8s.io/client-go/pkg/apis/rbac/v1alpha1"
testing "k8s.io/client-go/testing" testing "k8s.io/client-go/testing"
) )
@ -58,14 +57,14 @@ func (c *FakeClusterRoleBindings) Delete(name string, options *v1.DeleteOptions)
return err return err
} }
func (c *FakeClusterRoleBindings) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *FakeClusterRoleBindings) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
action := testing.NewRootDeleteCollectionAction(clusterrolebindingsResource, listOptions) action := testing.NewRootDeleteCollectionAction(clusterrolebindingsResource, listOptions)
_, err := c.Fake.Invokes(action, &v1alpha1.ClusterRoleBindingList{}) _, err := c.Fake.Invokes(action, &v1alpha1.ClusterRoleBindingList{})
return err return err
} }
func (c *FakeClusterRoleBindings) Get(name string, options meta_v1.GetOptions) (result *v1alpha1.ClusterRoleBinding, err error) { func (c *FakeClusterRoleBindings) Get(name string, options v1.GetOptions) (result *v1alpha1.ClusterRoleBinding, err error) {
obj, err := c.Fake. obj, err := c.Fake.
Invokes(testing.NewRootGetAction(clusterrolebindingsResource, name), &v1alpha1.ClusterRoleBinding{}) Invokes(testing.NewRootGetAction(clusterrolebindingsResource, name), &v1alpha1.ClusterRoleBinding{})
if obj == nil { if obj == nil {
@ -74,7 +73,7 @@ func (c *FakeClusterRoleBindings) Get(name string, options meta_v1.GetOptions) (
return obj.(*v1alpha1.ClusterRoleBinding), err return obj.(*v1alpha1.ClusterRoleBinding), err
} }
func (c *FakeClusterRoleBindings) List(opts meta_v1.ListOptions) (result *v1alpha1.ClusterRoleBindingList, err error) { func (c *FakeClusterRoleBindings) List(opts v1.ListOptions) (result *v1alpha1.ClusterRoleBindingList, err error) {
obj, err := c.Fake. obj, err := c.Fake.
Invokes(testing.NewRootListAction(clusterrolebindingsResource, opts), &v1alpha1.ClusterRoleBindingList{}) Invokes(testing.NewRootListAction(clusterrolebindingsResource, opts), &v1alpha1.ClusterRoleBindingList{})
if obj == nil { if obj == nil {
@ -95,7 +94,7 @@ func (c *FakeClusterRoleBindings) List(opts meta_v1.ListOptions) (result *v1alph
} }
// Watch returns a watch.Interface that watches the requested clusterRoleBindings. // Watch returns a watch.Interface that watches the requested clusterRoleBindings.
func (c *FakeClusterRoleBindings) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { func (c *FakeClusterRoleBindings) Watch(opts v1.ListOptions) (watch.Interface, error) {
return c.Fake. return c.Fake.
InvokesWatch(testing.NewRootWatchAction(clusterrolebindingsResource, opts)) InvokesWatch(testing.NewRootWatchAction(clusterrolebindingsResource, opts))
} }

11
kubernetes/typed/rbac/v1alpha1/fake/fake_role.go
View File

@ -17,12 +17,11 @@ limitations under the License.
package fake package fake
import ( import (
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
labels "k8s.io/apimachinery/pkg/labels" labels "k8s.io/apimachinery/pkg/labels"
schema "k8s.io/apimachinery/pkg/runtime/schema" schema "k8s.io/apimachinery/pkg/runtime/schema"
types "k8s.io/apimachinery/pkg/types" types "k8s.io/apimachinery/pkg/types"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
v1 "k8s.io/client-go/pkg/api/v1"
v1alpha1 "k8s.io/client-go/pkg/apis/rbac/v1alpha1" v1alpha1 "k8s.io/client-go/pkg/apis/rbac/v1alpha1"
testing "k8s.io/client-go/testing" testing "k8s.io/client-go/testing"
) )
@ -62,14 +61,14 @@ func (c *FakeRoles) Delete(name string, options *v1.DeleteOptions) error {
return err return err
} }
func (c *FakeRoles) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *FakeRoles) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
action := testing.NewDeleteCollectionAction(rolesResource, c.ns, listOptions) action := testing.NewDeleteCollectionAction(rolesResource, c.ns, listOptions)
_, err := c.Fake.Invokes(action, &v1alpha1.RoleList{}) _, err := c.Fake.Invokes(action, &v1alpha1.RoleList{})
return err return err
} }
func (c *FakeRoles) Get(name string, options meta_v1.GetOptions) (result *v1alpha1.Role, err error) { func (c *FakeRoles) Get(name string, options v1.GetOptions) (result *v1alpha1.Role, err error) {
obj, err := c.Fake. obj, err := c.Fake.
Invokes(testing.NewGetAction(rolesResource, c.ns, name), &v1alpha1.Role{}) Invokes(testing.NewGetAction(rolesResource, c.ns, name), &v1alpha1.Role{})
@ -79,7 +78,7 @@ func (c *FakeRoles) Get(name string, options meta_v1.GetOptions) (result *v1alph
return obj.(*v1alpha1.Role), err return obj.(*v1alpha1.Role), err
} }
func (c *FakeRoles) List(opts meta_v1.ListOptions) (result *v1alpha1.RoleList, err error) { func (c *FakeRoles) List(opts v1.ListOptions) (result *v1alpha1.RoleList, err error) {
obj, err := c.Fake. obj, err := c.Fake.
Invokes(testing.NewListAction(rolesResource, c.ns, opts), &v1alpha1.RoleList{}) Invokes(testing.NewListAction(rolesResource, c.ns, opts), &v1alpha1.RoleList{})
@ -101,7 +100,7 @@ func (c *FakeRoles) List(opts meta_v1.ListOptions) (result *v1alpha1.RoleList, e
} }
// Watch returns a watch.Interface that watches the requested roles. // Watch returns a watch.Interface that watches the requested roles.
func (c *FakeRoles) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { func (c *FakeRoles) Watch(opts v1.ListOptions) (watch.Interface, error) {
return c.Fake. return c.Fake.
InvokesWatch(testing.NewWatchAction(rolesResource, c.ns, opts)) InvokesWatch(testing.NewWatchAction(rolesResource, c.ns, opts))

11
kubernetes/typed/rbac/v1alpha1/fake/fake_rolebinding.go
View File

@ -17,12 +17,11 @@ limitations under the License.
package fake package fake
import ( import (
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
labels "k8s.io/apimachinery/pkg/labels" labels "k8s.io/apimachinery/pkg/labels"
schema "k8s.io/apimachinery/pkg/runtime/schema" schema "k8s.io/apimachinery/pkg/runtime/schema"
types "k8s.io/apimachinery/pkg/types" types "k8s.io/apimachinery/pkg/types"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
v1 "k8s.io/client-go/pkg/api/v1"
v1alpha1 "k8s.io/client-go/pkg/apis/rbac/v1alpha1" v1alpha1 "k8s.io/client-go/pkg/apis/rbac/v1alpha1"
testing "k8s.io/client-go/testing" testing "k8s.io/client-go/testing"
) )
@ -62,14 +61,14 @@ func (c *FakeRoleBindings) Delete(name string, options *v1.DeleteOptions) error
return err return err
} }
func (c *FakeRoleBindings) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *FakeRoleBindings) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
action := testing.NewDeleteCollectionAction(rolebindingsResource, c.ns, listOptions) action := testing.NewDeleteCollectionAction(rolebindingsResource, c.ns, listOptions)
_, err := c.Fake.Invokes(action, &v1alpha1.RoleBindingList{}) _, err := c.Fake.Invokes(action, &v1alpha1.RoleBindingList{})
return err return err
} }
func (c *FakeRoleBindings) Get(name string, options meta_v1.GetOptions) (result *v1alpha1.RoleBinding, err error) { func (c *FakeRoleBindings) Get(name string, options v1.GetOptions) (result *v1alpha1.RoleBinding, err error) {
obj, err := c.Fake. obj, err := c.Fake.
Invokes(testing.NewGetAction(rolebindingsResource, c.ns, name), &v1alpha1.RoleBinding{}) Invokes(testing.NewGetAction(rolebindingsResource, c.ns, name), &v1alpha1.RoleBinding{})
@ -79,7 +78,7 @@ func (c *FakeRoleBindings) Get(name string, options meta_v1.GetOptions) (result
return obj.(*v1alpha1.RoleBinding), err return obj.(*v1alpha1.RoleBinding), err
} }
func (c *FakeRoleBindings) List(opts meta_v1.ListOptions) (result *v1alpha1.RoleBindingList, err error) { func (c *FakeRoleBindings) List(opts v1.ListOptions) (result *v1alpha1.RoleBindingList, err error) {
obj, err := c.Fake. obj, err := c.Fake.
Invokes(testing.NewListAction(rolebindingsResource, c.ns, opts), &v1alpha1.RoleBindingList{}) Invokes(testing.NewListAction(rolebindingsResource, c.ns, opts), &v1alpha1.RoleBindingList{})
@ -101,7 +100,7 @@ func (c *FakeRoleBindings) List(opts meta_v1.ListOptions) (result *v1alpha1.Role
} }
// Watch returns a watch.Interface that watches the requested roleBindings. // Watch returns a watch.Interface that watches the requested roleBindings.
func (c *FakeRoleBindings) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { func (c *FakeRoleBindings) Watch(opts v1.ListOptions) (watch.Interface, error) {
return c.Fake. return c.Fake.
InvokesWatch(testing.NewWatchAction(rolebindingsResource, c.ns, opts)) InvokesWatch(testing.NewWatchAction(rolebindingsResource, c.ns, opts))

19
kubernetes/typed/rbac/v1alpha1/role.go
View File

@ -17,11 +17,10 @@ limitations under the License.
package v1alpha1 package v1alpha1
import ( import (
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
types "k8s.io/apimachinery/pkg/types" types "k8s.io/apimachinery/pkg/types"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
api "k8s.io/client-go/pkg/api" api "k8s.io/client-go/pkg/api"
v1 "k8s.io/client-go/pkg/api/v1"
v1alpha1 "k8s.io/client-go/pkg/apis/rbac/v1alpha1" v1alpha1 "k8s.io/client-go/pkg/apis/rbac/v1alpha1"
rest "k8s.io/client-go/rest" rest "k8s.io/client-go/rest"
) )
@ -37,10 +36,10 @@ type RoleInterface interface {
Create(*v1alpha1.Role) (*v1alpha1.Role, error) Create(*v1alpha1.Role) (*v1alpha1.Role, error)
Update(*v1alpha1.Role) (*v1alpha1.Role, error) Update(*v1alpha1.Role) (*v1alpha1.Role, error)
Delete(name string, options *v1.DeleteOptions) error Delete(name string, options *v1.DeleteOptions) error
DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
Get(name string, options meta_v1.GetOptions) (*v1alpha1.Role, error) Get(name string, options v1.GetOptions) (*v1alpha1.Role, error)
List(opts meta_v1.ListOptions) (*v1alpha1.RoleList, error) List(opts v1.ListOptions) (*v1alpha1.RoleList, error)
Watch(opts meta_v1.ListOptions) (watch.Interface, error) Watch(opts v1.ListOptions) (watch.Interface, error)
Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1alpha1.Role, err error) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1alpha1.Role, err error)
RoleExpansion RoleExpansion
} }
@ -96,7 +95,7 @@ func (c *roles) Delete(name string, options *v1.DeleteOptions) error {
} }
// DeleteCollection deletes a collection of objects. // DeleteCollection deletes a collection of objects.
func (c *roles) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *roles) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
return c.client.Delete(). return c.client.Delete().
Namespace(c.ns). Namespace(c.ns).
Resource("roles"). Resource("roles").
@ -107,7 +106,7 @@ func (c *roles) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.
} }
// Get takes name of the role, and returns the corresponding role object, and an error if there is any. // Get takes name of the role, and returns the corresponding role object, and an error if there is any.
func (c *roles) Get(name string, options meta_v1.GetOptions) (result *v1alpha1.Role, err error) { func (c *roles) Get(name string, options v1.GetOptions) (result *v1alpha1.Role, err error) {
result = &v1alpha1.Role{} result = &v1alpha1.Role{}
err = c.client.Get(). err = c.client.Get().
Namespace(c.ns). Namespace(c.ns).
@ -120,7 +119,7 @@ func (c *roles) Get(name string, options meta_v1.GetOptions) (result *v1alpha1.R
} }
// List takes label and field selectors, and returns the list of Roles that match those selectors. // List takes label and field selectors, and returns the list of Roles that match those selectors.
func (c *roles) List(opts meta_v1.ListOptions) (result *v1alpha1.RoleList, err error) { func (c *roles) List(opts v1.ListOptions) (result *v1alpha1.RoleList, err error) {
result = &v1alpha1.RoleList{} result = &v1alpha1.RoleList{}
err = c.client.Get(). err = c.client.Get().
Namespace(c.ns). Namespace(c.ns).
@ -132,7 +131,7 @@ func (c *roles) List(opts meta_v1.ListOptions) (result *v1alpha1.RoleList, err e
} }
// Watch returns a watch.Interface that watches the requested roles. // Watch returns a watch.Interface that watches the requested roles.
func (c *roles) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { func (c *roles) Watch(opts v1.ListOptions) (watch.Interface, error) {
return c.client.Get(). return c.client.Get().
Prefix("watch"). Prefix("watch").
Namespace(c.ns). Namespace(c.ns).

19
kubernetes/typed/rbac/v1alpha1/rolebinding.go
View File

@ -17,11 +17,10 @@ limitations under the License.
package v1alpha1 package v1alpha1
import ( import (
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
types "k8s.io/apimachinery/pkg/types" types "k8s.io/apimachinery/pkg/types"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
api "k8s.io/client-go/pkg/api" api "k8s.io/client-go/pkg/api"
v1 "k8s.io/client-go/pkg/api/v1"
v1alpha1 "k8s.io/client-go/pkg/apis/rbac/v1alpha1" v1alpha1 "k8s.io/client-go/pkg/apis/rbac/v1alpha1"
rest "k8s.io/client-go/rest" rest "k8s.io/client-go/rest"
) )
@ -37,10 +36,10 @@ type RoleBindingInterface interface {
Create(*v1alpha1.RoleBinding) (*v1alpha1.RoleBinding, error) Create(*v1alpha1.RoleBinding) (*v1alpha1.RoleBinding, error)
Update(*v1alpha1.RoleBinding) (*v1alpha1.RoleBinding, error) Update(*v1alpha1.RoleBinding) (*v1alpha1.RoleBinding, error)
Delete(name string, options *v1.DeleteOptions) error Delete(name string, options *v1.DeleteOptions) error
DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
Get(name string, options meta_v1.GetOptions) (*v1alpha1.RoleBinding, error) Get(name string, options v1.GetOptions) (*v1alpha1.RoleBinding, error)
List(opts meta_v1.ListOptions) (*v1alpha1.RoleBindingList, error) List(opts v1.ListOptions) (*v1alpha1.RoleBindingList, error)
Watch(opts meta_v1.ListOptions) (watch.Interface, error) Watch(opts v1.ListOptions) (watch.Interface, error)
Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1alpha1.RoleBinding, err error) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1alpha1.RoleBinding, err error)
RoleBindingExpansion RoleBindingExpansion
} }
@ -96,7 +95,7 @@ func (c *roleBindings) Delete(name string, options *v1.DeleteOptions) error {
} }
// DeleteCollection deletes a collection of objects. // DeleteCollection deletes a collection of objects.
func (c *roleBindings) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *roleBindings) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
return c.client.Delete(). return c.client.Delete().
Namespace(c.ns). Namespace(c.ns).
Resource("rolebindings"). Resource("rolebindings").
@ -107,7 +106,7 @@ func (c *roleBindings) DeleteCollection(options *v1.DeleteOptions, listOptions m
} }
// Get takes name of the roleBinding, and returns the corresponding roleBinding object, and an error if there is any. // Get takes name of the roleBinding, and returns the corresponding roleBinding object, and an error if there is any.
func (c *roleBindings) Get(name string, options meta_v1.GetOptions) (result *v1alpha1.RoleBinding, err error) { func (c *roleBindings) Get(name string, options v1.GetOptions) (result *v1alpha1.RoleBinding, err error) {
result = &v1alpha1.RoleBinding{} result = &v1alpha1.RoleBinding{}
err = c.client.Get(). err = c.client.Get().
Namespace(c.ns). Namespace(c.ns).
@ -120,7 +119,7 @@ func (c *roleBindings) Get(name string, options meta_v1.GetOptions) (result *v1a
} }
// List takes label and field selectors, and returns the list of RoleBindings that match those selectors. // List takes label and field selectors, and returns the list of RoleBindings that match those selectors.
func (c *roleBindings) List(opts meta_v1.ListOptions) (result *v1alpha1.RoleBindingList, err error) { func (c *roleBindings) List(opts v1.ListOptions) (result *v1alpha1.RoleBindingList, err error) {
result = &v1alpha1.RoleBindingList{} result = &v1alpha1.RoleBindingList{}
err = c.client.Get(). err = c.client.Get().
Namespace(c.ns). Namespace(c.ns).
@ -132,7 +131,7 @@ func (c *roleBindings) List(opts meta_v1.ListOptions) (result *v1alpha1.RoleBind
} }
// Watch returns a watch.Interface that watches the requested roleBindings. // Watch returns a watch.Interface that watches the requested roleBindings.
func (c *roleBindings) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { func (c *roleBindings) Watch(opts v1.ListOptions) (watch.Interface, error) {
return c.client.Get(). return c.client.Get().
Prefix("watch"). Prefix("watch").
Namespace(c.ns). Namespace(c.ns).

19
kubernetes/typed/rbac/v1beta1/clusterrole.go
View File

@ -17,11 +17,10 @@ limitations under the License.
package v1beta1 package v1beta1
import ( import (
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
types "k8s.io/apimachinery/pkg/types" types "k8s.io/apimachinery/pkg/types"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
api "k8s.io/client-go/pkg/api" api "k8s.io/client-go/pkg/api"
v1 "k8s.io/client-go/pkg/api/v1"
v1beta1 "k8s.io/client-go/pkg/apis/rbac/v1beta1" v1beta1 "k8s.io/client-go/pkg/apis/rbac/v1beta1"
rest "k8s.io/client-go/rest" rest "k8s.io/client-go/rest"
) )
@ -37,10 +36,10 @@ type ClusterRoleInterface interface {
Create(*v1beta1.ClusterRole) (*v1beta1.ClusterRole, error) Create(*v1beta1.ClusterRole) (*v1beta1.ClusterRole, error)
Update(*v1beta1.ClusterRole) (*v1beta1.ClusterRole, error) Update(*v1beta1.ClusterRole) (*v1beta1.ClusterRole, error)
Delete(name string, options *v1.DeleteOptions) error Delete(name string, options *v1.DeleteOptions) error
DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
Get(name string, options meta_v1.GetOptions) (*v1beta1.ClusterRole, error) Get(name string, options v1.GetOptions) (*v1beta1.ClusterRole, error)
List(opts meta_v1.ListOptions) (*v1beta1.ClusterRoleList, error) List(opts v1.ListOptions) (*v1beta1.ClusterRoleList, error)
Watch(opts meta_v1.ListOptions) (watch.Interface, error) Watch(opts v1.ListOptions) (watch.Interface, error)
Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.ClusterRole, err error) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.ClusterRole, err error)
ClusterRoleExpansion ClusterRoleExpansion
} }
@ -91,7 +90,7 @@ func (c *clusterRoles) Delete(name string, options *v1.DeleteOptions) error {
} }
// DeleteCollection deletes a collection of objects. // DeleteCollection deletes a collection of objects.
func (c *clusterRoles) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *clusterRoles) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
return c.client.Delete(). return c.client.Delete().
Resource("clusterroles"). Resource("clusterroles").
VersionedParams(&listOptions, api.ParameterCodec). VersionedParams(&listOptions, api.ParameterCodec).
@ -101,7 +100,7 @@ func (c *clusterRoles) DeleteCollection(options *v1.DeleteOptions, listOptions m
} }
// Get takes name of the clusterRole, and returns the corresponding clusterRole object, and an error if there is any. // Get takes name of the clusterRole, and returns the corresponding clusterRole object, and an error if there is any.
func (c *clusterRoles) Get(name string, options meta_v1.GetOptions) (result *v1beta1.ClusterRole, err error) { func (c *clusterRoles) Get(name string, options v1.GetOptions) (result *v1beta1.ClusterRole, err error) {
result = &v1beta1.ClusterRole{} result = &v1beta1.ClusterRole{}
err = c.client.Get(). err = c.client.Get().
Resource("clusterroles"). Resource("clusterroles").
@ -113,7 +112,7 @@ func (c *clusterRoles) Get(name string, options meta_v1.GetOptions) (result *v1b
} }
// List takes label and field selectors, and returns the list of ClusterRoles that match those selectors. // List takes label and field selectors, and returns the list of ClusterRoles that match those selectors.
func (c *clusterRoles) List(opts meta_v1.ListOptions) (result *v1beta1.ClusterRoleList, err error) { func (c *clusterRoles) List(opts v1.ListOptions) (result *v1beta1.ClusterRoleList, err error) {
result = &v1beta1.ClusterRoleList{} result = &v1beta1.ClusterRoleList{}
err = c.client.Get(). err = c.client.Get().
Resource("clusterroles"). Resource("clusterroles").
@ -124,7 +123,7 @@ func (c *clusterRoles) List(opts meta_v1.ListOptions) (result *v1beta1.ClusterRo
} }
// Watch returns a watch.Interface that watches the requested clusterRoles. // Watch returns a watch.Interface that watches the requested clusterRoles.
func (c *clusterRoles) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { func (c *clusterRoles) Watch(opts v1.ListOptions) (watch.Interface, error) {
return c.client.Get(). return c.client.Get().
Prefix("watch"). Prefix("watch").
Resource("clusterroles"). Resource("clusterroles").

19
kubernetes/typed/rbac/v1beta1/clusterrolebinding.go
View File

@ -17,11 +17,10 @@ limitations under the License.
package v1beta1 package v1beta1
import ( import (
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
types "k8s.io/apimachinery/pkg/types" types "k8s.io/apimachinery/pkg/types"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
api "k8s.io/client-go/pkg/api" api "k8s.io/client-go/pkg/api"
v1 "k8s.io/client-go/pkg/api/v1"
v1beta1 "k8s.io/client-go/pkg/apis/rbac/v1beta1" v1beta1 "k8s.io/client-go/pkg/apis/rbac/v1beta1"
rest "k8s.io/client-go/rest" rest "k8s.io/client-go/rest"
) )
@ -37,10 +36,10 @@ type ClusterRoleBindingInterface interface {
Create(*v1beta1.ClusterRoleBinding) (*v1beta1.ClusterRoleBinding, error) Create(*v1beta1.ClusterRoleBinding) (*v1beta1.ClusterRoleBinding, error)
Update(*v1beta1.ClusterRoleBinding) (*v1beta1.ClusterRoleBinding, error) Update(*v1beta1.ClusterRoleBinding) (*v1beta1.ClusterRoleBinding, error)
Delete(name string, options *v1.DeleteOptions) error Delete(name string, options *v1.DeleteOptions) error
DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
Get(name string, options meta_v1.GetOptions) (*v1beta1.ClusterRoleBinding, error) Get(name string, options v1.GetOptions) (*v1beta1.ClusterRoleBinding, error)
List(opts meta_v1.ListOptions) (*v1beta1.ClusterRoleBindingList, error) List(opts v1.ListOptions) (*v1beta1.ClusterRoleBindingList, error)
Watch(opts meta_v1.ListOptions) (watch.Interface, error) Watch(opts v1.ListOptions) (watch.Interface, error)
Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.ClusterRoleBinding, err error) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.ClusterRoleBinding, err error)
ClusterRoleBindingExpansion ClusterRoleBindingExpansion
} }
@ -91,7 +90,7 @@ func (c *clusterRoleBindings) Delete(name string, options *v1.DeleteOptions) err
} }
// DeleteCollection deletes a collection of objects. // DeleteCollection deletes a collection of objects.
func (c *clusterRoleBindings) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *clusterRoleBindings) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
return c.client.Delete(). return c.client.Delete().
Resource("clusterrolebindings"). Resource("clusterrolebindings").
VersionedParams(&listOptions, api.ParameterCodec). VersionedParams(&listOptions, api.ParameterCodec).
@ -101,7 +100,7 @@ func (c *clusterRoleBindings) DeleteCollection(options *v1.DeleteOptions, listOp
} }
// Get takes name of the clusterRoleBinding, and returns the corresponding clusterRoleBinding object, and an error if there is any. // Get takes name of the clusterRoleBinding, and returns the corresponding clusterRoleBinding object, and an error if there is any.
func (c *clusterRoleBindings) Get(name string, options meta_v1.GetOptions) (result *v1beta1.ClusterRoleBinding, err error) { func (c *clusterRoleBindings) Get(name string, options v1.GetOptions) (result *v1beta1.ClusterRoleBinding, err error) {
result = &v1beta1.ClusterRoleBinding{} result = &v1beta1.ClusterRoleBinding{}
err = c.client.Get(). err = c.client.Get().
Resource("clusterrolebindings"). Resource("clusterrolebindings").
@ -113,7 +112,7 @@ func (c *clusterRoleBindings) Get(name string, options meta_v1.GetOptions) (resu
} }
// List takes label and field selectors, and returns the list of ClusterRoleBindings that match those selectors. // List takes label and field selectors, and returns the list of ClusterRoleBindings that match those selectors.
func (c *clusterRoleBindings) List(opts meta_v1.ListOptions) (result *v1beta1.ClusterRoleBindingList, err error) { func (c *clusterRoleBindings) List(opts v1.ListOptions) (result *v1beta1.ClusterRoleBindingList, err error) {
result = &v1beta1.ClusterRoleBindingList{} result = &v1beta1.ClusterRoleBindingList{}
err = c.client.Get(). err = c.client.Get().
Resource("clusterrolebindings"). Resource("clusterrolebindings").
@ -124,7 +123,7 @@ func (c *clusterRoleBindings) List(opts meta_v1.ListOptions) (result *v1beta1.Cl
} }
// Watch returns a watch.Interface that watches the requested clusterRoleBindings. // Watch returns a watch.Interface that watches the requested clusterRoleBindings.
func (c *clusterRoleBindings) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { func (c *clusterRoleBindings) Watch(opts v1.ListOptions) (watch.Interface, error) {
return c.client.Get(). return c.client.Get().
Prefix("watch"). Prefix("watch").
Resource("clusterrolebindings"). Resource("clusterrolebindings").

11
kubernetes/typed/rbac/v1beta1/fake/fake_clusterrole.go
View File

@ -17,12 +17,11 @@ limitations under the License.
package fake package fake
import ( import (
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
labels "k8s.io/apimachinery/pkg/labels" labels "k8s.io/apimachinery/pkg/labels"
schema "k8s.io/apimachinery/pkg/runtime/schema" schema "k8s.io/apimachinery/pkg/runtime/schema"
types "k8s.io/apimachinery/pkg/types" types "k8s.io/apimachinery/pkg/types"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
v1 "k8s.io/client-go/pkg/api/v1"
v1beta1 "k8s.io/client-go/pkg/apis/rbac/v1beta1" v1beta1 "k8s.io/client-go/pkg/apis/rbac/v1beta1"
testing "k8s.io/client-go/testing" testing "k8s.io/client-go/testing"
) )
@ -58,14 +57,14 @@ func (c *FakeClusterRoles) Delete(name string, options *v1.DeleteOptions) error
return err return err
} }
func (c *FakeClusterRoles) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *FakeClusterRoles) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
action := testing.NewRootDeleteCollectionAction(clusterrolesResource, listOptions) action := testing.NewRootDeleteCollectionAction(clusterrolesResource, listOptions)
_, err := c.Fake.Invokes(action, &v1beta1.ClusterRoleList{}) _, err := c.Fake.Invokes(action, &v1beta1.ClusterRoleList{})
return err return err
} }
func (c *FakeClusterRoles) Get(name string, options meta_v1.GetOptions) (result *v1beta1.ClusterRole, err error) { func (c *FakeClusterRoles) Get(name string, options v1.GetOptions) (result *v1beta1.ClusterRole, err error) {
obj, err := c.Fake. obj, err := c.Fake.
Invokes(testing.NewRootGetAction(clusterrolesResource, name), &v1beta1.ClusterRole{}) Invokes(testing.NewRootGetAction(clusterrolesResource, name), &v1beta1.ClusterRole{})
if obj == nil { if obj == nil {
@ -74,7 +73,7 @@ func (c *FakeClusterRoles) Get(name string, options meta_v1.GetOptions) (result
return obj.(*v1beta1.ClusterRole), err return obj.(*v1beta1.ClusterRole), err
} }
func (c *FakeClusterRoles) List(opts meta_v1.ListOptions) (result *v1beta1.ClusterRoleList, err error) { func (c *FakeClusterRoles) List(opts v1.ListOptions) (result *v1beta1.ClusterRoleList, err error) {
obj, err := c.Fake. obj, err := c.Fake.
Invokes(testing.NewRootListAction(clusterrolesResource, opts), &v1beta1.ClusterRoleList{}) Invokes(testing.NewRootListAction(clusterrolesResource, opts), &v1beta1.ClusterRoleList{})
if obj == nil { if obj == nil {
@ -95,7 +94,7 @@ func (c *FakeClusterRoles) List(opts meta_v1.ListOptions) (result *v1beta1.Clust
} }
// Watch returns a watch.Interface that watches the requested clusterRoles. // Watch returns a watch.Interface that watches the requested clusterRoles.
func (c *FakeClusterRoles) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { func (c *FakeClusterRoles) Watch(opts v1.ListOptions) (watch.Interface, error) {
return c.Fake. return c.Fake.
InvokesWatch(testing.NewRootWatchAction(clusterrolesResource, opts)) InvokesWatch(testing.NewRootWatchAction(clusterrolesResource, opts))
} }

11
kubernetes/typed/rbac/v1beta1/fake/fake_clusterrolebinding.go
View File

@ -17,12 +17,11 @@ limitations under the License.
package fake package fake
import ( import (
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
labels "k8s.io/apimachinery/pkg/labels" labels "k8s.io/apimachinery/pkg/labels"
schema "k8s.io/apimachinery/pkg/runtime/schema" schema "k8s.io/apimachinery/pkg/runtime/schema"
types "k8s.io/apimachinery/pkg/types" types "k8s.io/apimachinery/pkg/types"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
v1 "k8s.io/client-go/pkg/api/v1"
v1beta1 "k8s.io/client-go/pkg/apis/rbac/v1beta1" v1beta1 "k8s.io/client-go/pkg/apis/rbac/v1beta1"
testing "k8s.io/client-go/testing" testing "k8s.io/client-go/testing"
) )
@ -58,14 +57,14 @@ func (c *FakeClusterRoleBindings) Delete(name string, options *v1.DeleteOptions)
return err return err
} }
func (c *FakeClusterRoleBindings) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *FakeClusterRoleBindings) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
action := testing.NewRootDeleteCollectionAction(clusterrolebindingsResource, listOptions) action := testing.NewRootDeleteCollectionAction(clusterrolebindingsResource, listOptions)
_, err := c.Fake.Invokes(action, &v1beta1.ClusterRoleBindingList{}) _, err := c.Fake.Invokes(action, &v1beta1.ClusterRoleBindingList{})
return err return err
} }
func (c *FakeClusterRoleBindings) Get(name string, options meta_v1.GetOptions) (result *v1beta1.ClusterRoleBinding, err error) { func (c *FakeClusterRoleBindings) Get(name string, options v1.GetOptions) (result *v1beta1.ClusterRoleBinding, err error) {
obj, err := c.Fake. obj, err := c.Fake.
Invokes(testing.NewRootGetAction(clusterrolebindingsResource, name), &v1beta1.ClusterRoleBinding{}) Invokes(testing.NewRootGetAction(clusterrolebindingsResource, name), &v1beta1.ClusterRoleBinding{})
if obj == nil { if obj == nil {
@ -74,7 +73,7 @@ func (c *FakeClusterRoleBindings) Get(name string, options meta_v1.GetOptions) (
return obj.(*v1beta1.ClusterRoleBinding), err return obj.(*v1beta1.ClusterRoleBinding), err
} }
func (c *FakeClusterRoleBindings) List(opts meta_v1.ListOptions) (result *v1beta1.ClusterRoleBindingList, err error) { func (c *FakeClusterRoleBindings) List(opts v1.ListOptions) (result *v1beta1.ClusterRoleBindingList, err error) {
obj, err := c.Fake. obj, err := c.Fake.
Invokes(testing.NewRootListAction(clusterrolebindingsResource, opts), &v1beta1.ClusterRoleBindingList{}) Invokes(testing.NewRootListAction(clusterrolebindingsResource, opts), &v1beta1.ClusterRoleBindingList{})
if obj == nil { if obj == nil {
@ -95,7 +94,7 @@ func (c *FakeClusterRoleBindings) List(opts meta_v1.ListOptions) (result *v1beta
} }
// Watch returns a watch.Interface that watches the requested clusterRoleBindings. // Watch returns a watch.Interface that watches the requested clusterRoleBindings.
func (c *FakeClusterRoleBindings) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { func (c *FakeClusterRoleBindings) Watch(opts v1.ListOptions) (watch.Interface, error) {
return c.Fake. return c.Fake.
InvokesWatch(testing.NewRootWatchAction(clusterrolebindingsResource, opts)) InvokesWatch(testing.NewRootWatchAction(clusterrolebindingsResource, opts))
} }

11
kubernetes/typed/rbac/v1beta1/fake/fake_role.go
View File

@ -17,12 +17,11 @@ limitations under the License.
package fake package fake
import ( import (
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
labels "k8s.io/apimachinery/pkg/labels" labels "k8s.io/apimachinery/pkg/labels"
schema "k8s.io/apimachinery/pkg/runtime/schema" schema "k8s.io/apimachinery/pkg/runtime/schema"
types "k8s.io/apimachinery/pkg/types" types "k8s.io/apimachinery/pkg/types"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
v1 "k8s.io/client-go/pkg/api/v1"
v1beta1 "k8s.io/client-go/pkg/apis/rbac/v1beta1" v1beta1 "k8s.io/client-go/pkg/apis/rbac/v1beta1"
testing "k8s.io/client-go/testing" testing "k8s.io/client-go/testing"
) )
@ -62,14 +61,14 @@ func (c *FakeRoles) Delete(name string, options *v1.DeleteOptions) error {
return err return err
} }
func (c *FakeRoles) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *FakeRoles) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
action := testing.NewDeleteCollectionAction(rolesResource, c.ns, listOptions) action := testing.NewDeleteCollectionAction(rolesResource, c.ns, listOptions)
_, err := c.Fake.Invokes(action, &v1beta1.RoleList{}) _, err := c.Fake.Invokes(action, &v1beta1.RoleList{})
return err return err
} }
func (c *FakeRoles) Get(name string, options meta_v1.GetOptions) (result *v1beta1.Role, err error) { func (c *FakeRoles) Get(name string, options v1.GetOptions) (result *v1beta1.Role, err error) {
obj, err := c.Fake. obj, err := c.Fake.
Invokes(testing.NewGetAction(rolesResource, c.ns, name), &v1beta1.Role{}) Invokes(testing.NewGetAction(rolesResource, c.ns, name), &v1beta1.Role{})
@ -79,7 +78,7 @@ func (c *FakeRoles) Get(name string, options meta_v1.GetOptions) (result *v1beta
return obj.(*v1beta1.Role), err return obj.(*v1beta1.Role), err
} }
func (c *FakeRoles) List(opts meta_v1.ListOptions) (result *v1beta1.RoleList, err error) { func (c *FakeRoles) List(opts v1.ListOptions) (result *v1beta1.RoleList, err error) {
obj, err := c.Fake. obj, err := c.Fake.
Invokes(testing.NewListAction(rolesResource, c.ns, opts), &v1beta1.RoleList{}) Invokes(testing.NewListAction(rolesResource, c.ns, opts), &v1beta1.RoleList{})
@ -101,7 +100,7 @@ func (c *FakeRoles) List(opts meta_v1.ListOptions) (result *v1beta1.RoleList, er
} }
// Watch returns a watch.Interface that watches the requested roles. // Watch returns a watch.Interface that watches the requested roles.
func (c *FakeRoles) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { func (c *FakeRoles) Watch(opts v1.ListOptions) (watch.Interface, error) {
return c.Fake. return c.Fake.
InvokesWatch(testing.NewWatchAction(rolesResource, c.ns, opts)) InvokesWatch(testing.NewWatchAction(rolesResource, c.ns, opts))

11
kubernetes/typed/rbac/v1beta1/fake/fake_rolebinding.go
View File

@ -17,12 +17,11 @@ limitations under the License.
package fake package fake
import ( import (
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
labels "k8s.io/apimachinery/pkg/labels" labels "k8s.io/apimachinery/pkg/labels"
schema "k8s.io/apimachinery/pkg/runtime/schema" schema "k8s.io/apimachinery/pkg/runtime/schema"
types "k8s.io/apimachinery/pkg/types" types "k8s.io/apimachinery/pkg/types"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
v1 "k8s.io/client-go/pkg/api/v1"
v1beta1 "k8s.io/client-go/pkg/apis/rbac/v1beta1" v1beta1 "k8s.io/client-go/pkg/apis/rbac/v1beta1"
testing "k8s.io/client-go/testing" testing "k8s.io/client-go/testing"
) )
@ -62,14 +61,14 @@ func (c *FakeRoleBindings) Delete(name string, options *v1.DeleteOptions) error
return err return err
} }
func (c *FakeRoleBindings) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *FakeRoleBindings) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
action := testing.NewDeleteCollectionAction(rolebindingsResource, c.ns, listOptions) action := testing.NewDeleteCollectionAction(rolebindingsResource, c.ns, listOptions)
_, err := c.Fake.Invokes(action, &v1beta1.RoleBindingList{}) _, err := c.Fake.Invokes(action, &v1beta1.RoleBindingList{})
return err return err
} }
func (c *FakeRoleBindings) Get(name string, options meta_v1.GetOptions) (result *v1beta1.RoleBinding, err error) { func (c *FakeRoleBindings) Get(name string, options v1.GetOptions) (result *v1beta1.RoleBinding, err error) {
obj, err := c.Fake. obj, err := c.Fake.
Invokes(testing.NewGetAction(rolebindingsResource, c.ns, name), &v1beta1.RoleBinding{}) Invokes(testing.NewGetAction(rolebindingsResource, c.ns, name), &v1beta1.RoleBinding{})
@ -79,7 +78,7 @@ func (c *FakeRoleBindings) Get(name string, options meta_v1.GetOptions) (result
return obj.(*v1beta1.RoleBinding), err return obj.(*v1beta1.RoleBinding), err
} }
func (c *FakeRoleBindings) List(opts meta_v1.ListOptions) (result *v1beta1.RoleBindingList, err error) { func (c *FakeRoleBindings) List(opts v1.ListOptions) (result *v1beta1.RoleBindingList, err error) {
obj, err := c.Fake. obj, err := c.Fake.
Invokes(testing.NewListAction(rolebindingsResource, c.ns, opts), &v1beta1.RoleBindingList{}) Invokes(testing.NewListAction(rolebindingsResource, c.ns, opts), &v1beta1.RoleBindingList{})
@ -101,7 +100,7 @@ func (c *FakeRoleBindings) List(opts meta_v1.ListOptions) (result *v1beta1.RoleB
} }
// Watch returns a watch.Interface that watches the requested roleBindings. // Watch returns a watch.Interface that watches the requested roleBindings.
func (c *FakeRoleBindings) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { func (c *FakeRoleBindings) Watch(opts v1.ListOptions) (watch.Interface, error) {
return c.Fake. return c.Fake.
InvokesWatch(testing.NewWatchAction(rolebindingsResource, c.ns, opts)) InvokesWatch(testing.NewWatchAction(rolebindingsResource, c.ns, opts))

19
kubernetes/typed/rbac/v1beta1/role.go
View File

@ -17,11 +17,10 @@ limitations under the License.
package v1beta1 package v1beta1
import ( import (
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
types "k8s.io/apimachinery/pkg/types" types "k8s.io/apimachinery/pkg/types"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
api "k8s.io/client-go/pkg/api" api "k8s.io/client-go/pkg/api"
v1 "k8s.io/client-go/pkg/api/v1"
v1beta1 "k8s.io/client-go/pkg/apis/rbac/v1beta1" v1beta1 "k8s.io/client-go/pkg/apis/rbac/v1beta1"
rest "k8s.io/client-go/rest" rest "k8s.io/client-go/rest"
) )
@ -37,10 +36,10 @@ type RoleInterface interface {
Create(*v1beta1.Role) (*v1beta1.Role, error) Create(*v1beta1.Role) (*v1beta1.Role, error)
Update(*v1beta1.Role) (*v1beta1.Role, error) Update(*v1beta1.Role) (*v1beta1.Role, error)
Delete(name string, options *v1.DeleteOptions) error Delete(name string, options *v1.DeleteOptions) error
DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
Get(name string, options meta_v1.GetOptions) (*v1beta1.Role, error) Get(name string, options v1.GetOptions) (*v1beta1.Role, error)
List(opts meta_v1.ListOptions) (*v1beta1.RoleList, error) List(opts v1.ListOptions) (*v1beta1.RoleList, error)
Watch(opts meta_v1.ListOptions) (watch.Interface, error) Watch(opts v1.ListOptions) (watch.Interface, error)
Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.Role, err error) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.Role, err error)
RoleExpansion RoleExpansion
} }
@ -96,7 +95,7 @@ func (c *roles) Delete(name string, options *v1.DeleteOptions) error {
} }
// DeleteCollection deletes a collection of objects. // DeleteCollection deletes a collection of objects.
func (c *roles) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *roles) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
return c.client.Delete(). return c.client.Delete().
Namespace(c.ns). Namespace(c.ns).
Resource("roles"). Resource("roles").
@ -107,7 +106,7 @@ func (c *roles) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.
} }
// Get takes name of the role, and returns the corresponding role object, and an error if there is any. // Get takes name of the role, and returns the corresponding role object, and an error if there is any.
func (c *roles) Get(name string, options meta_v1.GetOptions) (result *v1beta1.Role, err error) { func (c *roles) Get(name string, options v1.GetOptions) (result *v1beta1.Role, err error) {
result = &v1beta1.Role{} result = &v1beta1.Role{}
err = c.client.Get(). err = c.client.Get().
Namespace(c.ns). Namespace(c.ns).
@ -120,7 +119,7 @@ func (c *roles) Get(name string, options meta_v1.GetOptions) (result *v1beta1.Ro
} }
// List takes label and field selectors, and returns the list of Roles that match those selectors. // List takes label and field selectors, and returns the list of Roles that match those selectors.
func (c *roles) List(opts meta_v1.ListOptions) (result *v1beta1.RoleList, err error) { func (c *roles) List(opts v1.ListOptions) (result *v1beta1.RoleList, err error) {
result = &v1beta1.RoleList{} result = &v1beta1.RoleList{}
err = c.client.Get(). err = c.client.Get().
Namespace(c.ns). Namespace(c.ns).
@ -132,7 +131,7 @@ func (c *roles) List(opts meta_v1.ListOptions) (result *v1beta1.RoleList, err er
} }
// Watch returns a watch.Interface that watches the requested roles. // Watch returns a watch.Interface that watches the requested roles.
func (c *roles) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { func (c *roles) Watch(opts v1.ListOptions) (watch.Interface, error) {
return c.client.Get(). return c.client.Get().
Prefix("watch"). Prefix("watch").
Namespace(c.ns). Namespace(c.ns).

19
kubernetes/typed/rbac/v1beta1/rolebinding.go
View File

@ -17,11 +17,10 @@ limitations under the License.
package v1beta1 package v1beta1
import ( import (
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
types "k8s.io/apimachinery/pkg/types" types "k8s.io/apimachinery/pkg/types"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
api "k8s.io/client-go/pkg/api" api "k8s.io/client-go/pkg/api"
v1 "k8s.io/client-go/pkg/api/v1"
v1beta1 "k8s.io/client-go/pkg/apis/rbac/v1beta1" v1beta1 "k8s.io/client-go/pkg/apis/rbac/v1beta1"
rest "k8s.io/client-go/rest" rest "k8s.io/client-go/rest"
) )
@ -37,10 +36,10 @@ type RoleBindingInterface interface {
Create(*v1beta1.RoleBinding) (*v1beta1.RoleBinding, error) Create(*v1beta1.RoleBinding) (*v1beta1.RoleBinding, error)
Update(*v1beta1.RoleBinding) (*v1beta1.RoleBinding, error) Update(*v1beta1.RoleBinding) (*v1beta1.RoleBinding, error)
Delete(name string, options *v1.DeleteOptions) error Delete(name string, options *v1.DeleteOptions) error
DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
Get(name string, options meta_v1.GetOptions) (*v1beta1.RoleBinding, error) Get(name string, options v1.GetOptions) (*v1beta1.RoleBinding, error)
List(opts meta_v1.ListOptions) (*v1beta1.RoleBindingList, error) List(opts v1.ListOptions) (*v1beta1.RoleBindingList, error)
Watch(opts meta_v1.ListOptions) (watch.Interface, error) Watch(opts v1.ListOptions) (watch.Interface, error)
Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.RoleBinding, err error) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.RoleBinding, err error)
RoleBindingExpansion RoleBindingExpansion
} }
@ -96,7 +95,7 @@ func (c *roleBindings) Delete(name string, options *v1.DeleteOptions) error {
} }
// DeleteCollection deletes a collection of objects. // DeleteCollection deletes a collection of objects.
func (c *roleBindings) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *roleBindings) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
return c.client.Delete(). return c.client.Delete().
Namespace(c.ns). Namespace(c.ns).
Resource("rolebindings"). Resource("rolebindings").
@ -107,7 +106,7 @@ func (c *roleBindings) DeleteCollection(options *v1.DeleteOptions, listOptions m
} }
// Get takes name of the roleBinding, and returns the corresponding roleBinding object, and an error if there is any. // Get takes name of the roleBinding, and returns the corresponding roleBinding object, and an error if there is any.
func (c *roleBindings) Get(name string, options meta_v1.GetOptions) (result *v1beta1.RoleBinding, err error) { func (c *roleBindings) Get(name string, options v1.GetOptions) (result *v1beta1.RoleBinding, err error) {
result = &v1beta1.RoleBinding{} result = &v1beta1.RoleBinding{}
err = c.client.Get(). err = c.client.Get().
Namespace(c.ns). Namespace(c.ns).
@ -120,7 +119,7 @@ func (c *roleBindings) Get(name string, options meta_v1.GetOptions) (result *v1b
} }
// List takes label and field selectors, and returns the list of RoleBindings that match those selectors. // List takes label and field selectors, and returns the list of RoleBindings that match those selectors.
func (c *roleBindings) List(opts meta_v1.ListOptions) (result *v1beta1.RoleBindingList, err error) { func (c *roleBindings) List(opts v1.ListOptions) (result *v1beta1.RoleBindingList, err error) {
result = &v1beta1.RoleBindingList{} result = &v1beta1.RoleBindingList{}
err = c.client.Get(). err = c.client.Get().
Namespace(c.ns). Namespace(c.ns).
@ -132,7 +131,7 @@ func (c *roleBindings) List(opts meta_v1.ListOptions) (result *v1beta1.RoleBindi
} }
// Watch returns a watch.Interface that watches the requested roleBindings. // Watch returns a watch.Interface that watches the requested roleBindings.
func (c *roleBindings) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { func (c *roleBindings) Watch(opts v1.ListOptions) (watch.Interface, error) {
return c.client.Get(). return c.client.Get().
Prefix("watch"). Prefix("watch").
Namespace(c.ns). Namespace(c.ns).

11
kubernetes/typed/storage/v1beta1/fake/fake_storageclass.go
View File

@ -17,12 +17,11 @@ limitations under the License.
package fake package fake
import ( import (
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
labels "k8s.io/apimachinery/pkg/labels" labels "k8s.io/apimachinery/pkg/labels"
schema "k8s.io/apimachinery/pkg/runtime/schema" schema "k8s.io/apimachinery/pkg/runtime/schema"
types "k8s.io/apimachinery/pkg/types" types "k8s.io/apimachinery/pkg/types"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
v1 "k8s.io/client-go/pkg/api/v1"
v1beta1 "k8s.io/client-go/pkg/apis/storage/v1beta1" v1beta1 "k8s.io/client-go/pkg/apis/storage/v1beta1"
testing "k8s.io/client-go/testing" testing "k8s.io/client-go/testing"
) )
@ -58,14 +57,14 @@ func (c *FakeStorageClasses) Delete(name string, options *v1.DeleteOptions) erro
return err return err
} }
func (c *FakeStorageClasses) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *FakeStorageClasses) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
action := testing.NewRootDeleteCollectionAction(storageclassesResource, listOptions) action := testing.NewRootDeleteCollectionAction(storageclassesResource, listOptions)
_, err := c.Fake.Invokes(action, &v1beta1.StorageClassList{}) _, err := c.Fake.Invokes(action, &v1beta1.StorageClassList{})
return err return err
} }
func (c *FakeStorageClasses) Get(name string, options meta_v1.GetOptions) (result *v1beta1.StorageClass, err error) { func (c *FakeStorageClasses) Get(name string, options v1.GetOptions) (result *v1beta1.StorageClass, err error) {
obj, err := c.Fake. obj, err := c.Fake.
Invokes(testing.NewRootGetAction(storageclassesResource, name), &v1beta1.StorageClass{}) Invokes(testing.NewRootGetAction(storageclassesResource, name), &v1beta1.StorageClass{})
if obj == nil { if obj == nil {
@ -74,7 +73,7 @@ func (c *FakeStorageClasses) Get(name string, options meta_v1.GetOptions) (resul
return obj.(*v1beta1.StorageClass), err return obj.(*v1beta1.StorageClass), err
} }
func (c *FakeStorageClasses) List(opts meta_v1.ListOptions) (result *v1beta1.StorageClassList, err error) { func (c *FakeStorageClasses) List(opts v1.ListOptions) (result *v1beta1.StorageClassList, err error) {
obj, err := c.Fake. obj, err := c.Fake.
Invokes(testing.NewRootListAction(storageclassesResource, opts), &v1beta1.StorageClassList{}) Invokes(testing.NewRootListAction(storageclassesResource, opts), &v1beta1.StorageClassList{})
if obj == nil { if obj == nil {
@ -95,7 +94,7 @@ func (c *FakeStorageClasses) List(opts meta_v1.ListOptions) (result *v1beta1.Sto
} }
// Watch returns a watch.Interface that watches the requested storageClasses. // Watch returns a watch.Interface that watches the requested storageClasses.
func (c *FakeStorageClasses) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { func (c *FakeStorageClasses) Watch(opts v1.ListOptions) (watch.Interface, error) {
return c.Fake. return c.Fake.
InvokesWatch(testing.NewRootWatchAction(storageclassesResource, opts)) InvokesWatch(testing.NewRootWatchAction(storageclassesResource, opts))
} }

19
kubernetes/typed/storage/v1beta1/storageclass.go
View File

@ -17,11 +17,10 @@ limitations under the License.
package v1beta1 package v1beta1
import ( import (
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
types "k8s.io/apimachinery/pkg/types" types "k8s.io/apimachinery/pkg/types"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
api "k8s.io/client-go/pkg/api" api "k8s.io/client-go/pkg/api"
v1 "k8s.io/client-go/pkg/api/v1"
v1beta1 "k8s.io/client-go/pkg/apis/storage/v1beta1" v1beta1 "k8s.io/client-go/pkg/apis/storage/v1beta1"
rest "k8s.io/client-go/rest" rest "k8s.io/client-go/rest"
) )
@ -37,10 +36,10 @@ type StorageClassInterface interface {
Create(*v1beta1.StorageClass) (*v1beta1.StorageClass, error) Create(*v1beta1.StorageClass) (*v1beta1.StorageClass, error)
Update(*v1beta1.StorageClass) (*v1beta1.StorageClass, error) Update(*v1beta1.StorageClass) (*v1beta1.StorageClass, error)
Delete(name string, options *v1.DeleteOptions) error Delete(name string, options *v1.DeleteOptions) error
DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
Get(name string, options meta_v1.GetOptions) (*v1beta1.StorageClass, error) Get(name string, options v1.GetOptions) (*v1beta1.StorageClass, error)
List(opts meta_v1.ListOptions) (*v1beta1.StorageClassList, error) List(opts v1.ListOptions) (*v1beta1.StorageClassList, error)
Watch(opts meta_v1.ListOptions) (watch.Interface, error) Watch(opts v1.ListOptions) (watch.Interface, error)
Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.StorageClass, err error) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.StorageClass, err error)
StorageClassExpansion StorageClassExpansion
} }
@ -91,7 +90,7 @@ func (c *storageClasses) Delete(name string, options *v1.DeleteOptions) error {
} }
// DeleteCollection deletes a collection of objects. // DeleteCollection deletes a collection of objects.
func (c *storageClasses) DeleteCollection(options *v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *storageClasses) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
return c.client.Delete(). return c.client.Delete().
Resource("storageclasses"). Resource("storageclasses").
VersionedParams(&listOptions, api.ParameterCodec). VersionedParams(&listOptions, api.ParameterCodec).
@ -101,7 +100,7 @@ func (c *storageClasses) DeleteCollection(options *v1.DeleteOptions, listOptions
} }
// Get takes name of the storageClass, and returns the corresponding storageClass object, and an error if there is any. // Get takes name of the storageClass, and returns the corresponding storageClass object, and an error if there is any.
func (c *storageClasses) Get(name string, options meta_v1.GetOptions) (result *v1beta1.StorageClass, err error) { func (c *storageClasses) Get(name string, options v1.GetOptions) (result *v1beta1.StorageClass, err error) {
result = &v1beta1.StorageClass{} result = &v1beta1.StorageClass{}
err = c.client.Get(). err = c.client.Get().
Resource("storageclasses"). Resource("storageclasses").
@ -113,7 +112,7 @@ func (c *storageClasses) Get(name string, options meta_v1.GetOptions) (result *v
} }
// List takes label and field selectors, and returns the list of StorageClasses that match those selectors. // List takes label and field selectors, and returns the list of StorageClasses that match those selectors.
func (c *storageClasses) List(opts meta_v1.ListOptions) (result *v1beta1.StorageClassList, err error) { func (c *storageClasses) List(opts v1.ListOptions) (result *v1beta1.StorageClassList, err error) {
result = &v1beta1.StorageClassList{} result = &v1beta1.StorageClassList{}
err = c.client.Get(). err = c.client.Get().
Resource("storageclasses"). Resource("storageclasses").
@ -124,7 +123,7 @@ func (c *storageClasses) List(opts meta_v1.ListOptions) (result *v1beta1.Storage
} }
// Watch returns a watch.Interface that watches the requested storageClasses. // Watch returns a watch.Interface that watches the requested storageClasses.
func (c *storageClasses) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { func (c *storageClasses) Watch(opts v1.ListOptions) (watch.Interface, error) {
return c.client.Get(). return c.client.Get().
Prefix("watch"). Prefix("watch").
Resource("storageclasses"). Resource("storageclasses").

26
pkg/api/helpers.go
View File

@ -31,7 +31,6 @@ import (
"k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/selection" "k8s.io/apimachinery/pkg/selection"
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/sets"
"k8s.io/client-go/pkg/api/resource" "k8s.io/client-go/pkg/api/resource"
) )
@ -228,27 +227,6 @@ func IsIntegerResourceName(str string) bool {
return integerResources.Has(str) || IsOpaqueIntResourceName(ResourceName(str)) return integerResources.Has(str) || IsOpaqueIntResourceName(ResourceName(str))
} }
// NewDeleteOptions returns a DeleteOptions indicating the resource should
// be deleted within the specified grace period. Use zero to indicate
// immediate deletion. If you would prefer to use the default grace period,
// use &api.DeleteOptions{} directly.
func NewDeleteOptions(grace int64) *DeleteOptions {
return &DeleteOptions{GracePeriodSeconds: &grace}
}
// NewPreconditionDeleteOptions returns a DeleteOptions with a UID precondition set.
func NewPreconditionDeleteOptions(uid string) *DeleteOptions {
u := types.UID(uid)
p := Preconditions{UID: &u}
return &DeleteOptions{Preconditions: &p}
}
// NewUIDPreconditions returns a Preconditions with UID set.
func NewUIDPreconditions(uid string) *Preconditions {
u := types.UID(uid)
return &Preconditions{UID: &u}
}
// this function aims to check if the service's ClusterIP is set or not // this function aims to check if the service's ClusterIP is set or not
// the objective is not to perform validation here // the objective is not to perform validation here
func IsServiceIPSet(service *Service) bool { func IsServiceIPSet(service *Service) bool {
@ -451,10 +429,6 @@ func NodeSelectorRequirementsAsSelector(nsm []NodeSelectorRequirement) (labels.S
} }
const ( const (
// AffinityAnnotationKey represents the key of affinity data (json serialized)
// in the Annotations of a Pod.
AffinityAnnotationKey string = "scheduler.alpha.kubernetes.io/affinity"
// TolerationsAnnotationKey represents the key of tolerations data (json serialized) // TolerationsAnnotationKey represents the key of tolerations data (json serialized)
// in the Annotations of a Pod. // in the Annotations of a Pod.
TolerationsAnnotationKey string = "scheduler.alpha.kubernetes.io/tolerations" TolerationsAnnotationKey string = "scheduler.alpha.kubernetes.io/tolerations"

2
pkg/api/register.go
View File

@ -124,8 +124,6 @@ func addKnownTypes(scheme *runtime.Scheme) error {
&PersistentVolumeList{}, &PersistentVolumeList{},
&PersistentVolumeClaim{}, &PersistentVolumeClaim{},
&PersistentVolumeClaimList{}, &PersistentVolumeClaimList{},
&DeleteOptions{},
&ListOptions{},
&PodAttachOptions{}, &PodAttachOptions{},
&PodLogOptions{}, &PodLogOptions{},
&PodExecOptions{}, &PodExecOptions{},

27
pkg/api/types.go
View File

@ -729,8 +729,8 @@ type SecretVolumeSource struct {
// key and content is the value. If specified, the listed keys will be // key and content is the value. If specified, the listed keys will be
// projected into the specified paths, and unlisted keys will not be // projected into the specified paths, and unlisted keys will not be
// present. If a key is specified which is not present in the Secret, // present. If a key is specified which is not present in the Secret,
// the volume setup will error. Paths must be relative and may not contain // the volume setup will error unless it is marked optional. Paths must be
// the '..' path or start with '..'. // relative and may not contain the '..' path or start with '..'.
// +optional // +optional
Items []KeyToPath Items []KeyToPath
// Mode bits to use on created files by default. Must be a value between // Mode bits to use on created files by default. Must be a value between
@ -740,6 +740,9 @@ type SecretVolumeSource struct {
// mode, like fsGroup, and the result can be other mode bits set. // mode, like fsGroup, and the result can be other mode bits set.
// +optional // +optional
DefaultMode *int32 DefaultMode *int32
// Specify whether the Secret or it's key must be defined
// +optional
Optional *bool
} }
// Represents an NFS mount that lasts the lifetime of a pod. // Represents an NFS mount that lasts the lifetime of a pod.
@ -992,8 +995,8 @@ type ConfigMapVolumeSource struct {
// key and content is the value. If specified, the listed keys will be // key and content is the value. If specified, the listed keys will be
// projected into the specified paths, and unlisted keys will not be // projected into the specified paths, and unlisted keys will not be
// present. If a key is specified which is not present in the ConfigMap, // present. If a key is specified which is not present in the ConfigMap,
// the volume setup will error. Paths must be relative and may not contain // the volume setup will error unless it is marked optional. Paths must be
// the '..' path or start with '..'. // relative and may not contain the '..' path or start with '..'.
// +optional // +optional
Items []KeyToPath Items []KeyToPath
// Mode bits to use on created files by default. Must be a value between // Mode bits to use on created files by default. Must be a value between
@ -1003,6 +1006,9 @@ type ConfigMapVolumeSource struct {
// mode, like fsGroup, and the result can be other mode bits set. // mode, like fsGroup, and the result can be other mode bits set.
// +optional // +optional
DefaultMode *int32 DefaultMode *int32
// Specify whether the ConfigMap or it's keys must be defined
// +optional
Optional *bool
} }
// Maps a string key to a path within a volume. // Maps a string key to a path within a volume.
@ -1124,6 +1130,9 @@ type ConfigMapKeySelector struct {
LocalObjectReference LocalObjectReference
// The key to select. // The key to select.
Key string Key string
// Specify whether the ConfigMap or it's key must be defined
// +optional
Optional *bool
} }
// SecretKeySelector selects a key of a Secret. // SecretKeySelector selects a key of a Secret.
@ -1132,6 +1141,9 @@ type SecretKeySelector struct {
LocalObjectReference LocalObjectReference
// The key of the secret to select from. Must be a valid secret key. // The key of the secret to select from. Must be a valid secret key.
Key string Key string
// Specify whether the Secret or it's key must be defined
// +optional
Optional *bool
} }
// EnvFromSource represents the source of a set of ConfigMaps // EnvFromSource represents the source of a set of ConfigMaps
@ -1155,6 +1167,9 @@ type EnvFromSource struct {
type ConfigMapEnvSource struct { type ConfigMapEnvSource struct {
// The ConfigMap to select from. // The ConfigMap to select from.
LocalObjectReference LocalObjectReference
// Specify whether the ConfigMap must be defined
// +optional
Optional *bool
} }
// SecretEnvSource selects a Secret to populate the environment // SecretEnvSource selects a Secret to populate the environment
@ -1165,6 +1180,9 @@ type ConfigMapEnvSource struct {
type SecretEnvSource struct { type SecretEnvSource struct {
// The Secret to select from. // The Secret to select from.
LocalObjectReference LocalObjectReference
// Specify whether the Secret must be defined
// +optional
Optional *bool
} }
// HTTPHeader describes a custom header to be used in HTTP probes // HTTPHeader describes a custom header to be used in HTTP probes
@ -2845,6 +2863,7 @@ type Preconditions struct {
} }
// DeleteOptions may be provided when deleting an API object // DeleteOptions may be provided when deleting an API object
// DEPRECATED: This type has been moved to meta/v1 and will be removed soon.
type DeleteOptions struct { type DeleteOptions struct {
metav1.TypeMeta metav1.TypeMeta

1408
pkg/api/v1/generated.pb.go
View File

File diff suppressed because it is too large Load Diff

35
pkg/api/v1/generated.proto
View File

@ -279,6 +279,10 @@ message ConfigMap {
message ConfigMapEnvSource { message ConfigMapEnvSource {
// The ConfigMap to select from. // The ConfigMap to select from.
optional LocalObjectReference localObjectReference = 1; optional LocalObjectReference localObjectReference = 1;
// Specify whether the ConfigMap must be defined
// +optional
optional bool optional = 2;
} }
// Selects a key from a ConfigMap. // Selects a key from a ConfigMap.
@ -288,6 +292,10 @@ message ConfigMapKeySelector {
// The key to select. // The key to select.
optional string key = 2; optional string key = 2;
// Specify whether the ConfigMap or it's key must be defined
// +optional
optional bool optional = 3;
} }
// ConfigMapList is a resource containing a list of ConfigMap objects. // ConfigMapList is a resource containing a list of ConfigMap objects.
@ -314,8 +322,8 @@ message ConfigMapVolumeSource {
// key and content is the value. If specified, the listed keys will be // key and content is the value. If specified, the listed keys will be
// projected into the specified paths, and unlisted keys will not be // projected into the specified paths, and unlisted keys will not be
// present. If a key is specified which is not present in the ConfigMap, // present. If a key is specified which is not present in the ConfigMap,
// the volume setup will error. Paths must be relative and may not contain // the volume setup will error unless it is marked optional. Paths must be
// the '..' path or start with '..'. // relative and may not contain the '..' path or start with '..'.
// +optional // +optional
repeated KeyToPath items = 2; repeated KeyToPath items = 2;
@ -326,6 +334,10 @@ message ConfigMapVolumeSource {
// mode, like fsGroup, and the result can be other mode bits set. // mode, like fsGroup, and the result can be other mode bits set.
// +optional // +optional
optional int32 defaultMode = 3; optional int32 defaultMode = 3;
// Specify whether the ConfigMap or it's keys must be defined
// +optional
optional bool optional = 4;
} }
// A single application container that you want to run within a pod. // A single application container that you want to run within a pod.
@ -627,6 +639,8 @@ message DaemonEndpoint {
} }
// DeleteOptions may be provided when deleting an API object // DeleteOptions may be provided when deleting an API object
// DEPRECATED: This type has been moved to meta/v1 and will be removed soon.
// +k8s:openapi-gen=false
message DeleteOptions { message DeleteOptions {
// The duration in seconds before the object should be deleted. Value must be non-negative integer. // The duration in seconds before the object should be deleted. Value must be non-negative integer.
// The value zero indicates delete immediately. If this value is nil, the default grace period for the // The value zero indicates delete immediately. If this value is nil, the default grace period for the
@ -2694,6 +2708,7 @@ message PodTemplateSpec {
} }
// Preconditions must be fulfilled before an operation (update, delete, etc.) is carried out. // Preconditions must be fulfilled before an operation (update, delete, etc.) is carried out.
// +k8s:openapi-gen=false
message Preconditions { message Preconditions {
// Specifies the target UID. // Specifies the target UID.
// +optional // +optional
@ -3106,6 +3121,10 @@ message Secret {
message SecretEnvSource { message SecretEnvSource {
// The Secret to select from. // The Secret to select from.
optional LocalObjectReference localObjectReference = 1; optional LocalObjectReference localObjectReference = 1;
// Specify whether the Secret must be defined
// +optional
optional bool optional = 2;
} }
// SecretKeySelector selects a key of a Secret. // SecretKeySelector selects a key of a Secret.
@ -3115,6 +3134,10 @@ message SecretKeySelector {
// The key of the secret to select from. Must be a valid secret key. // The key of the secret to select from. Must be a valid secret key.
optional string key = 2; optional string key = 2;
// Specify whether the Secret or it's key must be defined
// +optional
optional bool optional = 3;
} }
// SecretList is a list of Secret. // SecretList is a list of Secret.
@ -3145,8 +3168,8 @@ message SecretVolumeSource {
// key and content is the value. If specified, the listed keys will be // key and content is the value. If specified, the listed keys will be
// projected into the specified paths, and unlisted keys will not be // projected into the specified paths, and unlisted keys will not be
// present. If a key is specified which is not present in the Secret, // present. If a key is specified which is not present in the Secret,
// the volume setup will error. Paths must be relative and may not contain // the volume setup will error unless it is marked optional. Paths must be
// the '..' path or start with '..'. // relative and may not contain the '..' path or start with '..'.
// +optional // +optional
repeated KeyToPath items = 2; repeated KeyToPath items = 2;
@ -3157,6 +3180,10 @@ message SecretVolumeSource {
// mode, like fsGroup, and the result can be other mode bits set. // mode, like fsGroup, and the result can be other mode bits set.
// +optional // +optional
optional int32 defaultMode = 3; optional int32 defaultMode = 3;
// Specify whether the Secret or it's keys must be defined
// +optional
optional bool optional = 4;
} }
// SecurityContext holds security configuration that will be applied to a container. // SecurityContext holds security configuration that will be applied to a container.

20
pkg/api/v1/helpers.go
View File

@ -47,7 +47,7 @@ func OpaqueIntResourceName(name string) ResourceName {
// NewDeleteOptions returns a DeleteOptions indicating the resource should // NewDeleteOptions returns a DeleteOptions indicating the resource should
// be deleted within the specified grace period. Use zero to indicate // be deleted within the specified grace period. Use zero to indicate
// immediate deletion. If you would prefer to use the default grace period, // immediate deletion. If you would prefer to use the default grace period,
// use &api.DeleteOptions{} directly. // use &metav1.DeleteOptions{} directly.
func NewDeleteOptions(grace int64) *DeleteOptions { func NewDeleteOptions(grace int64) *DeleteOptions {
return &DeleteOptions{GracePeriodSeconds: &grace} return &DeleteOptions{GracePeriodSeconds: &grace}
} }
@ -233,10 +233,6 @@ func NodeSelectorRequirementsAsSelector(nsm []NodeSelectorRequirement) (labels.S
} }
const ( const (
// AffinityAnnotationKey represents the key of affinity data (json serialized)
// in the Annotations of a Pod.
AffinityAnnotationKey string = "scheduler.alpha.kubernetes.io/affinity"
// TolerationsAnnotationKey represents the key of tolerations data (json serialized) // TolerationsAnnotationKey represents the key of tolerations data (json serialized)
// in the Annotations of a Pod. // in the Annotations of a Pod.
TolerationsAnnotationKey string = "scheduler.alpha.kubernetes.io/tolerations" TolerationsAnnotationKey string = "scheduler.alpha.kubernetes.io/tolerations"
@ -276,20 +272,6 @@ const (
UnsafeSysctlsPodAnnotationKey string = "security.alpha.kubernetes.io/unsafe-sysctls" UnsafeSysctlsPodAnnotationKey string = "security.alpha.kubernetes.io/unsafe-sysctls"
) )
// GetAffinityFromPod gets the json serialized affinity data from Pod.Annotations
// and converts it to the Affinity type in api.
func GetAffinityFromPodAnnotations(annotations map[string]string) (*Affinity, error) {
if len(annotations) > 0 && annotations[AffinityAnnotationKey] != "" {
var affinity Affinity
err := json.Unmarshal([]byte(annotations[AffinityAnnotationKey]), &affinity)
if err != nil {
return nil, err
}
return &affinity, nil
}
return nil, nil
}
// GetTolerationsFromPodAnnotations gets the json serialized tolerations data from Pod.Annotations // GetTolerationsFromPodAnnotations gets the json serialized tolerations data from Pod.Annotations
// and converts it to the []Toleration type in api. // and converts it to the []Toleration type in api.
func GetTolerationsFromPodAnnotations(annotations map[string]string) ([]Toleration, error) { func GetTolerationsFromPodAnnotations(annotations map[string]string) ([]Toleration, error) {

4
pkg/api/v1/register.go
View File

@ -74,10 +74,6 @@ func addKnownTypes(scheme *runtime.Scheme) error {
&PersistentVolumeList{}, &PersistentVolumeList{},
&PersistentVolumeClaim{}, &PersistentVolumeClaim{},
&PersistentVolumeClaimList{}, &PersistentVolumeClaimList{},
&DeleteOptions{},
&metav1.ExportOptions{},
&metav1.GetOptions{},
&ListOptions{},
&PodAttachOptions{}, &PodAttachOptions{},
&PodLogOptions{}, &PodLogOptions{},
&PodExecOptions{}, &PodExecOptions{},

860
pkg/api/v1/types.generated.go
View File

File diff suppressed because it is too large Load Diff

29
pkg/api/v1/types.go
View File

@ -924,8 +924,8 @@ type SecretVolumeSource struct {
// key and content is the value. If specified, the listed keys will be // key and content is the value. If specified, the listed keys will be
// projected into the specified paths, and unlisted keys will not be // projected into the specified paths, and unlisted keys will not be
// present. If a key is specified which is not present in the Secret, // present. If a key is specified which is not present in the Secret,
// the volume setup will error. Paths must be relative and may not contain // the volume setup will error unless it is marked optional. Paths must be
// the '..' path or start with '..'. // relative and may not contain the '..' path or start with '..'.
// +optional // +optional
Items []KeyToPath `json:"items,omitempty" protobuf:"bytes,2,rep,name=items"` Items []KeyToPath `json:"items,omitempty" protobuf:"bytes,2,rep,name=items"`
// Optional: mode bits to use on created files by default. Must be a // Optional: mode bits to use on created files by default. Must be a
@ -935,6 +935,9 @@ type SecretVolumeSource struct {
// mode, like fsGroup, and the result can be other mode bits set. // mode, like fsGroup, and the result can be other mode bits set.
// +optional // +optional
DefaultMode *int32 `json:"defaultMode,omitempty" protobuf:"bytes,3,opt,name=defaultMode"` DefaultMode *int32 `json:"defaultMode,omitempty" protobuf:"bytes,3,opt,name=defaultMode"`
// Specify whether the Secret or it's keys must be defined
// +optional
Optional *bool `json:"optional,omitempty" protobuf:"varint,4,opt,name=optional"`
} }
const ( const (
@ -1081,8 +1084,8 @@ type ConfigMapVolumeSource struct {
// key and content is the value. If specified, the listed keys will be // key and content is the value. If specified, the listed keys will be
// projected into the specified paths, and unlisted keys will not be // projected into the specified paths, and unlisted keys will not be
// present. If a key is specified which is not present in the ConfigMap, // present. If a key is specified which is not present in the ConfigMap,
// the volume setup will error. Paths must be relative and may not contain // the volume setup will error unless it is marked optional. Paths must be
// the '..' path or start with '..'. // relative and may not contain the '..' path or start with '..'.
// +optional // +optional
Items []KeyToPath `json:"items,omitempty" protobuf:"bytes,2,rep,name=items"` Items []KeyToPath `json:"items,omitempty" protobuf:"bytes,2,rep,name=items"`
// Optional: mode bits to use on created files by default. Must be a // Optional: mode bits to use on created files by default. Must be a
@ -1092,6 +1095,9 @@ type ConfigMapVolumeSource struct {
// mode, like fsGroup, and the result can be other mode bits set. // mode, like fsGroup, and the result can be other mode bits set.
// +optional // +optional
DefaultMode *int32 `json:"defaultMode,omitempty" protobuf:"varint,3,opt,name=defaultMode"` DefaultMode *int32 `json:"defaultMode,omitempty" protobuf:"varint,3,opt,name=defaultMode"`
// Specify whether the ConfigMap or it's keys must be defined
// +optional
Optional *bool `json:"optional,omitempty" protobuf:"varint,4,opt,name=optional"`
} }
const ( const (
@ -1225,6 +1231,9 @@ type ConfigMapKeySelector struct {
LocalObjectReference `json:",inline" protobuf:"bytes,1,opt,name=localObjectReference"` LocalObjectReference `json:",inline" protobuf:"bytes,1,opt,name=localObjectReference"`
// The key to select. // The key to select.
Key string `json:"key" protobuf:"bytes,2,opt,name=key"` Key string `json:"key" protobuf:"bytes,2,opt,name=key"`
// Specify whether the ConfigMap or it's key must be defined
// +optional
Optional *bool `json:"optional,omitempty" protobuf:"varint,3,opt,name=optional"`
} }
// SecretKeySelector selects a key of a Secret. // SecretKeySelector selects a key of a Secret.
@ -1233,6 +1242,9 @@ type SecretKeySelector struct {
LocalObjectReference `json:",inline" protobuf:"bytes,1,opt,name=localObjectReference"` LocalObjectReference `json:",inline" protobuf:"bytes,1,opt,name=localObjectReference"`
// The key of the secret to select from. Must be a valid secret key. // The key of the secret to select from. Must be a valid secret key.
Key string `json:"key" protobuf:"bytes,2,opt,name=key"` Key string `json:"key" protobuf:"bytes,2,opt,name=key"`
// Specify whether the Secret or it's key must be defined
// +optional
Optional *bool `json:"optional,omitempty" protobuf:"varint,3,opt,name=optional"`
} }
// EnvFromSource represents the source of a set of ConfigMaps // EnvFromSource represents the source of a set of ConfigMaps
@ -1256,6 +1268,9 @@ type EnvFromSource struct {
type ConfigMapEnvSource struct { type ConfigMapEnvSource struct {
// The ConfigMap to select from. // The ConfigMap to select from.
LocalObjectReference `json:",inline" protobuf:"bytes,1,opt,name=localObjectReference"` LocalObjectReference `json:",inline" protobuf:"bytes,1,opt,name=localObjectReference"`
// Specify whether the ConfigMap must be defined
// +optional
Optional *bool `json:"optional,omitempty" protobuf:"varint,2,opt,name=optional"`
} }
// SecretEnvSource selects a Secret to populate the environment // SecretEnvSource selects a Secret to populate the environment
@ -1266,6 +1281,9 @@ type ConfigMapEnvSource struct {
type SecretEnvSource struct { type SecretEnvSource struct {
// The Secret to select from. // The Secret to select from.
LocalObjectReference `json:",inline" protobuf:"bytes,1,opt,name=localObjectReference"` LocalObjectReference `json:",inline" protobuf:"bytes,1,opt,name=localObjectReference"`
// Specify whether the Secret must be defined
// +optional
Optional *bool `json:"optional,omitempty" protobuf:"varint,2,opt,name=optional"`
} }
// HTTPHeader describes a custom header to be used in HTTP probes // HTTPHeader describes a custom header to be used in HTTP probes
@ -3279,6 +3297,7 @@ type Binding struct {
} }
// Preconditions must be fulfilled before an operation (update, delete, etc.) is carried out. // Preconditions must be fulfilled before an operation (update, delete, etc.) is carried out.
// +k8s:openapi-gen=false
type Preconditions struct { type Preconditions struct {
// Specifies the target UID. // Specifies the target UID.
// +optional // +optional
@ -3286,6 +3305,8 @@ type Preconditions struct {
} }
// DeleteOptions may be provided when deleting an API object // DeleteOptions may be provided when deleting an API object
// DEPRECATED: This type has been moved to meta/v1 and will be removed soon.
// +k8s:openapi-gen=false
type DeleteOptions struct { type DeleteOptions struct {
metav1.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`

24
pkg/api/v1/types_swagger_doc_generated.go
View File

@ -181,7 +181,8 @@ func (ConfigMap) SwaggerDoc() map[string]string {
} }
var map_ConfigMapEnvSource = map[string]string{ var map_ConfigMapEnvSource = map[string]string{
"": "ConfigMapEnvSource selects a ConfigMap to populate the environment variables with.\n\nThe contents of the target ConfigMap's Data field will represent the key-value pairs as environment variables.", "": "ConfigMapEnvSource selects a ConfigMap to populate the environment variables with.\n\nThe contents of the target ConfigMap's Data field will represent the key-value pairs as environment variables.",
"optional": "Specify whether the ConfigMap must be defined",
} }
func (ConfigMapEnvSource) SwaggerDoc() map[string]string { func (ConfigMapEnvSource) SwaggerDoc() map[string]string {
@ -189,8 +190,9 @@ func (ConfigMapEnvSource) SwaggerDoc() map[string]string {
} }
var map_ConfigMapKeySelector = map[string]string{ var map_ConfigMapKeySelector = map[string]string{
"": "Selects a key from a ConfigMap.", "": "Selects a key from a ConfigMap.",
"key": "The key to select.", "key": "The key to select.",
"optional": "Specify whether the ConfigMap or it's key must be defined",
} }
func (ConfigMapKeySelector) SwaggerDoc() map[string]string { func (ConfigMapKeySelector) SwaggerDoc() map[string]string {
@ -209,8 +211,9 @@ func (ConfigMapList) SwaggerDoc() map[string]string {
var map_ConfigMapVolumeSource = map[string]string{ var map_ConfigMapVolumeSource = map[string]string{
"": "Adapts a ConfigMap into a volume.\n\nThe contents of the target ConfigMap's Data field will be presented in a volume as files using the keys in the Data field as the file names, unless the items element is populated with specific mappings of keys to paths. ConfigMap volumes support ownership management and SELinux relabeling.", "": "Adapts a ConfigMap into a volume.\n\nThe contents of the target ConfigMap's Data field will be presented in a volume as files using the keys in the Data field as the file names, unless the items element is populated with specific mappings of keys to paths. ConfigMap volumes support ownership management and SELinux relabeling.",
"items": "If unspecified, each key-value pair in the Data field of the referenced ConfigMap will be projected into the volume as a file whose name is the key and content is the value. If specified, the listed keys will be projected into the specified paths, and unlisted keys will not be present. If a key is specified which is not present in the ConfigMap, the volume setup will error. Paths must be relative and may not contain the '..' path or start with '..'.", "items": "If unspecified, each key-value pair in the Data field of the referenced ConfigMap will be projected into the volume as a file whose name is the key and content is the value. If specified, the listed keys will be projected into the specified paths, and unlisted keys will not be present. If a key is specified which is not present in the ConfigMap, the volume setup will error unless it is marked optional. Paths must be relative and may not contain the '..' path or start with '..'.",
"defaultMode": "Optional: mode bits to use on created files by default. Must be a value between 0 and 0777. Defaults to 0644. Directories within the path are not affected by this setting. This might be in conflict with other options that affect the file mode, like fsGroup, and the result can be other mode bits set.", "defaultMode": "Optional: mode bits to use on created files by default. Must be a value between 0 and 0777. Defaults to 0644. Directories within the path are not affected by this setting. This might be in conflict with other options that affect the file mode, like fsGroup, and the result can be other mode bits set.",
"optional": "Specify whether the ConfigMap or it's keys must be defined",
} }
func (ConfigMapVolumeSource) SwaggerDoc() map[string]string { func (ConfigMapVolumeSource) SwaggerDoc() map[string]string {
@ -339,7 +342,7 @@ func (DaemonEndpoint) SwaggerDoc() map[string]string {
} }
var map_DeleteOptions = map[string]string{ var map_DeleteOptions = map[string]string{
"": "DeleteOptions may be provided when deleting an API object", "": "DeleteOptions may be provided when deleting an API object DEPRECATED: This type has been moved to meta/v1 and will be removed soon.",
"gracePeriodSeconds": "The duration in seconds before the object should be deleted. Value must be non-negative integer. The value zero indicates delete immediately. If this value is nil, the default grace period for the specified type will be used. Defaults to a per object value if not specified. zero means delete immediately.", "gracePeriodSeconds": "The duration in seconds before the object should be deleted. Value must be non-negative integer. The value zero indicates delete immediately. If this value is nil, the default grace period for the specified type will be used. Defaults to a per object value if not specified. zero means delete immediately.",
"preconditions": "Must be fulfilled before a deletion is carried out. If not possible, a 409 Conflict status will be returned.", "preconditions": "Must be fulfilled before a deletion is carried out. If not possible, a 409 Conflict status will be returned.",
"orphanDependents": "Should the dependent objects be orphaned. If true/false, the \"orphan\" finalizer will be added to/removed from the object's finalizers list.", "orphanDependents": "Should the dependent objects be orphaned. If true/false, the \"orphan\" finalizer will be added to/removed from the object's finalizers list.",
@ -1600,7 +1603,8 @@ func (Secret) SwaggerDoc() map[string]string {
} }
var map_SecretEnvSource = map[string]string{ var map_SecretEnvSource = map[string]string{
"": "SecretEnvSource selects a Secret to populate the environment variables with.\n\nThe contents of the target Secret's Data field will represent the key-value pairs as environment variables.", "": "SecretEnvSource selects a Secret to populate the environment variables with.\n\nThe contents of the target Secret's Data field will represent the key-value pairs as environment variables.",
"optional": "Specify whether the Secret must be defined",
} }
func (SecretEnvSource) SwaggerDoc() map[string]string { func (SecretEnvSource) SwaggerDoc() map[string]string {
@ -1608,8 +1612,9 @@ func (SecretEnvSource) SwaggerDoc() map[string]string {
} }
var map_SecretKeySelector = map[string]string{ var map_SecretKeySelector = map[string]string{
"": "SecretKeySelector selects a key of a Secret.", "": "SecretKeySelector selects a key of a Secret.",
"key": "The key of the secret to select from. Must be a valid secret key.", "key": "The key of the secret to select from. Must be a valid secret key.",
"optional": "Specify whether the Secret or it's key must be defined",
} }
func (SecretKeySelector) SwaggerDoc() map[string]string { func (SecretKeySelector) SwaggerDoc() map[string]string {
@ -1629,8 +1634,9 @@ func (SecretList) SwaggerDoc() map[string]string {
var map_SecretVolumeSource = map[string]string{ var map_SecretVolumeSource = map[string]string{
"": "Adapts a Secret into a volume.\n\nThe contents of the target Secret's Data field will be presented in a volume as files using the keys in the Data field as the file names. Secret volumes support ownership management and SELinux relabeling.", "": "Adapts a Secret into a volume.\n\nThe contents of the target Secret's Data field will be presented in a volume as files using the keys in the Data field as the file names. Secret volumes support ownership management and SELinux relabeling.",
"secretName": "Name of the secret in the pod's namespace to use. More info: http://kubernetes.io/docs/user-guide/volumes#secrets", "secretName": "Name of the secret in the pod's namespace to use. More info: http://kubernetes.io/docs/user-guide/volumes#secrets",
"items": "If unspecified, each key-value pair in the Data field of the referenced Secret will be projected into the volume as a file whose name is the key and content is the value. If specified, the listed keys will be projected into the specified paths, and unlisted keys will not be present. If a key is specified which is not present in the Secret, the volume setup will error. Paths must be relative and may not contain the '..' path or start with '..'.", "items": "If unspecified, each key-value pair in the Data field of the referenced Secret will be projected into the volume as a file whose name is the key and content is the value. If specified, the listed keys will be projected into the specified paths, and unlisted keys will not be present. If a key is specified which is not present in the Secret, the volume setup will error unless it is marked optional. Paths must be relative and may not contain the '..' path or start with '..'.",
"defaultMode": "Optional: mode bits to use on created files by default. Must be a value between 0 and 0777. Defaults to 0644. Directories within the path are not affected by this setting. This might be in conflict with other options that affect the file mode, like fsGroup, and the result can be other mode bits set.", "defaultMode": "Optional: mode bits to use on created files by default. Must be a value between 0 and 0777. Defaults to 0644. Directories within the path are not affected by this setting. This might be in conflict with other options that affect the file mode, like fsGroup, and the result can be other mode bits set.",
"optional": "Specify whether the Secret or it's keys must be defined",
} }
func (SecretVolumeSource) SwaggerDoc() map[string]string { func (SecretVolumeSource) SwaggerDoc() map[string]string {

12
pkg/api/v1/zz_generated.conversion.go
View File

@ -674,6 +674,7 @@ func autoConvert_v1_ConfigMapEnvSource_To_api_ConfigMapEnvSource(in *ConfigMapEn
if err := Convert_v1_LocalObjectReference_To_api_LocalObjectReference(&in.LocalObjectReference, &out.LocalObjectReference, s); err != nil { if err := Convert_v1_LocalObjectReference_To_api_LocalObjectReference(&in.LocalObjectReference, &out.LocalObjectReference, s); err != nil {
return err return err
} }
out.Optional = (*bool)(unsafe.Pointer(in.Optional))
return nil return nil
} }
@ -685,6 +686,7 @@ func autoConvert_api_ConfigMapEnvSource_To_v1_ConfigMapEnvSource(in *api.ConfigM
if err := Convert_api_LocalObjectReference_To_v1_LocalObjectReference(&in.LocalObjectReference, &out.LocalObjectReference, s); err != nil { if err := Convert_api_LocalObjectReference_To_v1_LocalObjectReference(&in.LocalObjectReference, &out.LocalObjectReference, s); err != nil {
return err return err
} }
out.Optional = (*bool)(unsafe.Pointer(in.Optional))
return nil return nil
} }
@ -697,6 +699,7 @@ func autoConvert_v1_ConfigMapKeySelector_To_api_ConfigMapKeySelector(in *ConfigM
return err return err
} }
out.Key = in.Key out.Key = in.Key
out.Optional = (*bool)(unsafe.Pointer(in.Optional))
return nil return nil
} }
@ -709,6 +712,7 @@ func autoConvert_api_ConfigMapKeySelector_To_v1_ConfigMapKeySelector(in *api.Con
return err return err
} }
out.Key = in.Key out.Key = in.Key
out.Optional = (*bool)(unsafe.Pointer(in.Optional))
return nil return nil
} }
@ -742,6 +746,7 @@ func autoConvert_v1_ConfigMapVolumeSource_To_api_ConfigMapVolumeSource(in *Confi
} }
out.Items = *(*[]api.KeyToPath)(unsafe.Pointer(&in.Items)) out.Items = *(*[]api.KeyToPath)(unsafe.Pointer(&in.Items))
out.DefaultMode = (*int32)(unsafe.Pointer(in.DefaultMode)) out.DefaultMode = (*int32)(unsafe.Pointer(in.DefaultMode))
out.Optional = (*bool)(unsafe.Pointer(in.Optional))
return nil return nil
} }
@ -755,6 +760,7 @@ func autoConvert_api_ConfigMapVolumeSource_To_v1_ConfigMapVolumeSource(in *api.C
} }
out.Items = *(*[]KeyToPath)(unsafe.Pointer(&in.Items)) out.Items = *(*[]KeyToPath)(unsafe.Pointer(&in.Items))
out.DefaultMode = (*int32)(unsafe.Pointer(in.DefaultMode)) out.DefaultMode = (*int32)(unsafe.Pointer(in.DefaultMode))
out.Optional = (*bool)(unsafe.Pointer(in.Optional))
return nil return nil
} }
@ -3790,6 +3796,7 @@ func autoConvert_v1_SecretEnvSource_To_api_SecretEnvSource(in *SecretEnvSource,
if err := Convert_v1_LocalObjectReference_To_api_LocalObjectReference(&in.LocalObjectReference, &out.LocalObjectReference, s); err != nil { if err := Convert_v1_LocalObjectReference_To_api_LocalObjectReference(&in.LocalObjectReference, &out.LocalObjectReference, s); err != nil {
return err return err
} }
out.Optional = (*bool)(unsafe.Pointer(in.Optional))
return nil return nil
} }
@ -3801,6 +3808,7 @@ func autoConvert_api_SecretEnvSource_To_v1_SecretEnvSource(in *api.SecretEnvSour
if err := Convert_api_LocalObjectReference_To_v1_LocalObjectReference(&in.LocalObjectReference, &out.LocalObjectReference, s); err != nil { if err := Convert_api_LocalObjectReference_To_v1_LocalObjectReference(&in.LocalObjectReference, &out.LocalObjectReference, s); err != nil {
return err return err
} }
out.Optional = (*bool)(unsafe.Pointer(in.Optional))
return nil return nil
} }
@ -3813,6 +3821,7 @@ func autoConvert_v1_SecretKeySelector_To_api_SecretKeySelector(in *SecretKeySele
return err return err
} }
out.Key = in.Key out.Key = in.Key
out.Optional = (*bool)(unsafe.Pointer(in.Optional))
return nil return nil
} }
@ -3825,6 +3834,7 @@ func autoConvert_api_SecretKeySelector_To_v1_SecretKeySelector(in *api.SecretKey
return err return err
} }
out.Key = in.Key out.Key = in.Key
out.Optional = (*bool)(unsafe.Pointer(in.Optional))
return nil return nil
} }
@ -3876,6 +3886,7 @@ func autoConvert_v1_SecretVolumeSource_To_api_SecretVolumeSource(in *SecretVolum
out.SecretName = in.SecretName out.SecretName = in.SecretName
out.Items = *(*[]api.KeyToPath)(unsafe.Pointer(&in.Items)) out.Items = *(*[]api.KeyToPath)(unsafe.Pointer(&in.Items))
out.DefaultMode = (*int32)(unsafe.Pointer(in.DefaultMode)) out.DefaultMode = (*int32)(unsafe.Pointer(in.DefaultMode))
out.Optional = (*bool)(unsafe.Pointer(in.Optional))
return nil return nil
} }
@ -3887,6 +3898,7 @@ func autoConvert_api_SecretVolumeSource_To_v1_SecretVolumeSource(in *api.SecretV
out.SecretName = in.SecretName out.SecretName = in.SecretName
out.Items = *(*[]KeyToPath)(unsafe.Pointer(&in.Items)) out.Items = *(*[]KeyToPath)(unsafe.Pointer(&in.Items))
out.DefaultMode = (*int32)(unsafe.Pointer(in.DefaultMode)) out.DefaultMode = (*int32)(unsafe.Pointer(in.DefaultMode))
out.Optional = (*bool)(unsafe.Pointer(in.Optional))
return nil return nil
} }

46
pkg/api/v1/zz_generated.deepcopy.go
View File

@ -431,6 +431,11 @@ func DeepCopy_v1_ConfigMapEnvSource(in interface{}, out interface{}, c *conversi
in := in.(*ConfigMapEnvSource) in := in.(*ConfigMapEnvSource)
out := out.(*ConfigMapEnvSource) out := out.(*ConfigMapEnvSource)
*out = *in *out = *in
if in.Optional != nil {
in, out := &in.Optional, &out.Optional
*out = new(bool)
**out = **in
}
return nil return nil
} }
} }
@ -440,6 +445,11 @@ func DeepCopy_v1_ConfigMapKeySelector(in interface{}, out interface{}, c *conver
in := in.(*ConfigMapKeySelector) in := in.(*ConfigMapKeySelector)
out := out.(*ConfigMapKeySelector) out := out.(*ConfigMapKeySelector)
*out = *in *out = *in
if in.Optional != nil {
in, out := &in.Optional, &out.Optional
*out = new(bool)
**out = **in
}
return nil return nil
} }
} }
@ -481,6 +491,11 @@ func DeepCopy_v1_ConfigMapVolumeSource(in interface{}, out interface{}, c *conve
*out = new(int32) *out = new(int32)
**out = **in **out = **in
} }
if in.Optional != nil {
in, out := &in.Optional, &out.Optional
*out = new(bool)
**out = **in
}
return nil return nil
} }
} }
@ -861,12 +876,16 @@ func DeepCopy_v1_EnvFromSource(in interface{}, out interface{}, c *conversion.Cl
if in.ConfigMapRef != nil { if in.ConfigMapRef != nil {
in, out := &in.ConfigMapRef, &out.ConfigMapRef in, out := &in.ConfigMapRef, &out.ConfigMapRef
*out = new(ConfigMapEnvSource) *out = new(ConfigMapEnvSource)
**out = **in if err := DeepCopy_v1_ConfigMapEnvSource(*in, *out, c); err != nil {
return err
}
} }
if in.SecretRef != nil { if in.SecretRef != nil {
in, out := &in.SecretRef, &out.SecretRef in, out := &in.SecretRef, &out.SecretRef
*out = new(SecretEnvSource) *out = new(SecretEnvSource)
**out = **in if err := DeepCopy_v1_SecretEnvSource(*in, *out, c); err != nil {
return err
}
} }
return nil return nil
} }
@ -908,12 +927,16 @@ func DeepCopy_v1_EnvVarSource(in interface{}, out interface{}, c *conversion.Clo
if in.ConfigMapKeyRef != nil { if in.ConfigMapKeyRef != nil {
in, out := &in.ConfigMapKeyRef, &out.ConfigMapKeyRef in, out := &in.ConfigMapKeyRef, &out.ConfigMapKeyRef
*out = new(ConfigMapKeySelector) *out = new(ConfigMapKeySelector)
**out = **in if err := DeepCopy_v1_ConfigMapKeySelector(*in, *out, c); err != nil {
return err
}
} }
if in.SecretKeyRef != nil { if in.SecretKeyRef != nil {
in, out := &in.SecretKeyRef, &out.SecretKeyRef in, out := &in.SecretKeyRef, &out.SecretKeyRef
*out = new(SecretKeySelector) *out = new(SecretKeySelector)
**out = **in if err := DeepCopy_v1_SecretKeySelector(*in, *out, c); err != nil {
return err
}
} }
return nil return nil
} }
@ -2759,6 +2782,11 @@ func DeepCopy_v1_SecretEnvSource(in interface{}, out interface{}, c *conversion.
in := in.(*SecretEnvSource) in := in.(*SecretEnvSource)
out := out.(*SecretEnvSource) out := out.(*SecretEnvSource)
*out = *in *out = *in
if in.Optional != nil {
in, out := &in.Optional, &out.Optional
*out = new(bool)
**out = **in
}
return nil return nil
} }
} }
@ -2768,6 +2796,11 @@ func DeepCopy_v1_SecretKeySelector(in interface{}, out interface{}, c *conversio
in := in.(*SecretKeySelector) in := in.(*SecretKeySelector)
out := out.(*SecretKeySelector) out := out.(*SecretKeySelector)
*out = *in *out = *in
if in.Optional != nil {
in, out := &in.Optional, &out.Optional
*out = new(bool)
**out = **in
}
return nil return nil
} }
} }
@ -2809,6 +2842,11 @@ func DeepCopy_v1_SecretVolumeSource(in interface{}, out interface{}, c *conversi
*out = new(int32) *out = new(int32)
**out = **in **out = **in
} }
if in.Optional != nil {
in, out := &in.Optional, &out.Optional
*out = new(bool)
**out = **in
}
return nil return nil
} }
} }

46
pkg/api/zz_generated.deepcopy.go
View File

@ -434,6 +434,11 @@ func DeepCopy_api_ConfigMapEnvSource(in interface{}, out interface{}, c *convers
in := in.(*ConfigMapEnvSource) in := in.(*ConfigMapEnvSource)
out := out.(*ConfigMapEnvSource) out := out.(*ConfigMapEnvSource)
*out = *in *out = *in
if in.Optional != nil {
in, out := &in.Optional, &out.Optional
*out = new(bool)
**out = **in
}
return nil return nil
} }
} }
@ -443,6 +448,11 @@ func DeepCopy_api_ConfigMapKeySelector(in interface{}, out interface{}, c *conve
in := in.(*ConfigMapKeySelector) in := in.(*ConfigMapKeySelector)
out := out.(*ConfigMapKeySelector) out := out.(*ConfigMapKeySelector)
*out = *in *out = *in
if in.Optional != nil {
in, out := &in.Optional, &out.Optional
*out = new(bool)
**out = **in
}
return nil return nil
} }
} }
@ -484,6 +494,11 @@ func DeepCopy_api_ConfigMapVolumeSource(in interface{}, out interface{}, c *conv
*out = new(int32) *out = new(int32)
**out = **in **out = **in
} }
if in.Optional != nil {
in, out := &in.Optional, &out.Optional
*out = new(bool)
**out = **in
}
return nil return nil
} }
} }
@ -889,12 +904,16 @@ func DeepCopy_api_EnvFromSource(in interface{}, out interface{}, c *conversion.C
if in.ConfigMapRef != nil { if in.ConfigMapRef != nil {
in, out := &in.ConfigMapRef, &out.ConfigMapRef in, out := &in.ConfigMapRef, &out.ConfigMapRef
*out = new(ConfigMapEnvSource) *out = new(ConfigMapEnvSource)
**out = **in if err := DeepCopy_api_ConfigMapEnvSource(*in, *out, c); err != nil {
return err
}
} }
if in.SecretRef != nil { if in.SecretRef != nil {
in, out := &in.SecretRef, &out.SecretRef in, out := &in.SecretRef, &out.SecretRef
*out = new(SecretEnvSource) *out = new(SecretEnvSource)
**out = **in if err := DeepCopy_api_SecretEnvSource(*in, *out, c); err != nil {
return err
}
} }
return nil return nil
} }
@ -936,12 +955,16 @@ func DeepCopy_api_EnvVarSource(in interface{}, out interface{}, c *conversion.Cl
if in.ConfigMapKeyRef != nil { if in.ConfigMapKeyRef != nil {
in, out := &in.ConfigMapKeyRef, &out.ConfigMapKeyRef in, out := &in.ConfigMapKeyRef, &out.ConfigMapKeyRef
*out = new(ConfigMapKeySelector) *out = new(ConfigMapKeySelector)
**out = **in if err := DeepCopy_api_ConfigMapKeySelector(*in, *out, c); err != nil {
return err
}
} }
if in.SecretKeyRef != nil { if in.SecretKeyRef != nil {
in, out := &in.SecretKeyRef, &out.SecretKeyRef in, out := &in.SecretKeyRef, &out.SecretKeyRef
*out = new(SecretKeySelector) *out = new(SecretKeySelector)
**out = **in if err := DeepCopy_api_SecretKeySelector(*in, *out, c); err != nil {
return err
}
} }
return nil return nil
} }
@ -2791,6 +2814,11 @@ func DeepCopy_api_SecretEnvSource(in interface{}, out interface{}, c *conversion
in := in.(*SecretEnvSource) in := in.(*SecretEnvSource)
out := out.(*SecretEnvSource) out := out.(*SecretEnvSource)
*out = *in *out = *in
if in.Optional != nil {
in, out := &in.Optional, &out.Optional
*out = new(bool)
**out = **in
}
return nil return nil
} }
} }
@ -2800,6 +2828,11 @@ func DeepCopy_api_SecretKeySelector(in interface{}, out interface{}, c *conversi
in := in.(*SecretKeySelector) in := in.(*SecretKeySelector)
out := out.(*SecretKeySelector) out := out.(*SecretKeySelector)
*out = *in *out = *in
if in.Optional != nil {
in, out := &in.Optional, &out.Optional
*out = new(bool)
**out = **in
}
return nil return nil
} }
} }
@ -2841,6 +2874,11 @@ func DeepCopy_api_SecretVolumeSource(in interface{}, out interface{}, c *convers
*out = new(int32) *out = new(int32)
**out = **in **out = **in
} }
if in.Optional != nil {
in, out := &in.Optional, &out.Optional
*out = new(bool)
**out = **in
}
return nil return nil
} }
} }

2
pkg/apis/apps/register.go
View File

@ -19,7 +19,6 @@ package apps
import ( import (
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/client-go/pkg/api"
) )
var ( var (
@ -49,7 +48,6 @@ func addKnownTypes(scheme *runtime.Scheme) error {
scheme.AddKnownTypes(SchemeGroupVersion, scheme.AddKnownTypes(SchemeGroupVersion,
&StatefulSet{}, &StatefulSet{},
&StatefulSetList{}, &StatefulSetList{},
&api.DeleteOptions{},
) )
return nil return nil
} }

4
pkg/apis/apps/v1beta1/register.go
View File

@ -20,7 +20,6 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/client-go/pkg/api/v1"
) )
// GroupName is the group name use in this package // GroupName is the group name use in this package
@ -44,9 +43,6 @@ func addKnownTypes(scheme *runtime.Scheme) error {
scheme.AddKnownTypes(SchemeGroupVersion, scheme.AddKnownTypes(SchemeGroupVersion,
&StatefulSet{}, &StatefulSet{},
&StatefulSetList{}, &StatefulSetList{},
&v1.DeleteOptions{},
&metav1.ExportOptions{},
&metav1.GetOptions{},
) )
metav1.AddToGroupVersion(scheme, SchemeGroupVersion) metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
return nil return nil

6
pkg/apis/authentication/register.go
View File

@ -17,10 +17,8 @@ limitations under the License.
package authentication package authentication
import ( import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/client-go/pkg/api"
) )
// GroupName is the group name use in this package // GroupName is the group name use in this package
@ -46,10 +44,6 @@ var (
func addKnownTypes(scheme *runtime.Scheme) error { func addKnownTypes(scheme *runtime.Scheme) error {
scheme.AddKnownTypes(SchemeGroupVersion, scheme.AddKnownTypes(SchemeGroupVersion,
&api.DeleteOptions{},
&metav1.ExportOptions{},
&metav1.GetOptions{},
&TokenReview{}, &TokenReview{},
) )
return nil return nil

5
pkg/apis/authentication/v1beta1/register.go
View File

@ -20,7 +20,6 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/client-go/pkg/api/v1"
) )
// GroupName is the group name use in this package // GroupName is the group name use in this package
@ -42,10 +41,6 @@ var (
// Adds the list of known types to api.Scheme. // Adds the list of known types to api.Scheme.
func addKnownTypes(scheme *runtime.Scheme) error { func addKnownTypes(scheme *runtime.Scheme) error {
scheme.AddKnownTypes(SchemeGroupVersion, scheme.AddKnownTypes(SchemeGroupVersion,
&v1.DeleteOptions{},
&metav1.ExportOptions{},
&metav1.GetOptions{},
&TokenReview{}, &TokenReview{},
) )
metav1.AddToGroupVersion(scheme, SchemeGroupVersion) metav1.AddToGroupVersion(scheme, SchemeGroupVersion)

6
pkg/apis/authorization/register.go
View File

@ -17,10 +17,8 @@ limitations under the License.
package authorization package authorization
import ( import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/client-go/pkg/api"
) )
// GroupName is the group name use in this package // GroupName is the group name use in this package
@ -46,10 +44,6 @@ var (
func addKnownTypes(scheme *runtime.Scheme) error { func addKnownTypes(scheme *runtime.Scheme) error {
scheme.AddKnownTypes(SchemeGroupVersion, scheme.AddKnownTypes(SchemeGroupVersion,
&api.DeleteOptions{},
&metav1.ExportOptions{},
&metav1.GetOptions{},
&SelfSubjectAccessReview{}, &SelfSubjectAccessReview{},
&SubjectAccessReview{}, &SubjectAccessReview{},
&LocalSubjectAccessReview{}, &LocalSubjectAccessReview{},

5
pkg/apis/authorization/v1beta1/register.go
View File

@ -20,7 +20,6 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/client-go/pkg/api/v1"
) )
// GroupName is the group name use in this package // GroupName is the group name use in this package
@ -42,10 +41,6 @@ var (
// Adds the list of known types to api.Scheme. // Adds the list of known types to api.Scheme.
func addKnownTypes(scheme *runtime.Scheme) error { func addKnownTypes(scheme *runtime.Scheme) error {
scheme.AddKnownTypes(SchemeGroupVersion, scheme.AddKnownTypes(SchemeGroupVersion,
&v1.DeleteOptions{},
&metav1.ExportOptions{},
&metav1.GetOptions{},
&SelfSubjectAccessReview{}, &SelfSubjectAccessReview{},
&SubjectAccessReview{}, &SubjectAccessReview{},
&LocalSubjectAccessReview{}, &LocalSubjectAccessReview{},

2
pkg/apis/autoscaling/register.go
View File

@ -19,7 +19,6 @@ package autoscaling
import ( import (
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/client-go/pkg/api"
) )
// GroupName is the group name use in this package // GroupName is the group name use in this package
@ -49,7 +48,6 @@ func addKnownTypes(scheme *runtime.Scheme) error {
&Scale{}, &Scale{},
&HorizontalPodAutoscaler{}, &HorizontalPodAutoscaler{},
&HorizontalPodAutoscalerList{}, &HorizontalPodAutoscalerList{},
&api.DeleteOptions{},
) )
return nil return nil
} }

4
pkg/apis/autoscaling/v1/register.go
View File

@ -20,7 +20,6 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/client-go/pkg/api/v1"
) )
// GroupName is the group name use in this package // GroupName is the group name use in this package
@ -45,9 +44,6 @@ func addKnownTypes(scheme *runtime.Scheme) error {
&HorizontalPodAutoscaler{}, &HorizontalPodAutoscaler{},
&HorizontalPodAutoscalerList{}, &HorizontalPodAutoscalerList{},
&Scale{}, &Scale{},
&v1.DeleteOptions{},
&metav1.ExportOptions{},
&metav1.GetOptions{},
) )
metav1.AddToGroupVersion(scheme, SchemeGroupVersion) metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
return nil return nil

Some files were not shown because too many files have changed in this diff Show More