diff --git a/CHANGELOG.md b/CHANGELOG.md index e275093cb53..35190b13973 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1640,7 +1640,7 @@ etc) volumes and block-device volumes will be owned by the FSGroup, and each container in the pod will run with the FSGroup as a supplemental group * Volumes that support SELinux labelling are now automatically relabeled with the Pod’s SELinux context, if specified - * A stable client library release\_1\_2 is added. The library is [here](pkg/client/clientset_generated/release_1_2/), and detailed doc is [here](docs/devel/generating-clientset.md#released-clientsets). We will keep the interface of this go client stable. + * A stable client library release\_1\_2 is added. The library is [here](pkg/client/clientset_generated/), and detailed doc is [here](docs/devel/generating-clientset.md#released-clientsets). We will keep the interface of this go client stable. * New Azure File Service Volume Plugin enables mounting Microsoft Azure File Volumes (SMB 2.1 and 3.0) into a Pod. See [example](https://github.com/kubernetes/kubernetes/blob/release-1.2/examples/azure_file/README.md) for details. * Logs usage and root filesystem usage of a container, volumes usage of a pod and node disk usage are exposed through Kubelet new metrics API. diff --git a/pkg/client/clientset_generated/release_1_2/clientset.go b/federation/client/clientset_generated/federation_release_1_5/clientset.go similarity index 64% rename from pkg/client/clientset_generated/release_1_2/clientset.go rename to federation/client/clientset_generated/federation_release_1_5/clientset.go index 95e587aad72..528e4edfad6 100644 --- a/pkg/client/clientset_generated/release_1_2/clientset.go +++ b/federation/client/clientset_generated/federation_release_1_5/clientset.go @@ -14,18 +14,21 @@ See the License for the specific language governing permissions and limitations under the License. */ -package release_1_2 +package federation_release_1_5 import ( "github.com/golang/glog" - v1core "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2/typed/core/v1" - v1beta1extensions "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1" + v1core "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5/typed/core/v1" + v1beta1extensions "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1" + v1beta1federation "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1" restclient "k8s.io/kubernetes/pkg/client/restclient" discovery "k8s.io/kubernetes/pkg/client/typed/discovery" + "k8s.io/kubernetes/pkg/util/flowcontrol" ) type Interface interface { Discovery() discovery.DiscoveryInterface + Federation() v1beta1federation.FederationInterface Core() v1core.CoreInterface Extensions() v1beta1extensions.ExtensionsInterface } @@ -34,17 +37,32 @@ type Interface interface { // version included in a Clientset. type Clientset struct { *discovery.DiscoveryClient + *v1beta1federation.FederationClient *v1core.CoreClient *v1beta1extensions.ExtensionsClient } +// Federation retrieves the FederationClient +func (c *Clientset) Federation() v1beta1federation.FederationInterface { + if c == nil { + return nil + } + return c.FederationClient +} + // Core retrieves the CoreClient func (c *Clientset) Core() v1core.CoreInterface { + if c == nil { + return nil + } return c.CoreClient } // Extensions retrieves the ExtensionsClient func (c *Clientset) Extensions() v1beta1extensions.ExtensionsInterface { + if c == nil { + return nil + } return c.ExtensionsClient } @@ -55,28 +73,38 @@ func (c *Clientset) Discovery() discovery.DiscoveryInterface { // NewForConfig creates a new Clientset for the given config. func NewForConfig(c *restclient.Config) (*Clientset, error) { + configShallowCopy := *c + if configShallowCopy.RateLimiter == nil && configShallowCopy.QPS > 0 { + configShallowCopy.RateLimiter = flowcontrol.NewTokenBucketRateLimiter(configShallowCopy.QPS, configShallowCopy.Burst) + } var clientset Clientset var err error - clientset.CoreClient, err = v1core.NewForConfig(c) + clientset.FederationClient, err = v1beta1federation.NewForConfig(&configShallowCopy) if err != nil { - return &clientset, err + return nil, err } - clientset.ExtensionsClient, err = v1beta1extensions.NewForConfig(c) + clientset.CoreClient, err = v1core.NewForConfig(&configShallowCopy) if err != nil { - return &clientset, err + return nil, err + } + clientset.ExtensionsClient, err = v1beta1extensions.NewForConfig(&configShallowCopy) + if err != nil { + return nil, err } - clientset.DiscoveryClient, err = discovery.NewDiscoveryClientForConfig(c) + clientset.DiscoveryClient, err = discovery.NewDiscoveryClientForConfig(&configShallowCopy) if err != nil { glog.Errorf("failed to create the DiscoveryClient: %v", err) + return nil, err } - return &clientset, err + return &clientset, nil } // NewForConfigOrDie creates a new Clientset for the given config and // panics if there is an error in the config. func NewForConfigOrDie(c *restclient.Config) *Clientset { var clientset Clientset + clientset.FederationClient = v1beta1federation.NewForConfigOrDie(c) clientset.CoreClient = v1core.NewForConfigOrDie(c) clientset.ExtensionsClient = v1beta1extensions.NewForConfigOrDie(c) @@ -87,6 +115,7 @@ func NewForConfigOrDie(c *restclient.Config) *Clientset { // New creates a new Clientset for the given RESTClient. func New(c *restclient.RESTClient) *Clientset { var clientset Clientset + clientset.FederationClient = v1beta1federation.New(c) clientset.CoreClient = v1core.New(c) clientset.ExtensionsClient = v1beta1extensions.New(c) diff --git a/federation/client/clientset_generated/federation_release_1_5/doc.go b/federation/client/clientset_generated/federation_release_1_5/doc.go new file mode 100644 index 00000000000..8f8a1a1db71 --- /dev/null +++ b/federation/client/clientset_generated/federation_release_1_5/doc.go @@ -0,0 +1,20 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// This package is generated by client-gen with arguments: --clientset-name=federation_release_1_5 --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --included-types-overrides=[api/v1/Service,api/v1/Namespace,extensions/v1beta1/ReplicaSet,api/v1/Secret,extensions/v1beta1/Ingress,api/v1/Event] --input=[../../federation/apis/federation/v1beta1,api/v1,extensions/v1beta1] + +// This package has the automatically generated clientset. +package federation_release_1_5 diff --git a/pkg/client/clientset_generated/release_1_2/fake/clientset_generated.go b/federation/client/clientset_generated/federation_release_1_5/fake/clientset_generated.go similarity index 57% rename from pkg/client/clientset_generated/release_1_2/fake/clientset_generated.go rename to federation/client/clientset_generated/federation_release_1_5/fake/clientset_generated.go index 414f0690ff0..1f3b886da97 100644 --- a/pkg/client/clientset_generated/release_1_2/fake/clientset_generated.go +++ b/federation/client/clientset_generated/federation_release_1_5/fake/clientset_generated.go @@ -17,13 +17,15 @@ limitations under the License. package fake import ( + clientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5" + v1core "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5/typed/core/v1" + fakev1core "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake" + v1beta1extensions "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1" + fakev1beta1extensions "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/fake" + v1beta1federation "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1" + fakev1beta1federation "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1/fake" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apimachinery/registered" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" - v1core "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2/typed/core/v1" - fakev1core "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2/typed/core/v1/fake" - v1beta1extensions "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1" - fakev1beta1extensions "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/fake" "k8s.io/kubernetes/pkg/client/testing/core" "k8s.io/kubernetes/pkg/client/typed/discovery" fakediscovery "k8s.io/kubernetes/pkg/client/typed/discovery/fake" @@ -31,9 +33,12 @@ import ( "k8s.io/kubernetes/pkg/watch" ) -// Clientset returns a clientset that will respond with the provided objects +// NewSimpleClientset returns a clientset that will respond with the provided objects. +// It's backed by a very simple object tracker that processes creates, updates and deletions as-is, +// without applying any validations and/or defaults. It shouldn't be considered a replacement +// for a real clientset and is mostly useful in simple unit tests. func NewSimpleClientset(objects ...runtime.Object) *Clientset { - o := core.NewObjects(api.Scheme, api.Codecs.UniversalDecoder()) + o := core.NewObjectTracker(api.Scheme, api.Codecs.UniversalDecoder()) for _, obj := range objects { if err := o.Add(obj); err != nil { panic(err) @@ -61,6 +66,11 @@ func (c *Clientset) Discovery() discovery.DiscoveryInterface { var _ clientset.Interface = &Clientset{} +// Federation retrieves the FederationClient +func (c *Clientset) Federation() v1beta1federation.FederationInterface { + return &fakev1beta1federation.FakeFederation{Fake: &c.Fake} +} + // Core retrieves the CoreClient func (c *Clientset) Core() v1core.CoreInterface { return &fakev1core.FakeCore{Fake: &c.Fake} diff --git a/federation/client/clientset_generated/federation_release_1_5/fake/doc.go b/federation/client/clientset_generated/federation_release_1_5/fake/doc.go new file mode 100644 index 00000000000..fd573e33c83 --- /dev/null +++ b/federation/client/clientset_generated/federation_release_1_5/fake/doc.go @@ -0,0 +1,20 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// This package is generated by client-gen with arguments: --clientset-name=federation_release_1_5 --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --included-types-overrides=[api/v1/Service,api/v1/Namespace,extensions/v1beta1/ReplicaSet,api/v1/Secret,extensions/v1beta1/Ingress,api/v1/Event] --input=[../../federation/apis/federation/v1beta1,api/v1,extensions/v1beta1] + +// This package has the automatically generated fake clientset. +package fake diff --git a/federation/client/clientset_generated/federation_release_1_5/import_known_versions.go b/federation/client/clientset_generated/federation_release_1_5/import_known_versions.go new file mode 100644 index 00000000000..8140d2858fc --- /dev/null +++ b/federation/client/clientset_generated/federation_release_1_5/import_known_versions.go @@ -0,0 +1,25 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package federation_release_1_5 + +// These imports are the API groups the client will support. +import ( + _ "k8s.io/kubernetes/federation/apis/federation/install" +) + +func init() { +} diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/core_client.go b/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/core_client.go new file mode 100644 index 00000000000..3ce0cc8f35e --- /dev/null +++ b/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/core_client.go @@ -0,0 +1,111 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package v1 + +import ( + api "k8s.io/kubernetes/pkg/api" + registered "k8s.io/kubernetes/pkg/apimachinery/registered" + restclient "k8s.io/kubernetes/pkg/client/restclient" + serializer "k8s.io/kubernetes/pkg/runtime/serializer" +) + +type CoreInterface interface { + GetRESTClient() *restclient.RESTClient + EventsGetter + NamespacesGetter + SecretsGetter + ServicesGetter +} + +// CoreClient is used to interact with features provided by the Core group. +type CoreClient struct { + *restclient.RESTClient +} + +func (c *CoreClient) Events(namespace string) EventInterface { + return newEvents(c, namespace) +} + +func (c *CoreClient) Namespaces() NamespaceInterface { + return newNamespaces(c) +} + +func (c *CoreClient) Secrets(namespace string) SecretInterface { + return newSecrets(c, namespace) +} + +func (c *CoreClient) Services(namespace string) ServiceInterface { + return newServices(c, namespace) +} + +// NewForConfig creates a new CoreClient for the given config. +func NewForConfig(c *restclient.Config) (*CoreClient, error) { + config := *c + if err := setConfigDefaults(&config); err != nil { + return nil, err + } + client, err := restclient.RESTClientFor(&config) + if err != nil { + return nil, err + } + return &CoreClient{client}, nil +} + +// NewForConfigOrDie creates a new CoreClient for the given config and +// panics if there is an error in the config. +func NewForConfigOrDie(c *restclient.Config) *CoreClient { + client, err := NewForConfig(c) + if err != nil { + panic(err) + } + return client +} + +// New creates a new CoreClient for the given RESTClient. +func New(c *restclient.RESTClient) *CoreClient { + return &CoreClient{c} +} + +func setConfigDefaults(config *restclient.Config) error { + // if core group is not registered, return an error + g, err := registered.Group("") + if err != nil { + return err + } + config.APIPath = "/api" + if config.UserAgent == "" { + config.UserAgent = restclient.DefaultKubernetesUserAgent() + } + // TODO: Unconditionally set the config.Version, until we fix the config. + //if config.Version == "" { + copyGroupVersion := g.GroupVersion + config.GroupVersion = ©GroupVersion + //} + + config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: api.Codecs} + + return nil +} + +// GetRESTClient returns a RESTClient that is used to communicate +// with API server by this client implementation. +func (c *CoreClient) GetRESTClient() *restclient.RESTClient { + if c == nil { + return nil + } + return c.RESTClient +} diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/doc.go b/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/doc.go new file mode 100644 index 00000000000..69d24831e03 --- /dev/null +++ b/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/doc.go @@ -0,0 +1,20 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// This package is generated by client-gen with arguments: --clientset-name=federation_release_1_5 --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --included-types-overrides=[api/v1/Service,api/v1/Namespace,extensions/v1beta1/ReplicaSet,api/v1/Secret,extensions/v1beta1/Ingress,api/v1/Event] --input=[../../federation/apis/federation/v1beta1,api/v1,extensions/v1beta1] + +// This package has the automatically generated typed clients. +package v1 diff --git a/pkg/client/clientset_generated/release_1_2/typed/core/v1/event.go b/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/event.go similarity index 89% rename from pkg/client/clientset_generated/release_1_2/typed/core/v1/event.go rename to federation/client/clientset_generated/federation_release_1_5/typed/core/v1/event.go index dd79972be37..da1de00ac06 100644 --- a/pkg/client/clientset_generated/release_1_2/typed/core/v1/event.go +++ b/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/event.go @@ -37,6 +37,7 @@ type EventInterface interface { Get(name string) (*v1.Event, error) List(opts api.ListOptions) (*v1.EventList, error) Watch(opts api.ListOptions) (watch.Interface, error) + Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1.Event, err error) EventExpansion } @@ -134,3 +135,17 @@ func (c *events) Watch(opts api.ListOptions) (watch.Interface, error) { VersionedParams(&opts, api.ParameterCodec). Watch() } + +// Patch applies the patch and returns the patched event. +func (c *events) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1.Event, err error) { + result = &v1.Event{} + err = c.client.Patch(pt). + Namespace(c.ns). + Resource("events"). + SubResource(subresources...). + Name(name). + Body(data). + Do(). + Into(result) + return +} diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake/doc.go b/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake/doc.go new file mode 100644 index 00000000000..208bd643c03 --- /dev/null +++ b/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake/doc.go @@ -0,0 +1,20 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// This package is generated by client-gen with arguments: --clientset-name=federation_release_1_5 --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --included-types-overrides=[api/v1/Service,api/v1/Namespace,extensions/v1beta1/ReplicaSet,api/v1/Secret,extensions/v1beta1/Ingress,api/v1/Event] --input=[../../federation/apis/federation/v1beta1,api/v1,extensions/v1beta1] + +// Package fake has the automatically generated clients. +package fake diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake/fake_core_client.go b/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake/fake_core_client.go new file mode 100644 index 00000000000..539c62fec27 --- /dev/null +++ b/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake/fake_core_client.go @@ -0,0 +1,49 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package fake + +import ( + v1 "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5/typed/core/v1" + restclient "k8s.io/kubernetes/pkg/client/restclient" + core "k8s.io/kubernetes/pkg/client/testing/core" +) + +type FakeCore struct { + *core.Fake +} + +func (c *FakeCore) Events(namespace string) v1.EventInterface { + return &FakeEvents{c, namespace} +} + +func (c *FakeCore) Namespaces() v1.NamespaceInterface { + return &FakeNamespaces{c} +} + +func (c *FakeCore) Secrets(namespace string) v1.SecretInterface { + return &FakeSecrets{c, namespace} +} + +func (c *FakeCore) Services(namespace string) v1.ServiceInterface { + return &FakeServices{c, namespace} +} + +// GetRESTClient returns a RESTClient that is used to communicate +// with API server by this client implementation. +func (c *FakeCore) GetRESTClient() *restclient.RESTClient { + return nil +} diff --git a/pkg/client/clientset_generated/release_1_2/typed/core/v1/fake/fake_event.go b/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake/fake_event.go similarity index 88% rename from pkg/client/clientset_generated/release_1_2/typed/core/v1/fake/fake_event.go rename to federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake/fake_event.go index 8c3c8bd24eb..6744dd3c325 100644 --- a/pkg/client/clientset_generated/release_1_2/typed/core/v1/fake/fake_event.go +++ b/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake/fake_event.go @@ -104,3 +104,14 @@ func (c *FakeEvents) Watch(opts api.ListOptions) (watch.Interface, error) { InvokesWatch(core.NewWatchAction(eventsResource, c.ns, opts)) } + +// Patch applies the patch and returns the patched event. +func (c *FakeEvents) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1.Event, err error) { + obj, err := c.Fake. + Invokes(core.NewPatchSubresourceAction(eventsResource, c.ns, name, data, subresources...), &v1.Event{}) + + if obj == nil { + return nil, err + } + return obj.(*v1.Event), err +} diff --git a/pkg/client/clientset_generated/release_1_2/typed/core/v1/fake/fake_namespace.go b/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake/fake_namespace.go similarity index 89% rename from pkg/client/clientset_generated/release_1_2/typed/core/v1/fake/fake_namespace.go rename to federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake/fake_namespace.go index 87f12aab0e3..a351227dc17 100644 --- a/pkg/client/clientset_generated/release_1_2/typed/core/v1/fake/fake_namespace.go +++ b/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake/fake_namespace.go @@ -106,3 +106,13 @@ func (c *FakeNamespaces) Watch(opts api.ListOptions) (watch.Interface, error) { return c.Fake. InvokesWatch(core.NewRootWatchAction(namespacesResource, opts)) } + +// Patch applies the patch and returns the patched namespace. +func (c *FakeNamespaces) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1.Namespace, err error) { + obj, err := c.Fake. + Invokes(core.NewRootPatchSubresourceAction(namespacesResource, name, data, subresources...), &v1.Namespace{}) + if obj == nil { + return nil, err + } + return obj.(*v1.Namespace), err +} diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake/fake_namespace_expansion.go b/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake/fake_namespace_expansion.go new file mode 100644 index 00000000000..a9e98f50aea --- /dev/null +++ b/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake/fake_namespace_expansion.go @@ -0,0 +1,37 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package fake + +import ( + "k8s.io/kubernetes/pkg/api/v1" + "k8s.io/kubernetes/pkg/client/testing/core" +) + +func (c *FakeNamespaces) Finalize(namespace *v1.Namespace) (*v1.Namespace, error) { + action := core.CreateActionImpl{} + action.Verb = "create" + action.Resource = namespacesResource + action.Subresource = "finalize" + action.Object = namespace + + obj, err := c.Fake.Invokes(action, namespace) + if obj == nil { + return nil, err + } + + return obj.(*v1.Namespace), err +} diff --git a/pkg/client/clientset_generated/release_1_2/typed/core/v1/fake/fake_secret.go b/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake/fake_secret.go similarity index 88% rename from pkg/client/clientset_generated/release_1_2/typed/core/v1/fake/fake_secret.go rename to federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake/fake_secret.go index 643a98d4db1..5306c08dafa 100644 --- a/pkg/client/clientset_generated/release_1_2/typed/core/v1/fake/fake_secret.go +++ b/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake/fake_secret.go @@ -104,3 +104,14 @@ func (c *FakeSecrets) Watch(opts api.ListOptions) (watch.Interface, error) { InvokesWatch(core.NewWatchAction(secretsResource, c.ns, opts)) } + +// Patch applies the patch and returns the patched secret. +func (c *FakeSecrets) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1.Secret, err error) { + obj, err := c.Fake. + Invokes(core.NewPatchSubresourceAction(secretsResource, c.ns, name, data, subresources...), &v1.Secret{}) + + if obj == nil { + return nil, err + } + return obj.(*v1.Secret), err +} diff --git a/pkg/client/clientset_generated/release_1_2/typed/core/v1/fake/fake_service.go b/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake/fake_service.go similarity index 89% rename from pkg/client/clientset_generated/release_1_2/typed/core/v1/fake/fake_service.go rename to federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake/fake_service.go index f19cf8d3b5d..a30f05eb9bc 100644 --- a/pkg/client/clientset_generated/release_1_2/typed/core/v1/fake/fake_service.go +++ b/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake/fake_service.go @@ -114,3 +114,14 @@ func (c *FakeServices) Watch(opts api.ListOptions) (watch.Interface, error) { InvokesWatch(core.NewWatchAction(servicesResource, c.ns, opts)) } + +// Patch applies the patch and returns the patched service. +func (c *FakeServices) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1.Service, err error) { + obj, err := c.Fake. + Invokes(core.NewPatchSubresourceAction(servicesResource, c.ns, name, data, subresources...), &v1.Service{}) + + if obj == nil { + return nil, err + } + return obj.(*v1.Service), err +} diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/generated_expansion.go b/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/generated_expansion.go new file mode 100644 index 00000000000..da7904b2bbf --- /dev/null +++ b/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/generated_expansion.go @@ -0,0 +1,23 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package v1 + +type EventExpansion interface{} + +type SecretExpansion interface{} + +type ServiceExpansion interface{} diff --git a/pkg/client/clientset_generated/release_1_2/typed/core/v1/namespace.go b/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/namespace.go similarity index 89% rename from pkg/client/clientset_generated/release_1_2/typed/core/v1/namespace.go rename to federation/client/clientset_generated/federation_release_1_5/typed/core/v1/namespace.go index d347219daf4..174e4e29f6e 100644 --- a/pkg/client/clientset_generated/release_1_2/typed/core/v1/namespace.go +++ b/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/namespace.go @@ -38,6 +38,7 @@ type NamespaceInterface interface { Get(name string) (*v1.Namespace, error) List(opts api.ListOptions) (*v1.NamespaceList, error) Watch(opts api.ListOptions) (watch.Interface, error) + Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1.Namespace, err error) NamespaceExpansion } @@ -138,3 +139,16 @@ func (c *namespaces) Watch(opts api.ListOptions) (watch.Interface, error) { VersionedParams(&opts, api.ParameterCodec). Watch() } + +// Patch applies the patch and returns the patched namespace. +func (c *namespaces) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1.Namespace, err error) { + result = &v1.Namespace{} + err = c.client.Patch(pt). + Resource("namespaces"). + SubResource(subresources...). + Name(name). + Body(data). + Do(). + Into(result) + return +} diff --git a/pkg/client/clientset_generated/release_1_2/typed/core/v1/namespace_expansion.go b/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/namespace_expansion.go similarity index 100% rename from pkg/client/clientset_generated/release_1_2/typed/core/v1/namespace_expansion.go rename to federation/client/clientset_generated/federation_release_1_5/typed/core/v1/namespace_expansion.go diff --git a/pkg/client/clientset_generated/release_1_2/typed/core/v1/secret.go b/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/secret.go similarity index 89% rename from pkg/client/clientset_generated/release_1_2/typed/core/v1/secret.go rename to federation/client/clientset_generated/federation_release_1_5/typed/core/v1/secret.go index 9faf811019c..4ecb29e909c 100644 --- a/pkg/client/clientset_generated/release_1_2/typed/core/v1/secret.go +++ b/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/secret.go @@ -37,6 +37,7 @@ type SecretInterface interface { Get(name string) (*v1.Secret, error) List(opts api.ListOptions) (*v1.SecretList, error) Watch(opts api.ListOptions) (watch.Interface, error) + Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1.Secret, err error) SecretExpansion } @@ -134,3 +135,17 @@ func (c *secrets) Watch(opts api.ListOptions) (watch.Interface, error) { VersionedParams(&opts, api.ParameterCodec). Watch() } + +// Patch applies the patch and returns the patched secret. +func (c *secrets) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1.Secret, err error) { + result = &v1.Secret{} + err = c.client.Patch(pt). + Namespace(c.ns). + Resource("secrets"). + SubResource(subresources...). + Name(name). + Body(data). + Do(). + Into(result) + return +} diff --git a/pkg/client/clientset_generated/release_1_2/typed/core/v1/service.go b/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/service.go similarity index 89% rename from pkg/client/clientset_generated/release_1_2/typed/core/v1/service.go rename to federation/client/clientset_generated/federation_release_1_5/typed/core/v1/service.go index c54d8001db7..80fe4d72c2f 100644 --- a/pkg/client/clientset_generated/release_1_2/typed/core/v1/service.go +++ b/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/service.go @@ -38,6 +38,7 @@ type ServiceInterface interface { Get(name string) (*v1.Service, error) List(opts api.ListOptions) (*v1.ServiceList, error) Watch(opts api.ListOptions) (watch.Interface, error) + Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1.Service, err error) ServiceExpansion } @@ -148,3 +149,17 @@ func (c *services) Watch(opts api.ListOptions) (watch.Interface, error) { VersionedParams(&opts, api.ParameterCodec). Watch() } + +// Patch applies the patch and returns the patched service. +func (c *services) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1.Service, err error) { + result = &v1.Service{} + err = c.client.Patch(pt). + Namespace(c.ns). + Resource("services"). + SubResource(subresources...). + Name(name). + Body(data). + Do(). + Into(result) + return +} diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/doc.go b/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/doc.go new file mode 100644 index 00000000000..7fb43f93d54 --- /dev/null +++ b/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/doc.go @@ -0,0 +1,20 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// This package is generated by client-gen with arguments: --clientset-name=federation_release_1_5 --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --included-types-overrides=[api/v1/Service,api/v1/Namespace,extensions/v1beta1/ReplicaSet,api/v1/Secret,extensions/v1beta1/Ingress,api/v1/Event] --input=[../../federation/apis/federation/v1beta1,api/v1,extensions/v1beta1] + +// This package has the automatically generated typed clients. +package v1beta1 diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/extensions_client.go b/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/extensions_client.go new file mode 100644 index 00000000000..069d603cf4b --- /dev/null +++ b/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/extensions_client.go @@ -0,0 +1,101 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package v1beta1 + +import ( + api "k8s.io/kubernetes/pkg/api" + registered "k8s.io/kubernetes/pkg/apimachinery/registered" + restclient "k8s.io/kubernetes/pkg/client/restclient" + serializer "k8s.io/kubernetes/pkg/runtime/serializer" +) + +type ExtensionsInterface interface { + GetRESTClient() *restclient.RESTClient + IngressesGetter + ReplicaSetsGetter +} + +// ExtensionsClient is used to interact with features provided by the Extensions group. +type ExtensionsClient struct { + *restclient.RESTClient +} + +func (c *ExtensionsClient) Ingresses(namespace string) IngressInterface { + return newIngresses(c, namespace) +} + +func (c *ExtensionsClient) ReplicaSets(namespace string) ReplicaSetInterface { + return newReplicaSets(c, namespace) +} + +// NewForConfig creates a new ExtensionsClient for the given config. +func NewForConfig(c *restclient.Config) (*ExtensionsClient, error) { + config := *c + if err := setConfigDefaults(&config); err != nil { + return nil, err + } + client, err := restclient.RESTClientFor(&config) + if err != nil { + return nil, err + } + return &ExtensionsClient{client}, nil +} + +// NewForConfigOrDie creates a new ExtensionsClient for the given config and +// panics if there is an error in the config. +func NewForConfigOrDie(c *restclient.Config) *ExtensionsClient { + client, err := NewForConfig(c) + if err != nil { + panic(err) + } + return client +} + +// New creates a new ExtensionsClient for the given RESTClient. +func New(c *restclient.RESTClient) *ExtensionsClient { + return &ExtensionsClient{c} +} + +func setConfigDefaults(config *restclient.Config) error { + // if extensions group is not registered, return an error + g, err := registered.Group("extensions") + if err != nil { + return err + } + config.APIPath = "/apis" + if config.UserAgent == "" { + config.UserAgent = restclient.DefaultKubernetesUserAgent() + } + // TODO: Unconditionally set the config.Version, until we fix the config. + //if config.Version == "" { + copyGroupVersion := g.GroupVersion + config.GroupVersion = ©GroupVersion + //} + + config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: api.Codecs} + + return nil +} + +// GetRESTClient returns a RESTClient that is used to communicate +// with API server by this client implementation. +func (c *ExtensionsClient) GetRESTClient() *restclient.RESTClient { + if c == nil { + return nil + } + return c.RESTClient +} diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/fake/doc.go b/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/fake/doc.go new file mode 100644 index 00000000000..208bd643c03 --- /dev/null +++ b/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/fake/doc.go @@ -0,0 +1,20 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// This package is generated by client-gen with arguments: --clientset-name=federation_release_1_5 --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --included-types-overrides=[api/v1/Service,api/v1/Namespace,extensions/v1beta1/ReplicaSet,api/v1/Secret,extensions/v1beta1/Ingress,api/v1/Event] --input=[../../federation/apis/federation/v1beta1,api/v1,extensions/v1beta1] + +// Package fake has the automatically generated clients. +package fake diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/fake/fake_extensions_client.go b/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/fake/fake_extensions_client.go new file mode 100644 index 00000000000..1cf44494e99 --- /dev/null +++ b/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/fake/fake_extensions_client.go @@ -0,0 +1,41 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package fake + +import ( + v1beta1 "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1" + restclient "k8s.io/kubernetes/pkg/client/restclient" + core "k8s.io/kubernetes/pkg/client/testing/core" +) + +type FakeExtensions struct { + *core.Fake +} + +func (c *FakeExtensions) Ingresses(namespace string) v1beta1.IngressInterface { + return &FakeIngresses{c, namespace} +} + +func (c *FakeExtensions) ReplicaSets(namespace string) v1beta1.ReplicaSetInterface { + return &FakeReplicaSets{c, namespace} +} + +// GetRESTClient returns a RESTClient that is used to communicate +// with API server by this client implementation. +func (c *FakeExtensions) GetRESTClient() *restclient.RESTClient { + return nil +} diff --git a/pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/fake/fake_ingress.go b/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/fake/fake_ingress.go similarity index 89% rename from pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/fake/fake_ingress.go rename to federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/fake/fake_ingress.go index 58237d56a17..7ab0f332ee8 100644 --- a/pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/fake/fake_ingress.go +++ b/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/fake/fake_ingress.go @@ -114,3 +114,14 @@ func (c *FakeIngresses) Watch(opts api.ListOptions) (watch.Interface, error) { InvokesWatch(core.NewWatchAction(ingressesResource, c.ns, opts)) } + +// Patch applies the patch and returns the patched ingress. +func (c *FakeIngresses) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1beta1.Ingress, err error) { + obj, err := c.Fake. + Invokes(core.NewPatchSubresourceAction(ingressesResource, c.ns, name, data, subresources...), &v1beta1.Ingress{}) + + if obj == nil { + return nil, err + } + return obj.(*v1beta1.Ingress), err +} diff --git a/pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/fake/fake_replicaset.go b/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/fake/fake_replicaset.go similarity index 89% rename from pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/fake/fake_replicaset.go rename to federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/fake/fake_replicaset.go index 1397ef6e1c1..86d25529195 100644 --- a/pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/fake/fake_replicaset.go +++ b/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/fake/fake_replicaset.go @@ -114,3 +114,14 @@ func (c *FakeReplicaSets) Watch(opts api.ListOptions) (watch.Interface, error) { InvokesWatch(core.NewWatchAction(replicasetsResource, c.ns, opts)) } + +// Patch applies the patch and returns the patched replicaSet. +func (c *FakeReplicaSets) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1beta1.ReplicaSet, err error) { + obj, err := c.Fake. + Invokes(core.NewPatchSubresourceAction(replicasetsResource, c.ns, name, data, subresources...), &v1beta1.ReplicaSet{}) + + if obj == nil { + return nil, err + } + return obj.(*v1beta1.ReplicaSet), err +} diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/generated_expansion.go b/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/generated_expansion.go new file mode 100644 index 00000000000..333d2262ccb --- /dev/null +++ b/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/generated_expansion.go @@ -0,0 +1,21 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package v1beta1 + +type IngressExpansion interface{} + +type ReplicaSetExpansion interface{} diff --git a/pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/ingress.go b/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/ingress.go similarity index 89% rename from pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/ingress.go rename to federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/ingress.go index b240ab4e2a8..738c1edcd34 100644 --- a/pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/ingress.go +++ b/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/ingress.go @@ -38,6 +38,7 @@ type IngressInterface interface { Get(name string) (*v1beta1.Ingress, error) List(opts api.ListOptions) (*v1beta1.IngressList, error) Watch(opts api.ListOptions) (watch.Interface, error) + Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1beta1.Ingress, err error) IngressExpansion } @@ -148,3 +149,17 @@ func (c *ingresses) Watch(opts api.ListOptions) (watch.Interface, error) { VersionedParams(&opts, api.ParameterCodec). Watch() } + +// Patch applies the patch and returns the patched ingress. +func (c *ingresses) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1beta1.Ingress, err error) { + result = &v1beta1.Ingress{} + err = c.client.Patch(pt). + Namespace(c.ns). + Resource("ingresses"). + SubResource(subresources...). + Name(name). + Body(data). + Do(). + Into(result) + return +} diff --git a/pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/replicaset.go b/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/replicaset.go similarity index 90% rename from pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/replicaset.go rename to federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/replicaset.go index f3c4a1d5ca4..54330156571 100644 --- a/pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/replicaset.go +++ b/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/replicaset.go @@ -38,6 +38,7 @@ type ReplicaSetInterface interface { Get(name string) (*v1beta1.ReplicaSet, error) List(opts api.ListOptions) (*v1beta1.ReplicaSetList, error) Watch(opts api.ListOptions) (watch.Interface, error) + Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1beta1.ReplicaSet, err error) ReplicaSetExpansion } @@ -148,3 +149,17 @@ func (c *replicaSets) Watch(opts api.ListOptions) (watch.Interface, error) { VersionedParams(&opts, api.ParameterCodec). Watch() } + +// Patch applies the patch and returns the patched replicaSet. +func (c *replicaSets) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1beta1.ReplicaSet, err error) { + result = &v1beta1.ReplicaSet{} + err = c.client.Patch(pt). + Namespace(c.ns). + Resource("replicasets"). + SubResource(subresources...). + Name(name). + Body(data). + Do(). + Into(result) + return +} diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1/cluster.go b/federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1/cluster.go new file mode 100644 index 00000000000..7ea4963fc9e --- /dev/null +++ b/federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1/cluster.go @@ -0,0 +1,154 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package v1beta1 + +import ( + v1beta1 "k8s.io/kubernetes/federation/apis/federation/v1beta1" + api "k8s.io/kubernetes/pkg/api" + watch "k8s.io/kubernetes/pkg/watch" +) + +// ClustersGetter has a method to return a ClusterInterface. +// A group's client should implement this interface. +type ClustersGetter interface { + Clusters() ClusterInterface +} + +// ClusterInterface has methods to work with Cluster resources. +type ClusterInterface interface { + Create(*v1beta1.Cluster) (*v1beta1.Cluster, error) + Update(*v1beta1.Cluster) (*v1beta1.Cluster, error) + UpdateStatus(*v1beta1.Cluster) (*v1beta1.Cluster, error) + Delete(name string, options *api.DeleteOptions) error + DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error + Get(name string) (*v1beta1.Cluster, error) + List(opts api.ListOptions) (*v1beta1.ClusterList, error) + Watch(opts api.ListOptions) (watch.Interface, error) + Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1beta1.Cluster, err error) + ClusterExpansion +} + +// clusters implements ClusterInterface +type clusters struct { + client *FederationClient +} + +// newClusters returns a Clusters +func newClusters(c *FederationClient) *clusters { + return &clusters{ + client: c, + } +} + +// Create takes the representation of a cluster and creates it. Returns the server's representation of the cluster, and an error, if there is any. +func (c *clusters) Create(cluster *v1beta1.Cluster) (result *v1beta1.Cluster, err error) { + result = &v1beta1.Cluster{} + err = c.client.Post(). + Resource("clusters"). + Body(cluster). + Do(). + Into(result) + return +} + +// Update takes the representation of a cluster and updates it. Returns the server's representation of the cluster, and an error, if there is any. +func (c *clusters) Update(cluster *v1beta1.Cluster) (result *v1beta1.Cluster, err error) { + result = &v1beta1.Cluster{} + err = c.client.Put(). + Resource("clusters"). + Name(cluster.Name). + Body(cluster). + Do(). + Into(result) + return +} + +func (c *clusters) UpdateStatus(cluster *v1beta1.Cluster) (result *v1beta1.Cluster, err error) { + result = &v1beta1.Cluster{} + err = c.client.Put(). + Resource("clusters"). + Name(cluster.Name). + SubResource("status"). + Body(cluster). + Do(). + Into(result) + return +} + +// Delete takes name of the cluster and deletes it. Returns an error if one occurs. +func (c *clusters) Delete(name string, options *api.DeleteOptions) error { + return c.client.Delete(). + Resource("clusters"). + Name(name). + Body(options). + Do(). + Error() +} + +// DeleteCollection deletes a collection of objects. +func (c *clusters) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error { + return c.client.Delete(). + Resource("clusters"). + VersionedParams(&listOptions, api.ParameterCodec). + Body(options). + Do(). + Error() +} + +// Get takes name of the cluster, and returns the corresponding cluster object, and an error if there is any. +func (c *clusters) Get(name string) (result *v1beta1.Cluster, err error) { + result = &v1beta1.Cluster{} + err = c.client.Get(). + Resource("clusters"). + Name(name). + Do(). + Into(result) + return +} + +// List takes label and field selectors, and returns the list of Clusters that match those selectors. +func (c *clusters) List(opts api.ListOptions) (result *v1beta1.ClusterList, err error) { + result = &v1beta1.ClusterList{} + err = c.client.Get(). + Resource("clusters"). + VersionedParams(&opts, api.ParameterCodec). + Do(). + Into(result) + return +} + +// Watch returns a watch.Interface that watches the requested clusters. +func (c *clusters) Watch(opts api.ListOptions) (watch.Interface, error) { + return c.client.Get(). + Prefix("watch"). + Resource("clusters"). + VersionedParams(&opts, api.ParameterCodec). + Watch() +} + +// Patch applies the patch and returns the patched cluster. +func (c *clusters) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1beta1.Cluster, err error) { + result = &v1beta1.Cluster{} + err = c.client.Patch(pt). + Resource("clusters"). + SubResource(subresources...). + Name(name). + Body(data). + Do(). + Into(result) + return +} diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1/doc.go b/federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1/doc.go new file mode 100644 index 00000000000..7fb43f93d54 --- /dev/null +++ b/federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1/doc.go @@ -0,0 +1,20 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// This package is generated by client-gen with arguments: --clientset-name=federation_release_1_5 --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --included-types-overrides=[api/v1/Service,api/v1/Namespace,extensions/v1beta1/ReplicaSet,api/v1/Secret,extensions/v1beta1/Ingress,api/v1/Event] --input=[../../federation/apis/federation/v1beta1,api/v1,extensions/v1beta1] + +// This package has the automatically generated typed clients. +package v1beta1 diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1/fake/doc.go b/federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1/fake/doc.go new file mode 100644 index 00000000000..208bd643c03 --- /dev/null +++ b/federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1/fake/doc.go @@ -0,0 +1,20 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// This package is generated by client-gen with arguments: --clientset-name=federation_release_1_5 --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --included-types-overrides=[api/v1/Service,api/v1/Namespace,extensions/v1beta1/ReplicaSet,api/v1/Secret,extensions/v1beta1/Ingress,api/v1/Event] --input=[../../federation/apis/federation/v1beta1,api/v1,extensions/v1beta1] + +// Package fake has the automatically generated clients. +package fake diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1/fake/fake_cluster.go b/federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1/fake/fake_cluster.go new file mode 100644 index 00000000000..5602644fdfb --- /dev/null +++ b/federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1/fake/fake_cluster.go @@ -0,0 +1,118 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package fake + +import ( + v1beta1 "k8s.io/kubernetes/federation/apis/federation/v1beta1" + api "k8s.io/kubernetes/pkg/api" + unversioned "k8s.io/kubernetes/pkg/api/unversioned" + core "k8s.io/kubernetes/pkg/client/testing/core" + labels "k8s.io/kubernetes/pkg/labels" + watch "k8s.io/kubernetes/pkg/watch" +) + +// FakeClusters implements ClusterInterface +type FakeClusters struct { + Fake *FakeFederation +} + +var clustersResource = unversioned.GroupVersionResource{Group: "federation", Version: "v1beta1", Resource: "clusters"} + +func (c *FakeClusters) Create(cluster *v1beta1.Cluster) (result *v1beta1.Cluster, err error) { + obj, err := c.Fake. + Invokes(core.NewRootCreateAction(clustersResource, cluster), &v1beta1.Cluster{}) + if obj == nil { + return nil, err + } + return obj.(*v1beta1.Cluster), err +} + +func (c *FakeClusters) Update(cluster *v1beta1.Cluster) (result *v1beta1.Cluster, err error) { + obj, err := c.Fake. + Invokes(core.NewRootUpdateAction(clustersResource, cluster), &v1beta1.Cluster{}) + if obj == nil { + return nil, err + } + return obj.(*v1beta1.Cluster), err +} + +func (c *FakeClusters) UpdateStatus(cluster *v1beta1.Cluster) (*v1beta1.Cluster, error) { + obj, err := c.Fake. + Invokes(core.NewRootUpdateSubresourceAction(clustersResource, "status", cluster), &v1beta1.Cluster{}) + if obj == nil { + return nil, err + } + return obj.(*v1beta1.Cluster), err +} + +func (c *FakeClusters) Delete(name string, options *api.DeleteOptions) error { + _, err := c.Fake. + Invokes(core.NewRootDeleteAction(clustersResource, name), &v1beta1.Cluster{}) + return err +} + +func (c *FakeClusters) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error { + action := core.NewRootDeleteCollectionAction(clustersResource, listOptions) + + _, err := c.Fake.Invokes(action, &v1beta1.ClusterList{}) + return err +} + +func (c *FakeClusters) Get(name string) (result *v1beta1.Cluster, err error) { + obj, err := c.Fake. + Invokes(core.NewRootGetAction(clustersResource, name), &v1beta1.Cluster{}) + if obj == nil { + return nil, err + } + return obj.(*v1beta1.Cluster), err +} + +func (c *FakeClusters) List(opts api.ListOptions) (result *v1beta1.ClusterList, err error) { + obj, err := c.Fake. + Invokes(core.NewRootListAction(clustersResource, opts), &v1beta1.ClusterList{}) + if obj == nil { + return nil, err + } + + label := opts.LabelSelector + if label == nil { + label = labels.Everything() + } + list := &v1beta1.ClusterList{} + for _, item := range obj.(*v1beta1.ClusterList).Items { + if label.Matches(labels.Set(item.Labels)) { + list.Items = append(list.Items, item) + } + } + return list, err +} + +// Watch returns a watch.Interface that watches the requested clusters. +func (c *FakeClusters) Watch(opts api.ListOptions) (watch.Interface, error) { + return c.Fake. + InvokesWatch(core.NewRootWatchAction(clustersResource, opts)) +} + +// Patch applies the patch and returns the patched cluster. +func (c *FakeClusters) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1beta1.Cluster, err error) { + obj, err := c.Fake. + Invokes(core.NewRootPatchSubresourceAction(clustersResource, name, data, subresources...), &v1beta1.Cluster{}) + if obj == nil { + return nil, err + } + return obj.(*v1beta1.Cluster), err +} diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1/fake/fake_federation_client.go b/federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1/fake/fake_federation_client.go new file mode 100644 index 00000000000..62ae50c3dd1 --- /dev/null +++ b/federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1/fake/fake_federation_client.go @@ -0,0 +1,37 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package fake + +import ( + v1beta1 "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1" + restclient "k8s.io/kubernetes/pkg/client/restclient" + core "k8s.io/kubernetes/pkg/client/testing/core" +) + +type FakeFederation struct { + *core.Fake +} + +func (c *FakeFederation) Clusters() v1beta1.ClusterInterface { + return &FakeClusters{c} +} + +// GetRESTClient returns a RESTClient that is used to communicate +// with API server by this client implementation. +func (c *FakeFederation) GetRESTClient() *restclient.RESTClient { + return nil +} diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1/federation_client.go b/federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1/federation_client.go new file mode 100644 index 00000000000..02cdf84a6a5 --- /dev/null +++ b/federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1/federation_client.go @@ -0,0 +1,96 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package v1beta1 + +import ( + api "k8s.io/kubernetes/pkg/api" + registered "k8s.io/kubernetes/pkg/apimachinery/registered" + restclient "k8s.io/kubernetes/pkg/client/restclient" + serializer "k8s.io/kubernetes/pkg/runtime/serializer" +) + +type FederationInterface interface { + GetRESTClient() *restclient.RESTClient + ClustersGetter +} + +// FederationClient is used to interact with features provided by the Federation group. +type FederationClient struct { + *restclient.RESTClient +} + +func (c *FederationClient) Clusters() ClusterInterface { + return newClusters(c) +} + +// NewForConfig creates a new FederationClient for the given config. +func NewForConfig(c *restclient.Config) (*FederationClient, error) { + config := *c + if err := setConfigDefaults(&config); err != nil { + return nil, err + } + client, err := restclient.RESTClientFor(&config) + if err != nil { + return nil, err + } + return &FederationClient{client}, nil +} + +// NewForConfigOrDie creates a new FederationClient for the given config and +// panics if there is an error in the config. +func NewForConfigOrDie(c *restclient.Config) *FederationClient { + client, err := NewForConfig(c) + if err != nil { + panic(err) + } + return client +} + +// New creates a new FederationClient for the given RESTClient. +func New(c *restclient.RESTClient) *FederationClient { + return &FederationClient{c} +} + +func setConfigDefaults(config *restclient.Config) error { + // if federation group is not registered, return an error + g, err := registered.Group("federation") + if err != nil { + return err + } + config.APIPath = "/apis" + if config.UserAgent == "" { + config.UserAgent = restclient.DefaultKubernetesUserAgent() + } + // TODO: Unconditionally set the config.Version, until we fix the config. + //if config.Version == "" { + copyGroupVersion := g.GroupVersion + config.GroupVersion = ©GroupVersion + //} + + config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: api.Codecs} + + return nil +} + +// GetRESTClient returns a RESTClient that is used to communicate +// with API server by this client implementation. +func (c *FederationClient) GetRESTClient() *restclient.RESTClient { + if c == nil { + return nil + } + return c.RESTClient +} diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1/generated_expansion.go b/federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1/generated_expansion.go new file mode 100644 index 00000000000..877918cc575 --- /dev/null +++ b/federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1/generated_expansion.go @@ -0,0 +1,19 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package v1beta1 + +type ClusterExpansion interface{} diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh index 9be6e431430..02884b3af56 100755 --- a/hack/update-codegen.sh +++ b/hack/update-codegen.sh @@ -39,10 +39,10 @@ setgen=$(kube::util::find-binary "set-gen") # update- and verify- scripts. ${clientgen} "$@" ${clientgen} -t "$@" -${clientgen} --clientset-name="release_1_4" --input="api/v1,authorization/v1beta1,autoscaling/v1,batch/v1,extensions/v1beta1,policy/v1alpha1" +${clientgen} --clientset-name="release_1_5" --input="api/v1,authorization/v1beta1,autoscaling/v1,batch/v1,extensions/v1beta1,policy/v1alpha1" # Clientgen for federation clientset. ${clientgen} --clientset-name=federation_internalclientset --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --input="../../federation/apis/federation/","api/","extensions/" --included-types-overrides="api/Service,api/Namespace,extensions/ReplicaSet,api/Secret,extensions/Ingress,api/Event" "$@" -${clientgen} --clientset-name=federation_release_1_4 --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --input="../../federation/apis/federation/v1beta1","api/v1","extensions/v1beta1" --included-types-overrides="api/v1/Service,api/v1/Namespace,extensions/v1beta1/ReplicaSet,api/v1/Secret,extensions/v1beta1/Ingress,api/v1/Event" "$@" +${clientgen} --clientset-name=federation_release_1_5 --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --input="../../federation/apis/federation/v1beta1","api/v1","extensions/v1beta1" --included-types-overrides="api/v1/Service,api/v1/Namespace,extensions/v1beta1/ReplicaSet,api/v1/Secret,extensions/v1beta1/Ingress,api/v1/Event" "$@" ${setgen} "$@" # You may add additional calls of code generators like set-gen above. diff --git a/pkg/client/clientset_generated/release_1_5/clientset.go b/pkg/client/clientset_generated/release_1_5/clientset.go new file mode 100644 index 00000000000..13b21f886a7 --- /dev/null +++ b/pkg/client/clientset_generated/release_1_5/clientset.go @@ -0,0 +1,175 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package release_1_5 + +import ( + "github.com/golang/glog" + v1beta1authorization "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1" + v1autoscaling "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/autoscaling/v1" + v1batch "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/batch/v1" + v1core "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/core/v1" + v1beta1extensions "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1" + v1alpha1policy "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/policy/v1alpha1" + restclient "k8s.io/kubernetes/pkg/client/restclient" + discovery "k8s.io/kubernetes/pkg/client/typed/discovery" + "k8s.io/kubernetes/pkg/util/flowcontrol" +) + +type Interface interface { + Discovery() discovery.DiscoveryInterface + Core() v1core.CoreInterface + Authorization() v1beta1authorization.AuthorizationInterface + Autoscaling() v1autoscaling.AutoscalingInterface + Batch() v1batch.BatchInterface + Extensions() v1beta1extensions.ExtensionsInterface + Policy() v1alpha1policy.PolicyInterface +} + +// Clientset contains the clients for groups. Each group has exactly one +// version included in a Clientset. +type Clientset struct { + *discovery.DiscoveryClient + *v1core.CoreClient + *v1beta1authorization.AuthorizationClient + *v1autoscaling.AutoscalingClient + *v1batch.BatchClient + *v1beta1extensions.ExtensionsClient + *v1alpha1policy.PolicyClient +} + +// Core retrieves the CoreClient +func (c *Clientset) Core() v1core.CoreInterface { + if c == nil { + return nil + } + return c.CoreClient +} + +// Authorization retrieves the AuthorizationClient +func (c *Clientset) Authorization() v1beta1authorization.AuthorizationInterface { + if c == nil { + return nil + } + return c.AuthorizationClient +} + +// Autoscaling retrieves the AutoscalingClient +func (c *Clientset) Autoscaling() v1autoscaling.AutoscalingInterface { + if c == nil { + return nil + } + return c.AutoscalingClient +} + +// Batch retrieves the BatchClient +func (c *Clientset) Batch() v1batch.BatchInterface { + if c == nil { + return nil + } + return c.BatchClient +} + +// Extensions retrieves the ExtensionsClient +func (c *Clientset) Extensions() v1beta1extensions.ExtensionsInterface { + if c == nil { + return nil + } + return c.ExtensionsClient +} + +// Policy retrieves the PolicyClient +func (c *Clientset) Policy() v1alpha1policy.PolicyInterface { + if c == nil { + return nil + } + return c.PolicyClient +} + +// Discovery retrieves the DiscoveryClient +func (c *Clientset) Discovery() discovery.DiscoveryInterface { + return c.DiscoveryClient +} + +// NewForConfig creates a new Clientset for the given config. +func NewForConfig(c *restclient.Config) (*Clientset, error) { + configShallowCopy := *c + if configShallowCopy.RateLimiter == nil && configShallowCopy.QPS > 0 { + configShallowCopy.RateLimiter = flowcontrol.NewTokenBucketRateLimiter(configShallowCopy.QPS, configShallowCopy.Burst) + } + var clientset Clientset + var err error + clientset.CoreClient, err = v1core.NewForConfig(&configShallowCopy) + if err != nil { + return nil, err + } + clientset.AuthorizationClient, err = v1beta1authorization.NewForConfig(&configShallowCopy) + if err != nil { + return nil, err + } + clientset.AutoscalingClient, err = v1autoscaling.NewForConfig(&configShallowCopy) + if err != nil { + return nil, err + } + clientset.BatchClient, err = v1batch.NewForConfig(&configShallowCopy) + if err != nil { + return nil, err + } + clientset.ExtensionsClient, err = v1beta1extensions.NewForConfig(&configShallowCopy) + if err != nil { + return nil, err + } + clientset.PolicyClient, err = v1alpha1policy.NewForConfig(&configShallowCopy) + if err != nil { + return nil, err + } + + clientset.DiscoveryClient, err = discovery.NewDiscoveryClientForConfig(&configShallowCopy) + if err != nil { + glog.Errorf("failed to create the DiscoveryClient: %v", err) + return nil, err + } + return &clientset, nil +} + +// NewForConfigOrDie creates a new Clientset for the given config and +// panics if there is an error in the config. +func NewForConfigOrDie(c *restclient.Config) *Clientset { + var clientset Clientset + clientset.CoreClient = v1core.NewForConfigOrDie(c) + clientset.AuthorizationClient = v1beta1authorization.NewForConfigOrDie(c) + clientset.AutoscalingClient = v1autoscaling.NewForConfigOrDie(c) + clientset.BatchClient = v1batch.NewForConfigOrDie(c) + clientset.ExtensionsClient = v1beta1extensions.NewForConfigOrDie(c) + clientset.PolicyClient = v1alpha1policy.NewForConfigOrDie(c) + + clientset.DiscoveryClient = discovery.NewDiscoveryClientForConfigOrDie(c) + return &clientset +} + +// New creates a new Clientset for the given RESTClient. +func New(c *restclient.RESTClient) *Clientset { + var clientset Clientset + clientset.CoreClient = v1core.New(c) + clientset.AuthorizationClient = v1beta1authorization.New(c) + clientset.AutoscalingClient = v1autoscaling.New(c) + clientset.BatchClient = v1batch.New(c) + clientset.ExtensionsClient = v1beta1extensions.New(c) + clientset.PolicyClient = v1alpha1policy.New(c) + + clientset.DiscoveryClient = discovery.NewDiscoveryClient(c) + return &clientset +} diff --git a/pkg/client/clientset_generated/release_1_2/doc.go b/pkg/client/clientset_generated/release_1_5/doc.go similarity index 81% rename from pkg/client/clientset_generated/release_1_2/doc.go rename to pkg/client/clientset_generated/release_1_5/doc.go index 71c2705bbfa..d4b1b2d53c7 100644 --- a/pkg/client/clientset_generated/release_1_2/doc.go +++ b/pkg/client/clientset_generated/release_1_5/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=release_1_2 --input=[api/v1,extensions/v1beta1] +// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,authorization/v1beta1,autoscaling/v1,batch/v1,extensions/v1beta1,policy/v1alpha1] // This package has the automatically generated clientset. -package release_1_2 // import "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" +package release_1_5 diff --git a/pkg/client/clientset_generated/release_1_5/fake/clientset_generated.go b/pkg/client/clientset_generated/release_1_5/fake/clientset_generated.go new file mode 100644 index 00000000000..c7adc5db02b --- /dev/null +++ b/pkg/client/clientset_generated/release_1_5/fake/clientset_generated.go @@ -0,0 +1,103 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package fake + +import ( + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/apimachinery/registered" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" + v1beta1authorization "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1" + fakev1beta1authorization "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/fake" + v1autoscaling "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/autoscaling/v1" + fakev1autoscaling "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/autoscaling/v1/fake" + v1batch "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/batch/v1" + fakev1batch "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/batch/v1/fake" + v1core "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/core/v1" + fakev1core "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake" + v1beta1extensions "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1" + fakev1beta1extensions "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake" + v1alpha1policy "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/policy/v1alpha1" + fakev1alpha1policy "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/policy/v1alpha1/fake" + "k8s.io/kubernetes/pkg/client/testing/core" + "k8s.io/kubernetes/pkg/client/typed/discovery" + fakediscovery "k8s.io/kubernetes/pkg/client/typed/discovery/fake" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/watch" +) + +// NewSimpleClientset returns a clientset that will respond with the provided objects. +// It's backed by a very simple object tracker that processes creates, updates and deletions as-is, +// without applying any validations and/or defaults. It shouldn't be considered a replacement +// for a real clientset and is mostly useful in simple unit tests. +func NewSimpleClientset(objects ...runtime.Object) *Clientset { + o := core.NewObjectTracker(api.Scheme, api.Codecs.UniversalDecoder()) + for _, obj := range objects { + if err := o.Add(obj); err != nil { + panic(err) + } + } + + fakePtr := core.Fake{} + fakePtr.AddReactor("*", "*", core.ObjectReaction(o, registered.RESTMapper())) + + fakePtr.AddWatchReactor("*", core.DefaultWatchReactor(watch.NewFake(), nil)) + + return &Clientset{fakePtr} +} + +// Clientset implements clientset.Interface. Meant to be embedded into a +// struct to get a default implementation. This makes faking out just the method +// you want to test easier. +type Clientset struct { + core.Fake +} + +func (c *Clientset) Discovery() discovery.DiscoveryInterface { + return &fakediscovery.FakeDiscovery{Fake: &c.Fake} +} + +var _ clientset.Interface = &Clientset{} + +// Core retrieves the CoreClient +func (c *Clientset) Core() v1core.CoreInterface { + return &fakev1core.FakeCore{Fake: &c.Fake} +} + +// Authorization retrieves the AuthorizationClient +func (c *Clientset) Authorization() v1beta1authorization.AuthorizationInterface { + return &fakev1beta1authorization.FakeAuthorization{Fake: &c.Fake} +} + +// Autoscaling retrieves the AutoscalingClient +func (c *Clientset) Autoscaling() v1autoscaling.AutoscalingInterface { + return &fakev1autoscaling.FakeAutoscaling{Fake: &c.Fake} +} + +// Batch retrieves the BatchClient +func (c *Clientset) Batch() v1batch.BatchInterface { + return &fakev1batch.FakeBatch{Fake: &c.Fake} +} + +// Extensions retrieves the ExtensionsClient +func (c *Clientset) Extensions() v1beta1extensions.ExtensionsInterface { + return &fakev1beta1extensions.FakeExtensions{Fake: &c.Fake} +} + +// Policy retrieves the PolicyClient +func (c *Clientset) Policy() v1alpha1policy.PolicyInterface { + return &fakev1alpha1policy.FakePolicy{Fake: &c.Fake} +} diff --git a/pkg/client/clientset_generated/release_1_2/fake/doc.go b/pkg/client/clientset_generated/release_1_5/fake/doc.go similarity index 82% rename from pkg/client/clientset_generated/release_1_2/fake/doc.go rename to pkg/client/clientset_generated/release_1_5/fake/doc.go index 388278d804c..f68af527193 100644 --- a/pkg/client/clientset_generated/release_1_2/fake/doc.go +++ b/pkg/client/clientset_generated/release_1_5/fake/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=release_1_2 --input=[api/v1,extensions/v1beta1] +// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,authorization/v1beta1,autoscaling/v1,batch/v1,extensions/v1beta1,policy/v1alpha1] // This package has the automatically generated fake clientset. -package fake // import "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2/fake" +package fake diff --git a/pkg/client/clientset_generated/release_1_2/import_known_versions.go b/pkg/client/clientset_generated/release_1_5/import_known_versions.go similarity index 87% rename from pkg/client/clientset_generated/release_1_2/import_known_versions.go rename to pkg/client/clientset_generated/release_1_5/import_known_versions.go index 9f62e0b8637..024a8b2c94b 100644 --- a/pkg/client/clientset_generated/release_1_2/import_known_versions.go +++ b/pkg/client/clientset_generated/release_1_5/import_known_versions.go @@ -1,5 +1,5 @@ /* -Copyright 2015 The Kubernetes Authors. +Copyright 2016 The Kubernetes Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package release_1_2 +package release_1_5 // These imports are the API groups the client will support. import ( @@ -25,8 +25,9 @@ import ( _ "k8s.io/kubernetes/pkg/apis/authorization/install" _ "k8s.io/kubernetes/pkg/apis/autoscaling/install" _ "k8s.io/kubernetes/pkg/apis/batch/install" - _ "k8s.io/kubernetes/pkg/apis/componentconfig/install" _ "k8s.io/kubernetes/pkg/apis/extensions/install" + _ "k8s.io/kubernetes/pkg/apis/policy/install" + _ "k8s.io/kubernetes/pkg/apis/storage/install" ) func init() { diff --git a/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/authorization_client.go b/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/authorization_client.go new file mode 100644 index 00000000000..3e1c216dab8 --- /dev/null +++ b/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/authorization_client.go @@ -0,0 +1,96 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package v1beta1 + +import ( + api "k8s.io/kubernetes/pkg/api" + registered "k8s.io/kubernetes/pkg/apimachinery/registered" + restclient "k8s.io/kubernetes/pkg/client/restclient" + serializer "k8s.io/kubernetes/pkg/runtime/serializer" +) + +type AuthorizationInterface interface { + GetRESTClient() *restclient.RESTClient + SubjectAccessReviewsGetter +} + +// AuthorizationClient is used to interact with features provided by the Authorization group. +type AuthorizationClient struct { + *restclient.RESTClient +} + +func (c *AuthorizationClient) SubjectAccessReviews() SubjectAccessReviewInterface { + return newSubjectAccessReviews(c) +} + +// NewForConfig creates a new AuthorizationClient for the given config. +func NewForConfig(c *restclient.Config) (*AuthorizationClient, error) { + config := *c + if err := setConfigDefaults(&config); err != nil { + return nil, err + } + client, err := restclient.RESTClientFor(&config) + if err != nil { + return nil, err + } + return &AuthorizationClient{client}, nil +} + +// NewForConfigOrDie creates a new AuthorizationClient for the given config and +// panics if there is an error in the config. +func NewForConfigOrDie(c *restclient.Config) *AuthorizationClient { + client, err := NewForConfig(c) + if err != nil { + panic(err) + } + return client +} + +// New creates a new AuthorizationClient for the given RESTClient. +func New(c *restclient.RESTClient) *AuthorizationClient { + return &AuthorizationClient{c} +} + +func setConfigDefaults(config *restclient.Config) error { + // if authorization group is not registered, return an error + g, err := registered.Group("authorization.k8s.io") + if err != nil { + return err + } + config.APIPath = "/apis" + if config.UserAgent == "" { + config.UserAgent = restclient.DefaultKubernetesUserAgent() + } + // TODO: Unconditionally set the config.Version, until we fix the config. + //if config.Version == "" { + copyGroupVersion := g.GroupVersion + config.GroupVersion = ©GroupVersion + //} + + config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: api.Codecs} + + return nil +} + +// GetRESTClient returns a RESTClient that is used to communicate +// with API server by this client implementation. +func (c *AuthorizationClient) GetRESTClient() *restclient.RESTClient { + if c == nil { + return nil + } + return c.RESTClient +} diff --git a/pkg/client/clientset_generated/release_1_2/typed/core/v1/doc.go b/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/doc.go similarity index 81% rename from pkg/client/clientset_generated/release_1_2/typed/core/v1/doc.go rename to pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/doc.go index a866884fea7..831e702d926 100644 --- a/pkg/client/clientset_generated/release_1_2/typed/core/v1/doc.go +++ b/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=release_1_2 --input=[api/v1,extensions/v1beta1] +// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,authorization/v1beta1,autoscaling/v1,batch/v1,extensions/v1beta1,policy/v1alpha1] // This package has the automatically generated typed clients. -package v1 // import "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2/typed/core/v1" +package v1beta1 diff --git a/pkg/client/clientset_generated/release_1_2/typed/core/v1/fake/doc.go b/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/fake/doc.go similarity index 80% rename from pkg/client/clientset_generated/release_1_2/typed/core/v1/fake/doc.go rename to pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/fake/doc.go index 70b6552f4a8..793bddf23ce 100644 --- a/pkg/client/clientset_generated/release_1_2/typed/core/v1/fake/doc.go +++ b/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/fake/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=release_1_2 --input=[api/v1,extensions/v1beta1] +// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,authorization/v1beta1,autoscaling/v1,batch/v1,extensions/v1beta1,policy/v1alpha1] // Package fake has the automatically generated clients. -package fake // import "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2/typed/core/v1/fake" +package fake diff --git a/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/fake/fake_authorization_client.go b/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/fake/fake_authorization_client.go new file mode 100644 index 00000000000..9996c0cecc7 --- /dev/null +++ b/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/fake/fake_authorization_client.go @@ -0,0 +1,37 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package fake + +import ( + v1beta1 "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1" + restclient "k8s.io/kubernetes/pkg/client/restclient" + core "k8s.io/kubernetes/pkg/client/testing/core" +) + +type FakeAuthorization struct { + *core.Fake +} + +func (c *FakeAuthorization) SubjectAccessReviews() v1beta1.SubjectAccessReviewInterface { + return &FakeSubjectAccessReviews{c} +} + +// GetRESTClient returns a RESTClient that is used to communicate +// with API server by this client implementation. +func (c *FakeAuthorization) GetRESTClient() *restclient.RESTClient { + return nil +} diff --git a/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/fake/fake_subjectaccessreview.go b/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/fake/fake_subjectaccessreview.go new file mode 100644 index 00000000000..0a01cd81a45 --- /dev/null +++ b/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/fake/fake_subjectaccessreview.go @@ -0,0 +1,22 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package fake + +// FakeSubjectAccessReviews implements SubjectAccessReviewInterface +type FakeSubjectAccessReviews struct { + Fake *FakeAuthorization +} diff --git a/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/fake/fake_subjectaccessreview_expansion.go b/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/fake/fake_subjectaccessreview_expansion.go new file mode 100644 index 00000000000..88df166ef58 --- /dev/null +++ b/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/fake/fake_subjectaccessreview_expansion.go @@ -0,0 +1,28 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package fake + +import ( + authorizationapi "k8s.io/kubernetes/pkg/apis/authorization/v1beta1" + + "k8s.io/kubernetes/pkg/client/testing/core" +) + +func (c *FakeSubjectAccessReviews) Create(sar *authorizationapi.SubjectAccessReview) (result *authorizationapi.SubjectAccessReview, err error) { + obj, err := c.Fake.Invokes(core.NewRootCreateAction(authorizationapi.SchemeGroupVersion.WithResource("subjectaccessreviews"), sar), &authorizationapi.SubjectAccessReview{}) + return obj.(*authorizationapi.SubjectAccessReview), err +} diff --git a/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/generated_expansion.go b/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/generated_expansion.go new file mode 100644 index 00000000000..a397b30e92d --- /dev/null +++ b/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/generated_expansion.go @@ -0,0 +1,17 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package v1beta1 diff --git a/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/subjectaccessreview.go b/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/subjectaccessreview.go new file mode 100644 index 00000000000..1c936721852 --- /dev/null +++ b/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/subjectaccessreview.go @@ -0,0 +1,40 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package v1beta1 + +// SubjectAccessReviewsGetter has a method to return a SubjectAccessReviewInterface. +// A group's client should implement this interface. +type SubjectAccessReviewsGetter interface { + SubjectAccessReviews() SubjectAccessReviewInterface +} + +// SubjectAccessReviewInterface has methods to work with SubjectAccessReview resources. +type SubjectAccessReviewInterface interface { + SubjectAccessReviewExpansion +} + +// subjectAccessReviews implements SubjectAccessReviewInterface +type subjectAccessReviews struct { + client *AuthorizationClient +} + +// newSubjectAccessReviews returns a SubjectAccessReviews +func newSubjectAccessReviews(c *AuthorizationClient) *subjectAccessReviews { + return &subjectAccessReviews{ + client: c, + } +} diff --git a/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/subjectaccessreview_expansion.go b/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/subjectaccessreview_expansion.go new file mode 100644 index 00000000000..bf57a7b07d8 --- /dev/null +++ b/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/subjectaccessreview_expansion.go @@ -0,0 +1,36 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package v1beta1 + +import ( + authorizationapi "k8s.io/kubernetes/pkg/apis/authorization/v1beta1" +) + +// The SubjectAccessReviewExpansion interface allows manually adding extra methods to the AuthorizationInterface. +type SubjectAccessReviewExpansion interface { + Create(sar *authorizationapi.SubjectAccessReview) (result *authorizationapi.SubjectAccessReview, err error) +} + +func (c *subjectAccessReviews) Create(sar *authorizationapi.SubjectAccessReview) (result *authorizationapi.SubjectAccessReview, err error) { + result = &authorizationapi.SubjectAccessReview{} + err = c.client.Post(). + Resource("subjectaccessreviews"). + Body(sar). + Do(). + Into(result) + return +} diff --git a/pkg/client/clientset_generated/release_1_5/typed/autoscaling/v1/autoscaling_client.go b/pkg/client/clientset_generated/release_1_5/typed/autoscaling/v1/autoscaling_client.go new file mode 100644 index 00000000000..259aea047c3 --- /dev/null +++ b/pkg/client/clientset_generated/release_1_5/typed/autoscaling/v1/autoscaling_client.go @@ -0,0 +1,96 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package v1 + +import ( + api "k8s.io/kubernetes/pkg/api" + registered "k8s.io/kubernetes/pkg/apimachinery/registered" + restclient "k8s.io/kubernetes/pkg/client/restclient" + serializer "k8s.io/kubernetes/pkg/runtime/serializer" +) + +type AutoscalingInterface interface { + GetRESTClient() *restclient.RESTClient + HorizontalPodAutoscalersGetter +} + +// AutoscalingClient is used to interact with features provided by the Autoscaling group. +type AutoscalingClient struct { + *restclient.RESTClient +} + +func (c *AutoscalingClient) HorizontalPodAutoscalers(namespace string) HorizontalPodAutoscalerInterface { + return newHorizontalPodAutoscalers(c, namespace) +} + +// NewForConfig creates a new AutoscalingClient for the given config. +func NewForConfig(c *restclient.Config) (*AutoscalingClient, error) { + config := *c + if err := setConfigDefaults(&config); err != nil { + return nil, err + } + client, err := restclient.RESTClientFor(&config) + if err != nil { + return nil, err + } + return &AutoscalingClient{client}, nil +} + +// NewForConfigOrDie creates a new AutoscalingClient for the given config and +// panics if there is an error in the config. +func NewForConfigOrDie(c *restclient.Config) *AutoscalingClient { + client, err := NewForConfig(c) + if err != nil { + panic(err) + } + return client +} + +// New creates a new AutoscalingClient for the given RESTClient. +func New(c *restclient.RESTClient) *AutoscalingClient { + return &AutoscalingClient{c} +} + +func setConfigDefaults(config *restclient.Config) error { + // if autoscaling group is not registered, return an error + g, err := registered.Group("autoscaling") + if err != nil { + return err + } + config.APIPath = "/apis" + if config.UserAgent == "" { + config.UserAgent = restclient.DefaultKubernetesUserAgent() + } + // TODO: Unconditionally set the config.Version, until we fix the config. + //if config.Version == "" { + copyGroupVersion := g.GroupVersion + config.GroupVersion = ©GroupVersion + //} + + config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: api.Codecs} + + return nil +} + +// GetRESTClient returns a RESTClient that is used to communicate +// with API server by this client implementation. +func (c *AutoscalingClient) GetRESTClient() *restclient.RESTClient { + if c == nil { + return nil + } + return c.RESTClient +} diff --git a/pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/doc.go b/pkg/client/clientset_generated/release_1_5/typed/autoscaling/v1/doc.go similarity index 80% rename from pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/doc.go rename to pkg/client/clientset_generated/release_1_5/typed/autoscaling/v1/doc.go index c83ebdfbce6..20aab35ab22 100644 --- a/pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/doc.go +++ b/pkg/client/clientset_generated/release_1_5/typed/autoscaling/v1/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=release_1_2 --input=[api/v1,extensions/v1beta1] +// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,authorization/v1beta1,autoscaling/v1,batch/v1,extensions/v1beta1,policy/v1alpha1] // This package has the automatically generated typed clients. -package v1beta1 // import "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1" +package v1 diff --git a/pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/fake/doc.go b/pkg/client/clientset_generated/release_1_5/typed/autoscaling/v1/fake/doc.go similarity index 79% rename from pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/fake/doc.go rename to pkg/client/clientset_generated/release_1_5/typed/autoscaling/v1/fake/doc.go index b125a4bfbe5..793bddf23ce 100644 --- a/pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/fake/doc.go +++ b/pkg/client/clientset_generated/release_1_5/typed/autoscaling/v1/fake/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=release_1_2 --input=[api/v1,extensions/v1beta1] +// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,authorization/v1beta1,autoscaling/v1,batch/v1,extensions/v1beta1,policy/v1alpha1] // Package fake has the automatically generated clients. -package fake // import "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/fake" +package fake diff --git a/pkg/client/clientset_generated/release_1_5/typed/autoscaling/v1/fake/fake_autoscaling_client.go b/pkg/client/clientset_generated/release_1_5/typed/autoscaling/v1/fake/fake_autoscaling_client.go new file mode 100644 index 00000000000..58753a4fa27 --- /dev/null +++ b/pkg/client/clientset_generated/release_1_5/typed/autoscaling/v1/fake/fake_autoscaling_client.go @@ -0,0 +1,37 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package fake + +import ( + v1 "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/autoscaling/v1" + restclient "k8s.io/kubernetes/pkg/client/restclient" + core "k8s.io/kubernetes/pkg/client/testing/core" +) + +type FakeAutoscaling struct { + *core.Fake +} + +func (c *FakeAutoscaling) HorizontalPodAutoscalers(namespace string) v1.HorizontalPodAutoscalerInterface { + return &FakeHorizontalPodAutoscalers{c, namespace} +} + +// GetRESTClient returns a RESTClient that is used to communicate +// with API server by this client implementation. +func (c *FakeAutoscaling) GetRESTClient() *restclient.RESTClient { + return nil +} diff --git a/pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/fake/fake_horizontalpodautoscaler.go b/pkg/client/clientset_generated/release_1_5/typed/autoscaling/v1/fake/fake_horizontalpodautoscaler.go similarity index 62% rename from pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/fake/fake_horizontalpodautoscaler.go rename to pkg/client/clientset_generated/release_1_5/typed/autoscaling/v1/fake/fake_horizontalpodautoscaler.go index 2193e605743..d739dd73e35 100644 --- a/pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/fake/fake_horizontalpodautoscaler.go +++ b/pkg/client/clientset_generated/release_1_5/typed/autoscaling/v1/fake/fake_horizontalpodautoscaler.go @@ -19,7 +19,7 @@ package fake import ( api "k8s.io/kubernetes/pkg/api" unversioned "k8s.io/kubernetes/pkg/api/unversioned" - v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + v1 "k8s.io/kubernetes/pkg/apis/autoscaling/v1" core "k8s.io/kubernetes/pkg/client/testing/core" labels "k8s.io/kubernetes/pkg/labels" watch "k8s.io/kubernetes/pkg/watch" @@ -27,45 +27,45 @@ import ( // FakeHorizontalPodAutoscalers implements HorizontalPodAutoscalerInterface type FakeHorizontalPodAutoscalers struct { - Fake *FakeExtensions + Fake *FakeAutoscaling ns string } -var horizontalpodautoscalersResource = unversioned.GroupVersionResource{Group: "extensions", Version: "v1beta1", Resource: "horizontalpodautoscalers"} +var horizontalpodautoscalersResource = unversioned.GroupVersionResource{Group: "autoscaling", Version: "v1", Resource: "horizontalpodautoscalers"} -func (c *FakeHorizontalPodAutoscalers) Create(horizontalPodAutoscaler *v1beta1.HorizontalPodAutoscaler) (result *v1beta1.HorizontalPodAutoscaler, err error) { +func (c *FakeHorizontalPodAutoscalers) Create(horizontalPodAutoscaler *v1.HorizontalPodAutoscaler) (result *v1.HorizontalPodAutoscaler, err error) { obj, err := c.Fake. - Invokes(core.NewCreateAction(horizontalpodautoscalersResource, c.ns, horizontalPodAutoscaler), &v1beta1.HorizontalPodAutoscaler{}) + Invokes(core.NewCreateAction(horizontalpodautoscalersResource, c.ns, horizontalPodAutoscaler), &v1.HorizontalPodAutoscaler{}) if obj == nil { return nil, err } - return obj.(*v1beta1.HorizontalPodAutoscaler), err + return obj.(*v1.HorizontalPodAutoscaler), err } -func (c *FakeHorizontalPodAutoscalers) Update(horizontalPodAutoscaler *v1beta1.HorizontalPodAutoscaler) (result *v1beta1.HorizontalPodAutoscaler, err error) { +func (c *FakeHorizontalPodAutoscalers) Update(horizontalPodAutoscaler *v1.HorizontalPodAutoscaler) (result *v1.HorizontalPodAutoscaler, err error) { obj, err := c.Fake. - Invokes(core.NewUpdateAction(horizontalpodautoscalersResource, c.ns, horizontalPodAutoscaler), &v1beta1.HorizontalPodAutoscaler{}) + Invokes(core.NewUpdateAction(horizontalpodautoscalersResource, c.ns, horizontalPodAutoscaler), &v1.HorizontalPodAutoscaler{}) if obj == nil { return nil, err } - return obj.(*v1beta1.HorizontalPodAutoscaler), err + return obj.(*v1.HorizontalPodAutoscaler), err } -func (c *FakeHorizontalPodAutoscalers) UpdateStatus(horizontalPodAutoscaler *v1beta1.HorizontalPodAutoscaler) (*v1beta1.HorizontalPodAutoscaler, error) { +func (c *FakeHorizontalPodAutoscalers) UpdateStatus(horizontalPodAutoscaler *v1.HorizontalPodAutoscaler) (*v1.HorizontalPodAutoscaler, error) { obj, err := c.Fake. - Invokes(core.NewUpdateSubresourceAction(horizontalpodautoscalersResource, "status", c.ns, horizontalPodAutoscaler), &v1beta1.HorizontalPodAutoscaler{}) + Invokes(core.NewUpdateSubresourceAction(horizontalpodautoscalersResource, "status", c.ns, horizontalPodAutoscaler), &v1.HorizontalPodAutoscaler{}) if obj == nil { return nil, err } - return obj.(*v1beta1.HorizontalPodAutoscaler), err + return obj.(*v1.HorizontalPodAutoscaler), err } func (c *FakeHorizontalPodAutoscalers) Delete(name string, options *api.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewDeleteAction(horizontalpodautoscalersResource, c.ns, name), &v1beta1.HorizontalPodAutoscaler{}) + Invokes(core.NewDeleteAction(horizontalpodautoscalersResource, c.ns, name), &v1.HorizontalPodAutoscaler{}) return err } @@ -73,23 +73,23 @@ func (c *FakeHorizontalPodAutoscalers) Delete(name string, options *api.DeleteOp func (c *FakeHorizontalPodAutoscalers) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error { action := core.NewDeleteCollectionAction(horizontalpodautoscalersResource, c.ns, listOptions) - _, err := c.Fake.Invokes(action, &v1beta1.HorizontalPodAutoscalerList{}) + _, err := c.Fake.Invokes(action, &v1.HorizontalPodAutoscalerList{}) return err } -func (c *FakeHorizontalPodAutoscalers) Get(name string) (result *v1beta1.HorizontalPodAutoscaler, err error) { +func (c *FakeHorizontalPodAutoscalers) Get(name string) (result *v1.HorizontalPodAutoscaler, err error) { obj, err := c.Fake. - Invokes(core.NewGetAction(horizontalpodautoscalersResource, c.ns, name), &v1beta1.HorizontalPodAutoscaler{}) + Invokes(core.NewGetAction(horizontalpodautoscalersResource, c.ns, name), &v1.HorizontalPodAutoscaler{}) if obj == nil { return nil, err } - return obj.(*v1beta1.HorizontalPodAutoscaler), err + return obj.(*v1.HorizontalPodAutoscaler), err } -func (c *FakeHorizontalPodAutoscalers) List(opts api.ListOptions) (result *v1beta1.HorizontalPodAutoscalerList, err error) { +func (c *FakeHorizontalPodAutoscalers) List(opts api.ListOptions) (result *v1.HorizontalPodAutoscalerList, err error) { obj, err := c.Fake. - Invokes(core.NewListAction(horizontalpodautoscalersResource, c.ns, opts), &v1beta1.HorizontalPodAutoscalerList{}) + Invokes(core.NewListAction(horizontalpodautoscalersResource, c.ns, opts), &v1.HorizontalPodAutoscalerList{}) if obj == nil { return nil, err @@ -99,8 +99,8 @@ func (c *FakeHorizontalPodAutoscalers) List(opts api.ListOptions) (result *v1bet if label == nil { label = labels.Everything() } - list := &v1beta1.HorizontalPodAutoscalerList{} - for _, item := range obj.(*v1beta1.HorizontalPodAutoscalerList).Items { + list := &v1.HorizontalPodAutoscalerList{} + for _, item := range obj.(*v1.HorizontalPodAutoscalerList).Items { if label.Matches(labels.Set(item.Labels)) { list.Items = append(list.Items, item) } @@ -114,3 +114,14 @@ func (c *FakeHorizontalPodAutoscalers) Watch(opts api.ListOptions) (watch.Interf InvokesWatch(core.NewWatchAction(horizontalpodautoscalersResource, c.ns, opts)) } + +// Patch applies the patch and returns the patched horizontalPodAutoscaler. +func (c *FakeHorizontalPodAutoscalers) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1.HorizontalPodAutoscaler, err error) { + obj, err := c.Fake. + Invokes(core.NewPatchSubresourceAction(horizontalpodautoscalersResource, c.ns, name, data, subresources...), &v1.HorizontalPodAutoscaler{}) + + if obj == nil { + return nil, err + } + return obj.(*v1.HorizontalPodAutoscaler), err +} diff --git a/pkg/client/clientset_generated/release_1_5/typed/autoscaling/v1/generated_expansion.go b/pkg/client/clientset_generated/release_1_5/typed/autoscaling/v1/generated_expansion.go new file mode 100644 index 00000000000..3e37a64ef6f --- /dev/null +++ b/pkg/client/clientset_generated/release_1_5/typed/autoscaling/v1/generated_expansion.go @@ -0,0 +1,19 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package v1 + +type HorizontalPodAutoscalerExpansion interface{} diff --git a/pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/horizontalpodautoscaler.go b/pkg/client/clientset_generated/release_1_5/typed/autoscaling/v1/horizontalpodautoscaler.go similarity index 71% rename from pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/horizontalpodautoscaler.go rename to pkg/client/clientset_generated/release_1_5/typed/autoscaling/v1/horizontalpodautoscaler.go index 211ce0251fc..b02c566fd24 100644 --- a/pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/horizontalpodautoscaler.go +++ b/pkg/client/clientset_generated/release_1_5/typed/autoscaling/v1/horizontalpodautoscaler.go @@ -14,11 +14,11 @@ See the License for the specific language governing permissions and limitations under the License. */ -package v1beta1 +package v1 import ( api "k8s.io/kubernetes/pkg/api" - v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + v1 "k8s.io/kubernetes/pkg/apis/autoscaling/v1" watch "k8s.io/kubernetes/pkg/watch" ) @@ -30,25 +30,26 @@ type HorizontalPodAutoscalersGetter interface { // HorizontalPodAutoscalerInterface has methods to work with HorizontalPodAutoscaler resources. type HorizontalPodAutoscalerInterface interface { - Create(*v1beta1.HorizontalPodAutoscaler) (*v1beta1.HorizontalPodAutoscaler, error) - Update(*v1beta1.HorizontalPodAutoscaler) (*v1beta1.HorizontalPodAutoscaler, error) - UpdateStatus(*v1beta1.HorizontalPodAutoscaler) (*v1beta1.HorizontalPodAutoscaler, error) + Create(*v1.HorizontalPodAutoscaler) (*v1.HorizontalPodAutoscaler, error) + Update(*v1.HorizontalPodAutoscaler) (*v1.HorizontalPodAutoscaler, error) + UpdateStatus(*v1.HorizontalPodAutoscaler) (*v1.HorizontalPodAutoscaler, error) Delete(name string, options *api.DeleteOptions) error DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error - Get(name string) (*v1beta1.HorizontalPodAutoscaler, error) - List(opts api.ListOptions) (*v1beta1.HorizontalPodAutoscalerList, error) + Get(name string) (*v1.HorizontalPodAutoscaler, error) + List(opts api.ListOptions) (*v1.HorizontalPodAutoscalerList, error) Watch(opts api.ListOptions) (watch.Interface, error) + Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1.HorizontalPodAutoscaler, err error) HorizontalPodAutoscalerExpansion } // horizontalPodAutoscalers implements HorizontalPodAutoscalerInterface type horizontalPodAutoscalers struct { - client *ExtensionsClient + client *AutoscalingClient ns string } // newHorizontalPodAutoscalers returns a HorizontalPodAutoscalers -func newHorizontalPodAutoscalers(c *ExtensionsClient, namespace string) *horizontalPodAutoscalers { +func newHorizontalPodAutoscalers(c *AutoscalingClient, namespace string) *horizontalPodAutoscalers { return &horizontalPodAutoscalers{ client: c, ns: namespace, @@ -56,8 +57,8 @@ func newHorizontalPodAutoscalers(c *ExtensionsClient, namespace string) *horizon } // Create takes the representation of a horizontalPodAutoscaler and creates it. Returns the server's representation of the horizontalPodAutoscaler, and an error, if there is any. -func (c *horizontalPodAutoscalers) Create(horizontalPodAutoscaler *v1beta1.HorizontalPodAutoscaler) (result *v1beta1.HorizontalPodAutoscaler, err error) { - result = &v1beta1.HorizontalPodAutoscaler{} +func (c *horizontalPodAutoscalers) Create(horizontalPodAutoscaler *v1.HorizontalPodAutoscaler) (result *v1.HorizontalPodAutoscaler, err error) { + result = &v1.HorizontalPodAutoscaler{} err = c.client.Post(). Namespace(c.ns). Resource("horizontalpodautoscalers"). @@ -68,8 +69,8 @@ func (c *horizontalPodAutoscalers) Create(horizontalPodAutoscaler *v1beta1.Horiz } // Update takes the representation of a horizontalPodAutoscaler and updates it. Returns the server's representation of the horizontalPodAutoscaler, and an error, if there is any. -func (c *horizontalPodAutoscalers) Update(horizontalPodAutoscaler *v1beta1.HorizontalPodAutoscaler) (result *v1beta1.HorizontalPodAutoscaler, err error) { - result = &v1beta1.HorizontalPodAutoscaler{} +func (c *horizontalPodAutoscalers) Update(horizontalPodAutoscaler *v1.HorizontalPodAutoscaler) (result *v1.HorizontalPodAutoscaler, err error) { + result = &v1.HorizontalPodAutoscaler{} err = c.client.Put(). Namespace(c.ns). Resource("horizontalpodautoscalers"). @@ -80,8 +81,8 @@ func (c *horizontalPodAutoscalers) Update(horizontalPodAutoscaler *v1beta1.Horiz return } -func (c *horizontalPodAutoscalers) UpdateStatus(horizontalPodAutoscaler *v1beta1.HorizontalPodAutoscaler) (result *v1beta1.HorizontalPodAutoscaler, err error) { - result = &v1beta1.HorizontalPodAutoscaler{} +func (c *horizontalPodAutoscalers) UpdateStatus(horizontalPodAutoscaler *v1.HorizontalPodAutoscaler) (result *v1.HorizontalPodAutoscaler, err error) { + result = &v1.HorizontalPodAutoscaler{} err = c.client.Put(). Namespace(c.ns). Resource("horizontalpodautoscalers"). @@ -116,8 +117,8 @@ func (c *horizontalPodAutoscalers) DeleteCollection(options *api.DeleteOptions, } // Get takes name of the horizontalPodAutoscaler, and returns the corresponding horizontalPodAutoscaler object, and an error if there is any. -func (c *horizontalPodAutoscalers) Get(name string) (result *v1beta1.HorizontalPodAutoscaler, err error) { - result = &v1beta1.HorizontalPodAutoscaler{} +func (c *horizontalPodAutoscalers) Get(name string) (result *v1.HorizontalPodAutoscaler, err error) { + result = &v1.HorizontalPodAutoscaler{} err = c.client.Get(). Namespace(c.ns). Resource("horizontalpodautoscalers"). @@ -128,8 +129,8 @@ func (c *horizontalPodAutoscalers) Get(name string) (result *v1beta1.HorizontalP } // List takes label and field selectors, and returns the list of HorizontalPodAutoscalers that match those selectors. -func (c *horizontalPodAutoscalers) List(opts api.ListOptions) (result *v1beta1.HorizontalPodAutoscalerList, err error) { - result = &v1beta1.HorizontalPodAutoscalerList{} +func (c *horizontalPodAutoscalers) List(opts api.ListOptions) (result *v1.HorizontalPodAutoscalerList, err error) { + result = &v1.HorizontalPodAutoscalerList{} err = c.client.Get(). Namespace(c.ns). Resource("horizontalpodautoscalers"). @@ -148,3 +149,17 @@ func (c *horizontalPodAutoscalers) Watch(opts api.ListOptions) (watch.Interface, VersionedParams(&opts, api.ParameterCodec). Watch() } + +// Patch applies the patch and returns the patched horizontalPodAutoscaler. +func (c *horizontalPodAutoscalers) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1.HorizontalPodAutoscaler, err error) { + result = &v1.HorizontalPodAutoscaler{} + err = c.client.Patch(pt). + Namespace(c.ns). + Resource("horizontalpodautoscalers"). + SubResource(subresources...). + Name(name). + Body(data). + Do(). + Into(result) + return +} diff --git a/pkg/client/clientset_generated/release_1_5/typed/batch/v1/batch_client.go b/pkg/client/clientset_generated/release_1_5/typed/batch/v1/batch_client.go new file mode 100644 index 00000000000..46e4d518f8e --- /dev/null +++ b/pkg/client/clientset_generated/release_1_5/typed/batch/v1/batch_client.go @@ -0,0 +1,96 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package v1 + +import ( + api "k8s.io/kubernetes/pkg/api" + registered "k8s.io/kubernetes/pkg/apimachinery/registered" + restclient "k8s.io/kubernetes/pkg/client/restclient" + serializer "k8s.io/kubernetes/pkg/runtime/serializer" +) + +type BatchInterface interface { + GetRESTClient() *restclient.RESTClient + JobsGetter +} + +// BatchClient is used to interact with features provided by the Batch group. +type BatchClient struct { + *restclient.RESTClient +} + +func (c *BatchClient) Jobs(namespace string) JobInterface { + return newJobs(c, namespace) +} + +// NewForConfig creates a new BatchClient for the given config. +func NewForConfig(c *restclient.Config) (*BatchClient, error) { + config := *c + if err := setConfigDefaults(&config); err != nil { + return nil, err + } + client, err := restclient.RESTClientFor(&config) + if err != nil { + return nil, err + } + return &BatchClient{client}, nil +} + +// NewForConfigOrDie creates a new BatchClient for the given config and +// panics if there is an error in the config. +func NewForConfigOrDie(c *restclient.Config) *BatchClient { + client, err := NewForConfig(c) + if err != nil { + panic(err) + } + return client +} + +// New creates a new BatchClient for the given RESTClient. +func New(c *restclient.RESTClient) *BatchClient { + return &BatchClient{c} +} + +func setConfigDefaults(config *restclient.Config) error { + // if batch group is not registered, return an error + g, err := registered.Group("batch") + if err != nil { + return err + } + config.APIPath = "/apis" + if config.UserAgent == "" { + config.UserAgent = restclient.DefaultKubernetesUserAgent() + } + // TODO: Unconditionally set the config.Version, until we fix the config. + //if config.Version == "" { + copyGroupVersion := g.GroupVersion + config.GroupVersion = ©GroupVersion + //} + + config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: api.Codecs} + + return nil +} + +// GetRESTClient returns a RESTClient that is used to communicate +// with API server by this client implementation. +func (c *BatchClient) GetRESTClient() *restclient.RESTClient { + if c == nil { + return nil + } + return c.RESTClient +} diff --git a/pkg/client/clientset_generated/release_1_5/typed/batch/v1/doc.go b/pkg/client/clientset_generated/release_1_5/typed/batch/v1/doc.go new file mode 100644 index 00000000000..20aab35ab22 --- /dev/null +++ b/pkg/client/clientset_generated/release_1_5/typed/batch/v1/doc.go @@ -0,0 +1,20 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,authorization/v1beta1,autoscaling/v1,batch/v1,extensions/v1beta1,policy/v1alpha1] + +// This package has the automatically generated typed clients. +package v1 diff --git a/pkg/client/clientset_generated/release_1_5/typed/batch/v1/fake/doc.go b/pkg/client/clientset_generated/release_1_5/typed/batch/v1/fake/doc.go new file mode 100644 index 00000000000..793bddf23ce --- /dev/null +++ b/pkg/client/clientset_generated/release_1_5/typed/batch/v1/fake/doc.go @@ -0,0 +1,20 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,authorization/v1beta1,autoscaling/v1,batch/v1,extensions/v1beta1,policy/v1alpha1] + +// Package fake has the automatically generated clients. +package fake diff --git a/pkg/client/clientset_generated/release_1_5/typed/batch/v1/fake/fake_batch_client.go b/pkg/client/clientset_generated/release_1_5/typed/batch/v1/fake/fake_batch_client.go new file mode 100644 index 00000000000..72aeb6df32f --- /dev/null +++ b/pkg/client/clientset_generated/release_1_5/typed/batch/v1/fake/fake_batch_client.go @@ -0,0 +1,37 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package fake + +import ( + v1 "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/batch/v1" + restclient "k8s.io/kubernetes/pkg/client/restclient" + core "k8s.io/kubernetes/pkg/client/testing/core" +) + +type FakeBatch struct { + *core.Fake +} + +func (c *FakeBatch) Jobs(namespace string) v1.JobInterface { + return &FakeJobs{c, namespace} +} + +// GetRESTClient returns a RESTClient that is used to communicate +// with API server by this client implementation. +func (c *FakeBatch) GetRESTClient() *restclient.RESTClient { + return nil +} diff --git a/pkg/client/clientset_generated/release_1_5/typed/batch/v1/fake/fake_job.go b/pkg/client/clientset_generated/release_1_5/typed/batch/v1/fake/fake_job.go new file mode 100644 index 00000000000..49a88727aeb --- /dev/null +++ b/pkg/client/clientset_generated/release_1_5/typed/batch/v1/fake/fake_job.go @@ -0,0 +1,127 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package fake + +import ( + api "k8s.io/kubernetes/pkg/api" + unversioned "k8s.io/kubernetes/pkg/api/unversioned" + v1 "k8s.io/kubernetes/pkg/apis/batch/v1" + core "k8s.io/kubernetes/pkg/client/testing/core" + labels "k8s.io/kubernetes/pkg/labels" + watch "k8s.io/kubernetes/pkg/watch" +) + +// FakeJobs implements JobInterface +type FakeJobs struct { + Fake *FakeBatch + ns string +} + +var jobsResource = unversioned.GroupVersionResource{Group: "batch", Version: "v1", Resource: "jobs"} + +func (c *FakeJobs) Create(job *v1.Job) (result *v1.Job, err error) { + obj, err := c.Fake. + Invokes(core.NewCreateAction(jobsResource, c.ns, job), &v1.Job{}) + + if obj == nil { + return nil, err + } + return obj.(*v1.Job), err +} + +func (c *FakeJobs) Update(job *v1.Job) (result *v1.Job, err error) { + obj, err := c.Fake. + Invokes(core.NewUpdateAction(jobsResource, c.ns, job), &v1.Job{}) + + if obj == nil { + return nil, err + } + return obj.(*v1.Job), err +} + +func (c *FakeJobs) UpdateStatus(job *v1.Job) (*v1.Job, error) { + obj, err := c.Fake. + Invokes(core.NewUpdateSubresourceAction(jobsResource, "status", c.ns, job), &v1.Job{}) + + if obj == nil { + return nil, err + } + return obj.(*v1.Job), err +} + +func (c *FakeJobs) Delete(name string, options *api.DeleteOptions) error { + _, err := c.Fake. + Invokes(core.NewDeleteAction(jobsResource, c.ns, name), &v1.Job{}) + + return err +} + +func (c *FakeJobs) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error { + action := core.NewDeleteCollectionAction(jobsResource, c.ns, listOptions) + + _, err := c.Fake.Invokes(action, &v1.JobList{}) + return err +} + +func (c *FakeJobs) Get(name string) (result *v1.Job, err error) { + obj, err := c.Fake. + Invokes(core.NewGetAction(jobsResource, c.ns, name), &v1.Job{}) + + if obj == nil { + return nil, err + } + return obj.(*v1.Job), err +} + +func (c *FakeJobs) List(opts api.ListOptions) (result *v1.JobList, err error) { + obj, err := c.Fake. + Invokes(core.NewListAction(jobsResource, c.ns, opts), &v1.JobList{}) + + if obj == nil { + return nil, err + } + + label := opts.LabelSelector + if label == nil { + label = labels.Everything() + } + list := &v1.JobList{} + for _, item := range obj.(*v1.JobList).Items { + if label.Matches(labels.Set(item.Labels)) { + list.Items = append(list.Items, item) + } + } + return list, err +} + +// Watch returns a watch.Interface that watches the requested jobs. +func (c *FakeJobs) Watch(opts api.ListOptions) (watch.Interface, error) { + return c.Fake. + InvokesWatch(core.NewWatchAction(jobsResource, c.ns, opts)) + +} + +// Patch applies the patch and returns the patched job. +func (c *FakeJobs) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1.Job, err error) { + obj, err := c.Fake. + Invokes(core.NewPatchSubresourceAction(jobsResource, c.ns, name, data, subresources...), &v1.Job{}) + + if obj == nil { + return nil, err + } + return obj.(*v1.Job), err +} diff --git a/pkg/client/clientset_generated/release_1_5/typed/batch/v1/generated_expansion.go b/pkg/client/clientset_generated/release_1_5/typed/batch/v1/generated_expansion.go new file mode 100644 index 00000000000..b24faa3157a --- /dev/null +++ b/pkg/client/clientset_generated/release_1_5/typed/batch/v1/generated_expansion.go @@ -0,0 +1,19 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package v1 + +type JobExpansion interface{} diff --git a/pkg/client/clientset_generated/release_1_5/typed/batch/v1/job.go b/pkg/client/clientset_generated/release_1_5/typed/batch/v1/job.go new file mode 100644 index 00000000000..45b9a9c2a9b --- /dev/null +++ b/pkg/client/clientset_generated/release_1_5/typed/batch/v1/job.go @@ -0,0 +1,165 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package v1 + +import ( + api "k8s.io/kubernetes/pkg/api" + v1 "k8s.io/kubernetes/pkg/apis/batch/v1" + watch "k8s.io/kubernetes/pkg/watch" +) + +// JobsGetter has a method to return a JobInterface. +// A group's client should implement this interface. +type JobsGetter interface { + Jobs(namespace string) JobInterface +} + +// JobInterface has methods to work with Job resources. +type JobInterface interface { + Create(*v1.Job) (*v1.Job, error) + Update(*v1.Job) (*v1.Job, error) + UpdateStatus(*v1.Job) (*v1.Job, error) + Delete(name string, options *api.DeleteOptions) error + DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error + Get(name string) (*v1.Job, error) + List(opts api.ListOptions) (*v1.JobList, error) + Watch(opts api.ListOptions) (watch.Interface, error) + Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1.Job, err error) + JobExpansion +} + +// jobs implements JobInterface +type jobs struct { + client *BatchClient + ns string +} + +// newJobs returns a Jobs +func newJobs(c *BatchClient, namespace string) *jobs { + return &jobs{ + client: c, + ns: namespace, + } +} + +// Create takes the representation of a job and creates it. Returns the server's representation of the job, and an error, if there is any. +func (c *jobs) Create(job *v1.Job) (result *v1.Job, err error) { + result = &v1.Job{} + err = c.client.Post(). + Namespace(c.ns). + Resource("jobs"). + Body(job). + Do(). + Into(result) + return +} + +// Update takes the representation of a job and updates it. Returns the server's representation of the job, and an error, if there is any. +func (c *jobs) Update(job *v1.Job) (result *v1.Job, err error) { + result = &v1.Job{} + err = c.client.Put(). + Namespace(c.ns). + Resource("jobs"). + Name(job.Name). + Body(job). + Do(). + Into(result) + return +} + +func (c *jobs) UpdateStatus(job *v1.Job) (result *v1.Job, err error) { + result = &v1.Job{} + err = c.client.Put(). + Namespace(c.ns). + Resource("jobs"). + Name(job.Name). + SubResource("status"). + Body(job). + Do(). + Into(result) + return +} + +// Delete takes name of the job and deletes it. Returns an error if one occurs. +func (c *jobs) Delete(name string, options *api.DeleteOptions) error { + return c.client.Delete(). + Namespace(c.ns). + Resource("jobs"). + Name(name). + Body(options). + Do(). + Error() +} + +// DeleteCollection deletes a collection of objects. +func (c *jobs) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error { + return c.client.Delete(). + Namespace(c.ns). + Resource("jobs"). + VersionedParams(&listOptions, api.ParameterCodec). + Body(options). + Do(). + Error() +} + +// 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) (result *v1.Job, err error) { + result = &v1.Job{} + err = c.client.Get(). + Namespace(c.ns). + Resource("jobs"). + Name(name). + Do(). + Into(result) + return +} + +// List takes label and field selectors, and returns the list of Jobs that match those selectors. +func (c *jobs) List(opts api.ListOptions) (result *v1.JobList, err error) { + result = &v1.JobList{} + err = c.client.Get(). + Namespace(c.ns). + Resource("jobs"). + VersionedParams(&opts, api.ParameterCodec). + Do(). + Into(result) + return +} + +// Watch returns a watch.Interface that watches the requested jobs. +func (c *jobs) Watch(opts api.ListOptions) (watch.Interface, error) { + return c.client.Get(). + Prefix("watch"). + Namespace(c.ns). + Resource("jobs"). + VersionedParams(&opts, api.ParameterCodec). + Watch() +} + +// Patch applies the patch and returns the patched job. +func (c *jobs) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1.Job, err error) { + result = &v1.Job{} + err = c.client.Patch(pt). + Namespace(c.ns). + Resource("jobs"). + SubResource(subresources...). + Name(name). + Body(data). + Do(). + Into(result) + return +} diff --git a/pkg/client/clientset_generated/release_1_2/typed/core/v1/componentstatus.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/componentstatus.go similarity index 89% rename from pkg/client/clientset_generated/release_1_2/typed/core/v1/componentstatus.go rename to pkg/client/clientset_generated/release_1_5/typed/core/v1/componentstatus.go index c7e67cd53fc..26aac291959 100644 --- a/pkg/client/clientset_generated/release_1_2/typed/core/v1/componentstatus.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/componentstatus.go @@ -37,6 +37,7 @@ type ComponentStatusInterface interface { Get(name string) (*v1.ComponentStatus, error) List(opts api.ListOptions) (*v1.ComponentStatusList, error) Watch(opts api.ListOptions) (watch.Interface, error) + Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1.ComponentStatus, err error) ComponentStatusExpansion } @@ -125,3 +126,16 @@ func (c *componentStatuses) Watch(opts api.ListOptions) (watch.Interface, error) VersionedParams(&opts, api.ParameterCodec). Watch() } + +// Patch applies the patch and returns the patched componentStatus. +func (c *componentStatuses) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1.ComponentStatus, err error) { + result = &v1.ComponentStatus{} + err = c.client.Patch(pt). + Resource("componentstatuses"). + SubResource(subresources...). + Name(name). + Body(data). + Do(). + Into(result) + return +} diff --git a/pkg/client/clientset_generated/release_1_2/typed/core/v1/configmap.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/configmap.go similarity index 89% rename from pkg/client/clientset_generated/release_1_2/typed/core/v1/configmap.go rename to pkg/client/clientset_generated/release_1_5/typed/core/v1/configmap.go index 88cc926700a..d66129f6928 100644 --- a/pkg/client/clientset_generated/release_1_2/typed/core/v1/configmap.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/configmap.go @@ -37,6 +37,7 @@ type ConfigMapInterface interface { Get(name string) (*v1.ConfigMap, error) List(opts api.ListOptions) (*v1.ConfigMapList, error) Watch(opts api.ListOptions) (watch.Interface, error) + Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1.ConfigMap, err error) ConfigMapExpansion } @@ -134,3 +135,17 @@ func (c *configMaps) Watch(opts api.ListOptions) (watch.Interface, error) { VersionedParams(&opts, api.ParameterCodec). Watch() } + +// Patch applies the patch and returns the patched configMap. +func (c *configMaps) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1.ConfigMap, err error) { + result = &v1.ConfigMap{} + err = c.client.Patch(pt). + Namespace(c.ns). + Resource("configmaps"). + SubResource(subresources...). + Name(name). + Body(data). + Do(). + Into(result) + return +} diff --git a/pkg/client/clientset_generated/release_1_2/typed/core/v1/core_client.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/core_client.go similarity index 87% rename from pkg/client/clientset_generated/release_1_2/typed/core/v1/core_client.go rename to pkg/client/clientset_generated/release_1_5/typed/core/v1/core_client.go index 72d0a45b818..a36e2b1d535 100644 --- a/pkg/client/clientset_generated/release_1_2/typed/core/v1/core_client.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/core_client.go @@ -20,9 +20,11 @@ import ( api "k8s.io/kubernetes/pkg/api" registered "k8s.io/kubernetes/pkg/apimachinery/registered" restclient "k8s.io/kubernetes/pkg/client/restclient" + serializer "k8s.io/kubernetes/pkg/runtime/serializer" ) type CoreInterface interface { + GetRESTClient() *restclient.RESTClient ComponentStatusesGetter ConfigMapsGetter EndpointsGetter @@ -31,6 +33,7 @@ type CoreInterface interface { NamespacesGetter NodesGetter PersistentVolumesGetter + PersistentVolumeClaimsGetter PodsGetter PodTemplatesGetter ReplicationControllersGetter @@ -77,6 +80,10 @@ func (c *CoreClient) PersistentVolumes() PersistentVolumeInterface { return newPersistentVolumes(c) } +func (c *CoreClient) PersistentVolumeClaims(namespace string) PersistentVolumeClaimInterface { + return newPersistentVolumeClaims(c, namespace) +} + func (c *CoreClient) Pods(namespace string) PodInterface { return newPods(c, namespace) } @@ -149,13 +156,16 @@ func setConfigDefaults(config *restclient.Config) error { config.GroupVersion = ©GroupVersion //} - config.NegotiatedSerializer = api.Codecs + config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: api.Codecs} - if config.QPS == 0 { - config.QPS = 5 - } - if config.Burst == 0 { - config.Burst = 10 - } return nil } + +// GetRESTClient returns a RESTClient that is used to communicate +// with API server by this client implementation. +func (c *CoreClient) GetRESTClient() *restclient.RESTClient { + if c == nil { + return nil + } + return c.RESTClient +} diff --git a/pkg/client/clientset_generated/release_1_5/typed/core/v1/doc.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/doc.go new file mode 100644 index 00000000000..20aab35ab22 --- /dev/null +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/doc.go @@ -0,0 +1,20 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,authorization/v1beta1,autoscaling/v1,batch/v1,extensions/v1beta1,policy/v1alpha1] + +// This package has the automatically generated typed clients. +package v1 diff --git a/pkg/client/clientset_generated/release_1_2/typed/core/v1/endpoints.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/endpoints.go similarity index 89% rename from pkg/client/clientset_generated/release_1_2/typed/core/v1/endpoints.go rename to pkg/client/clientset_generated/release_1_5/typed/core/v1/endpoints.go index 66bb2cacb36..e83f168f8e9 100644 --- a/pkg/client/clientset_generated/release_1_2/typed/core/v1/endpoints.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/endpoints.go @@ -37,6 +37,7 @@ type EndpointsInterface interface { Get(name string) (*v1.Endpoints, error) List(opts api.ListOptions) (*v1.EndpointsList, error) Watch(opts api.ListOptions) (watch.Interface, error) + Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1.Endpoints, err error) EndpointsExpansion } @@ -134,3 +135,17 @@ func (c *endpoints) Watch(opts api.ListOptions) (watch.Interface, error) { VersionedParams(&opts, api.ParameterCodec). Watch() } + +// Patch applies the patch and returns the patched endpoints. +func (c *endpoints) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1.Endpoints, err error) { + result = &v1.Endpoints{} + err = c.client.Patch(pt). + Namespace(c.ns). + Resource("endpoints"). + SubResource(subresources...). + Name(name). + Body(data). + Do(). + Into(result) + return +} diff --git a/pkg/client/clientset_generated/release_1_5/typed/core/v1/event.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/event.go new file mode 100644 index 00000000000..da1de00ac06 --- /dev/null +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/event.go @@ -0,0 +1,151 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package v1 + +import ( + api "k8s.io/kubernetes/pkg/api" + v1 "k8s.io/kubernetes/pkg/api/v1" + watch "k8s.io/kubernetes/pkg/watch" +) + +// EventsGetter has a method to return a EventInterface. +// A group's client should implement this interface. +type EventsGetter interface { + Events(namespace string) EventInterface +} + +// EventInterface has methods to work with Event resources. +type EventInterface interface { + Create(*v1.Event) (*v1.Event, error) + Update(*v1.Event) (*v1.Event, error) + Delete(name string, options *api.DeleteOptions) error + DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error + Get(name string) (*v1.Event, error) + List(opts api.ListOptions) (*v1.EventList, error) + Watch(opts api.ListOptions) (watch.Interface, error) + Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1.Event, err error) + EventExpansion +} + +// events implements EventInterface +type events struct { + client *CoreClient + ns string +} + +// newEvents returns a Events +func newEvents(c *CoreClient, namespace string) *events { + return &events{ + client: c, + ns: namespace, + } +} + +// Create takes the representation of a event and creates it. Returns the server's representation of the event, and an error, if there is any. +func (c *events) Create(event *v1.Event) (result *v1.Event, err error) { + result = &v1.Event{} + err = c.client.Post(). + Namespace(c.ns). + Resource("events"). + Body(event). + Do(). + Into(result) + return +} + +// Update takes the representation of a event and updates it. Returns the server's representation of the event, and an error, if there is any. +func (c *events) Update(event *v1.Event) (result *v1.Event, err error) { + result = &v1.Event{} + err = c.client.Put(). + Namespace(c.ns). + Resource("events"). + Name(event.Name). + Body(event). + Do(). + Into(result) + return +} + +// Delete takes name of the event and deletes it. Returns an error if one occurs. +func (c *events) Delete(name string, options *api.DeleteOptions) error { + return c.client.Delete(). + Namespace(c.ns). + Resource("events"). + Name(name). + Body(options). + Do(). + Error() +} + +// DeleteCollection deletes a collection of objects. +func (c *events) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error { + return c.client.Delete(). + Namespace(c.ns). + Resource("events"). + VersionedParams(&listOptions, api.ParameterCodec). + Body(options). + Do(). + Error() +} + +// Get takes name of the event, and returns the corresponding event object, and an error if there is any. +func (c *events) Get(name string) (result *v1.Event, err error) { + result = &v1.Event{} + err = c.client.Get(). + Namespace(c.ns). + Resource("events"). + Name(name). + Do(). + Into(result) + return +} + +// List takes label and field selectors, and returns the list of Events that match those selectors. +func (c *events) List(opts api.ListOptions) (result *v1.EventList, err error) { + result = &v1.EventList{} + err = c.client.Get(). + Namespace(c.ns). + Resource("events"). + VersionedParams(&opts, api.ParameterCodec). + Do(). + Into(result) + return +} + +// Watch returns a watch.Interface that watches the requested events. +func (c *events) Watch(opts api.ListOptions) (watch.Interface, error) { + return c.client.Get(). + Prefix("watch"). + Namespace(c.ns). + Resource("events"). + VersionedParams(&opts, api.ParameterCodec). + Watch() +} + +// Patch applies the patch and returns the patched event. +func (c *events) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1.Event, err error) { + result = &v1.Event{} + err = c.client.Patch(pt). + Namespace(c.ns). + Resource("events"). + SubResource(subresources...). + Name(name). + Body(data). + Do(). + Into(result) + return +} diff --git a/pkg/client/clientset_generated/release_1_2/typed/core/v1/event_expansion.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/event_expansion.go similarity index 88% rename from pkg/client/clientset_generated/release_1_2/typed/core/v1/event_expansion.go rename to pkg/client/clientset_generated/release_1_5/typed/core/v1/event_expansion.go index ec2ba42af14..f9769defcf0 100644 --- a/pkg/client/clientset_generated/release_1_2/typed/core/v1/event_expansion.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/event_expansion.go @@ -31,7 +31,7 @@ type EventExpansion interface { CreateWithEventNamespace(event *v1.Event) (*v1.Event, error) // UpdateWithEventNamespace is the same as a Update, except that it sends the request to the event.Namespace. UpdateWithEventNamespace(event *v1.Event) (*v1.Event, error) - Patch(event *v1.Event, data []byte) (*v1.Event, error) + PatchWithEventNamespace(event *v1.Event, data []byte) (*v1.Event, error) // Search finds events about the specified object Search(objOrRef runtime.Object) (*v1.EventList, error) // Returns the appropriate field selector based on the API version being used to communicate with the server. @@ -74,11 +74,15 @@ func (e *events) UpdateWithEventNamespace(event *v1.Event) (*v1.Event, error) { return result, err } -// Patch modifies an existing event. It returns the copy of the event that the server returns, or an -// error. The namespace and name of the target event is deduced from the incompleteEvent. The -// namespace must either match this event client's namespace, or this event client must have been +// PatchWithEventNamespace modifies an existing event. It returns the copy of +// the event that the server returns, or an error. The namespace and name of the +// target event is deduced from the incompleteEvent. The namespace must either +// match this event client's namespace, or this event client must have been // created with the "" namespace. -func (e *events) Patch(incompleteEvent *v1.Event, data []byte) (*v1.Event, error) { +func (e *events) PatchWithEventNamespace(incompleteEvent *v1.Event, data []byte) (*v1.Event, error) { + if e.ns != "" && incompleteEvent.Namespace != e.ns { + return nil, fmt.Errorf("can't patch an event with namespace '%v' in namespace '%v'", incompleteEvent.Namespace, e.ns) + } result := &v1.Event{} err := e.client.Patch(api.StrategicMergePatchType). NamespaceIfScoped(incompleteEvent.Namespace, len(incompleteEvent.Namespace) > 0). @@ -154,5 +158,5 @@ func (e *EventSinkImpl) Update(event *v1.Event) (*v1.Event, error) { } func (e *EventSinkImpl) Patch(event *v1.Event, data []byte) (*v1.Event, error) { - return e.Interface.Patch(event, data) + return e.Interface.PatchWithEventNamespace(event, data) } diff --git a/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/doc.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/doc.go new file mode 100644 index 00000000000..793bddf23ce --- /dev/null +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/doc.go @@ -0,0 +1,20 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,authorization/v1beta1,autoscaling/v1,batch/v1,extensions/v1beta1,policy/v1alpha1] + +// Package fake has the automatically generated clients. +package fake diff --git a/pkg/client/clientset_generated/release_1_2/typed/core/v1/fake/fake_componentstatus.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_componentstatus.go similarity index 88% rename from pkg/client/clientset_generated/release_1_2/typed/core/v1/fake/fake_componentstatus.go rename to pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_componentstatus.go index bc4feb381bd..b33b61f5aa3 100644 --- a/pkg/client/clientset_generated/release_1_2/typed/core/v1/fake/fake_componentstatus.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_componentstatus.go @@ -97,3 +97,13 @@ func (c *FakeComponentStatuses) Watch(opts api.ListOptions) (watch.Interface, er return c.Fake. InvokesWatch(core.NewRootWatchAction(componentstatusesResource, opts)) } + +// Patch applies the patch and returns the patched componentStatus. +func (c *FakeComponentStatuses) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1.ComponentStatus, err error) { + obj, err := c.Fake. + Invokes(core.NewRootPatchSubresourceAction(componentstatusesResource, name, data, subresources...), &v1.ComponentStatus{}) + if obj == nil { + return nil, err + } + return obj.(*v1.ComponentStatus), err +} diff --git a/pkg/client/clientset_generated/release_1_2/typed/core/v1/fake/fake_configmap.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_configmap.go similarity index 88% rename from pkg/client/clientset_generated/release_1_2/typed/core/v1/fake/fake_configmap.go rename to pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_configmap.go index e6bcef907e1..f8300e56345 100644 --- a/pkg/client/clientset_generated/release_1_2/typed/core/v1/fake/fake_configmap.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_configmap.go @@ -104,3 +104,14 @@ func (c *FakeConfigMaps) Watch(opts api.ListOptions) (watch.Interface, error) { InvokesWatch(core.NewWatchAction(configmapsResource, c.ns, opts)) } + +// Patch applies the patch and returns the patched configMap. +func (c *FakeConfigMaps) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1.ConfigMap, err error) { + obj, err := c.Fake. + Invokes(core.NewPatchSubresourceAction(configmapsResource, c.ns, name, data, subresources...), &v1.ConfigMap{}) + + if obj == nil { + return nil, err + } + return obj.(*v1.ConfigMap), err +} diff --git a/pkg/client/clientset_generated/release_1_2/typed/core/v1/fake/fake_core_client.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_core_client.go similarity index 85% rename from pkg/client/clientset_generated/release_1_2/typed/core/v1/fake/fake_core_client.go rename to pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_core_client.go index acb89b67fc1..109d2a04a9e 100644 --- a/pkg/client/clientset_generated/release_1_2/typed/core/v1/fake/fake_core_client.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_core_client.go @@ -17,7 +17,8 @@ limitations under the License. package fake import ( - v1 "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2/typed/core/v1" + v1 "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/core/v1" + restclient "k8s.io/kubernetes/pkg/client/restclient" core "k8s.io/kubernetes/pkg/client/testing/core" ) @@ -57,6 +58,10 @@ func (c *FakeCore) PersistentVolumes() v1.PersistentVolumeInterface { return &FakePersistentVolumes{c} } +func (c *FakeCore) PersistentVolumeClaims(namespace string) v1.PersistentVolumeClaimInterface { + return &FakePersistentVolumeClaims{c, namespace} +} + func (c *FakeCore) Pods(namespace string) v1.PodInterface { return &FakePods{c, namespace} } @@ -84,3 +89,9 @@ func (c *FakeCore) Services(namespace string) v1.ServiceInterface { func (c *FakeCore) ServiceAccounts(namespace string) v1.ServiceAccountInterface { return &FakeServiceAccounts{c, namespace} } + +// GetRESTClient returns a RESTClient that is used to communicate +// with API server by this client implementation. +func (c *FakeCore) GetRESTClient() *restclient.RESTClient { + return nil +} diff --git a/pkg/client/clientset_generated/release_1_2/typed/core/v1/fake/fake_endpoints.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_endpoints.go similarity index 88% rename from pkg/client/clientset_generated/release_1_2/typed/core/v1/fake/fake_endpoints.go rename to pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_endpoints.go index 6d0cde3d7a6..b0637ec951e 100644 --- a/pkg/client/clientset_generated/release_1_2/typed/core/v1/fake/fake_endpoints.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_endpoints.go @@ -104,3 +104,14 @@ func (c *FakeEndpoints) Watch(opts api.ListOptions) (watch.Interface, error) { InvokesWatch(core.NewWatchAction(endpointsResource, c.ns, opts)) } + +// Patch applies the patch and returns the patched endpoints. +func (c *FakeEndpoints) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1.Endpoints, err error) { + obj, err := c.Fake. + Invokes(core.NewPatchSubresourceAction(endpointsResource, c.ns, name, data, subresources...), &v1.Endpoints{}) + + if obj == nil { + return nil, err + } + return obj.(*v1.Endpoints), err +} diff --git a/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_event.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_event.go new file mode 100644 index 00000000000..6744dd3c325 --- /dev/null +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_event.go @@ -0,0 +1,117 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package fake + +import ( + api "k8s.io/kubernetes/pkg/api" + unversioned "k8s.io/kubernetes/pkg/api/unversioned" + v1 "k8s.io/kubernetes/pkg/api/v1" + core "k8s.io/kubernetes/pkg/client/testing/core" + labels "k8s.io/kubernetes/pkg/labels" + watch "k8s.io/kubernetes/pkg/watch" +) + +// FakeEvents implements EventInterface +type FakeEvents struct { + Fake *FakeCore + ns string +} + +var eventsResource = unversioned.GroupVersionResource{Group: "", Version: "v1", Resource: "events"} + +func (c *FakeEvents) Create(event *v1.Event) (result *v1.Event, err error) { + obj, err := c.Fake. + Invokes(core.NewCreateAction(eventsResource, c.ns, event), &v1.Event{}) + + if obj == nil { + return nil, err + } + return obj.(*v1.Event), err +} + +func (c *FakeEvents) Update(event *v1.Event) (result *v1.Event, err error) { + obj, err := c.Fake. + Invokes(core.NewUpdateAction(eventsResource, c.ns, event), &v1.Event{}) + + if obj == nil { + return nil, err + } + return obj.(*v1.Event), err +} + +func (c *FakeEvents) Delete(name string, options *api.DeleteOptions) error { + _, err := c.Fake. + Invokes(core.NewDeleteAction(eventsResource, c.ns, name), &v1.Event{}) + + return err +} + +func (c *FakeEvents) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error { + action := core.NewDeleteCollectionAction(eventsResource, c.ns, listOptions) + + _, err := c.Fake.Invokes(action, &v1.EventList{}) + return err +} + +func (c *FakeEvents) Get(name string) (result *v1.Event, err error) { + obj, err := c.Fake. + Invokes(core.NewGetAction(eventsResource, c.ns, name), &v1.Event{}) + + if obj == nil { + return nil, err + } + return obj.(*v1.Event), err +} + +func (c *FakeEvents) List(opts api.ListOptions) (result *v1.EventList, err error) { + obj, err := c.Fake. + Invokes(core.NewListAction(eventsResource, c.ns, opts), &v1.EventList{}) + + if obj == nil { + return nil, err + } + + label := opts.LabelSelector + if label == nil { + label = labels.Everything() + } + list := &v1.EventList{} + for _, item := range obj.(*v1.EventList).Items { + if label.Matches(labels.Set(item.Labels)) { + list.Items = append(list.Items, item) + } + } + return list, err +} + +// Watch returns a watch.Interface that watches the requested events. +func (c *FakeEvents) Watch(opts api.ListOptions) (watch.Interface, error) { + return c.Fake. + InvokesWatch(core.NewWatchAction(eventsResource, c.ns, opts)) + +} + +// Patch applies the patch and returns the patched event. +func (c *FakeEvents) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1.Event, err error) { + obj, err := c.Fake. + Invokes(core.NewPatchSubresourceAction(eventsResource, c.ns, name, data, subresources...), &v1.Event{}) + + if obj == nil { + return nil, err + } + return obj.(*v1.Event), err +} diff --git a/pkg/client/clientset_generated/release_1_2/typed/core/v1/fake/fake_event_expansion.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_event_expansion.go similarity index 87% rename from pkg/client/clientset_generated/release_1_2/typed/core/v1/fake/fake_event_expansion.go rename to pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_event_expansion.go index dc216bccc87..a004bed7f69 100644 --- a/pkg/client/clientset_generated/release_1_2/typed/core/v1/fake/fake_event_expansion.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_event_expansion.go @@ -51,11 +51,11 @@ func (c *FakeEvents) UpdateWithEventNamespace(event *v1.Event) (*v1.Event, error return obj.(*v1.Event), err } -// Patch patches an existing event. Returns the copy of the event the server returns, or an error. -func (c *FakeEvents) Patch(event *v1.Event, data []byte) (*v1.Event, error) { - action := core.NewRootPatchAction(eventsResource, event) +// PatchWithEventNamespace patches an existing event. Returns the copy of the event the server returns, or an error. +func (c *FakeEvents) PatchWithEventNamespace(event *v1.Event, data []byte) (*v1.Event, error) { + action := core.NewRootPatchAction(eventsResource, event.Name, data) if c.ns != "" { - action = core.NewPatchAction(eventsResource, c.ns, event) + action = core.NewPatchAction(eventsResource, c.ns, event.Name, data) } obj, err := c.Fake.Invokes(action, event) if obj == nil { diff --git a/pkg/client/clientset_generated/release_1_2/typed/core/v1/fake/fake_limitrange.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_limitrange.go similarity index 88% rename from pkg/client/clientset_generated/release_1_2/typed/core/v1/fake/fake_limitrange.go rename to pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_limitrange.go index 7742733e835..f7ee13cb0ca 100644 --- a/pkg/client/clientset_generated/release_1_2/typed/core/v1/fake/fake_limitrange.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_limitrange.go @@ -104,3 +104,14 @@ func (c *FakeLimitRanges) Watch(opts api.ListOptions) (watch.Interface, error) { InvokesWatch(core.NewWatchAction(limitrangesResource, c.ns, opts)) } + +// Patch applies the patch and returns the patched limitRange. +func (c *FakeLimitRanges) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1.LimitRange, err error) { + obj, err := c.Fake. + Invokes(core.NewPatchSubresourceAction(limitrangesResource, c.ns, name, data, subresources...), &v1.LimitRange{}) + + if obj == nil { + return nil, err + } + return obj.(*v1.LimitRange), err +} diff --git a/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_namespace.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_namespace.go new file mode 100644 index 00000000000..a351227dc17 --- /dev/null +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_namespace.go @@ -0,0 +1,118 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package fake + +import ( + api "k8s.io/kubernetes/pkg/api" + unversioned "k8s.io/kubernetes/pkg/api/unversioned" + v1 "k8s.io/kubernetes/pkg/api/v1" + core "k8s.io/kubernetes/pkg/client/testing/core" + labels "k8s.io/kubernetes/pkg/labels" + watch "k8s.io/kubernetes/pkg/watch" +) + +// FakeNamespaces implements NamespaceInterface +type FakeNamespaces struct { + Fake *FakeCore +} + +var namespacesResource = unversioned.GroupVersionResource{Group: "", Version: "v1", Resource: "namespaces"} + +func (c *FakeNamespaces) Create(namespace *v1.Namespace) (result *v1.Namespace, err error) { + obj, err := c.Fake. + Invokes(core.NewRootCreateAction(namespacesResource, namespace), &v1.Namespace{}) + if obj == nil { + return nil, err + } + return obj.(*v1.Namespace), err +} + +func (c *FakeNamespaces) Update(namespace *v1.Namespace) (result *v1.Namespace, err error) { + obj, err := c.Fake. + Invokes(core.NewRootUpdateAction(namespacesResource, namespace), &v1.Namespace{}) + if obj == nil { + return nil, err + } + return obj.(*v1.Namespace), err +} + +func (c *FakeNamespaces) UpdateStatus(namespace *v1.Namespace) (*v1.Namespace, error) { + obj, err := c.Fake. + Invokes(core.NewRootUpdateSubresourceAction(namespacesResource, "status", namespace), &v1.Namespace{}) + if obj == nil { + return nil, err + } + return obj.(*v1.Namespace), err +} + +func (c *FakeNamespaces) Delete(name string, options *api.DeleteOptions) error { + _, err := c.Fake. + Invokes(core.NewRootDeleteAction(namespacesResource, name), &v1.Namespace{}) + return err +} + +func (c *FakeNamespaces) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error { + action := core.NewRootDeleteCollectionAction(namespacesResource, listOptions) + + _, err := c.Fake.Invokes(action, &v1.NamespaceList{}) + return err +} + +func (c *FakeNamespaces) Get(name string) (result *v1.Namespace, err error) { + obj, err := c.Fake. + Invokes(core.NewRootGetAction(namespacesResource, name), &v1.Namespace{}) + if obj == nil { + return nil, err + } + return obj.(*v1.Namespace), err +} + +func (c *FakeNamespaces) List(opts api.ListOptions) (result *v1.NamespaceList, err error) { + obj, err := c.Fake. + Invokes(core.NewRootListAction(namespacesResource, opts), &v1.NamespaceList{}) + if obj == nil { + return nil, err + } + + label := opts.LabelSelector + if label == nil { + label = labels.Everything() + } + list := &v1.NamespaceList{} + for _, item := range obj.(*v1.NamespaceList).Items { + if label.Matches(labels.Set(item.Labels)) { + list.Items = append(list.Items, item) + } + } + return list, err +} + +// Watch returns a watch.Interface that watches the requested namespaces. +func (c *FakeNamespaces) Watch(opts api.ListOptions) (watch.Interface, error) { + return c.Fake. + InvokesWatch(core.NewRootWatchAction(namespacesResource, opts)) +} + +// Patch applies the patch and returns the patched namespace. +func (c *FakeNamespaces) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1.Namespace, err error) { + obj, err := c.Fake. + Invokes(core.NewRootPatchSubresourceAction(namespacesResource, name, data, subresources...), &v1.Namespace{}) + if obj == nil { + return nil, err + } + return obj.(*v1.Namespace), err +} diff --git a/pkg/client/clientset_generated/release_1_2/typed/core/v1/fake/fake_namespace_expansion.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_namespace_expansion.go similarity index 100% rename from pkg/client/clientset_generated/release_1_2/typed/core/v1/fake/fake_namespace_expansion.go rename to pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_namespace_expansion.go diff --git a/pkg/client/clientset_generated/release_1_2/typed/core/v1/fake/fake_node.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_node.go similarity index 89% rename from pkg/client/clientset_generated/release_1_2/typed/core/v1/fake/fake_node.go rename to pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_node.go index b1ca4ee05a9..087957fcd4c 100644 --- a/pkg/client/clientset_generated/release_1_2/typed/core/v1/fake/fake_node.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_node.go @@ -106,3 +106,13 @@ func (c *FakeNodes) Watch(opts api.ListOptions) (watch.Interface, error) { return c.Fake. InvokesWatch(core.NewRootWatchAction(nodesResource, opts)) } + +// Patch applies the patch and returns the patched node. +func (c *FakeNodes) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1.Node, err error) { + obj, err := c.Fake. + Invokes(core.NewRootPatchSubresourceAction(nodesResource, name, data, subresources...), &v1.Node{}) + if obj == nil { + return nil, err + } + return obj.(*v1.Node), err +} diff --git a/pkg/client/clientset_generated/release_1_2/typed/core/v1/fake/fake_persistentvolume.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_persistentvolume.go similarity index 89% rename from pkg/client/clientset_generated/release_1_2/typed/core/v1/fake/fake_persistentvolume.go rename to pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_persistentvolume.go index 9c8d646b1e4..d62b3e62420 100644 --- a/pkg/client/clientset_generated/release_1_2/typed/core/v1/fake/fake_persistentvolume.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_persistentvolume.go @@ -106,3 +106,13 @@ func (c *FakePersistentVolumes) Watch(opts api.ListOptions) (watch.Interface, er return c.Fake. InvokesWatch(core.NewRootWatchAction(persistentvolumesResource, opts)) } + +// Patch applies the patch and returns the patched persistentVolume. +func (c *FakePersistentVolumes) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1.PersistentVolume, err error) { + obj, err := c.Fake. + Invokes(core.NewRootPatchSubresourceAction(persistentvolumesResource, name, data, subresources...), &v1.PersistentVolume{}) + if obj == nil { + return nil, err + } + return obj.(*v1.PersistentVolume), err +} diff --git a/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_persistentvolumeclaim.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_persistentvolumeclaim.go new file mode 100644 index 00000000000..3eda49f7c70 --- /dev/null +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_persistentvolumeclaim.go @@ -0,0 +1,127 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package fake + +import ( + api "k8s.io/kubernetes/pkg/api" + unversioned "k8s.io/kubernetes/pkg/api/unversioned" + v1 "k8s.io/kubernetes/pkg/api/v1" + core "k8s.io/kubernetes/pkg/client/testing/core" + labels "k8s.io/kubernetes/pkg/labels" + watch "k8s.io/kubernetes/pkg/watch" +) + +// FakePersistentVolumeClaims implements PersistentVolumeClaimInterface +type FakePersistentVolumeClaims struct { + Fake *FakeCore + ns string +} + +var persistentvolumeclaimsResource = unversioned.GroupVersionResource{Group: "", Version: "v1", Resource: "persistentvolumeclaims"} + +func (c *FakePersistentVolumeClaims) Create(persistentVolumeClaim *v1.PersistentVolumeClaim) (result *v1.PersistentVolumeClaim, err error) { + obj, err := c.Fake. + Invokes(core.NewCreateAction(persistentvolumeclaimsResource, c.ns, persistentVolumeClaim), &v1.PersistentVolumeClaim{}) + + if obj == nil { + return nil, err + } + return obj.(*v1.PersistentVolumeClaim), err +} + +func (c *FakePersistentVolumeClaims) Update(persistentVolumeClaim *v1.PersistentVolumeClaim) (result *v1.PersistentVolumeClaim, err error) { + obj, err := c.Fake. + Invokes(core.NewUpdateAction(persistentvolumeclaimsResource, c.ns, persistentVolumeClaim), &v1.PersistentVolumeClaim{}) + + if obj == nil { + return nil, err + } + return obj.(*v1.PersistentVolumeClaim), err +} + +func (c *FakePersistentVolumeClaims) UpdateStatus(persistentVolumeClaim *v1.PersistentVolumeClaim) (*v1.PersistentVolumeClaim, error) { + obj, err := c.Fake. + Invokes(core.NewUpdateSubresourceAction(persistentvolumeclaimsResource, "status", c.ns, persistentVolumeClaim), &v1.PersistentVolumeClaim{}) + + if obj == nil { + return nil, err + } + return obj.(*v1.PersistentVolumeClaim), err +} + +func (c *FakePersistentVolumeClaims) Delete(name string, options *api.DeleteOptions) error { + _, err := c.Fake. + Invokes(core.NewDeleteAction(persistentvolumeclaimsResource, c.ns, name), &v1.PersistentVolumeClaim{}) + + return err +} + +func (c *FakePersistentVolumeClaims) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error { + action := core.NewDeleteCollectionAction(persistentvolumeclaimsResource, c.ns, listOptions) + + _, err := c.Fake.Invokes(action, &v1.PersistentVolumeClaimList{}) + return err +} + +func (c *FakePersistentVolumeClaims) Get(name string) (result *v1.PersistentVolumeClaim, err error) { + obj, err := c.Fake. + Invokes(core.NewGetAction(persistentvolumeclaimsResource, c.ns, name), &v1.PersistentVolumeClaim{}) + + if obj == nil { + return nil, err + } + return obj.(*v1.PersistentVolumeClaim), err +} + +func (c *FakePersistentVolumeClaims) List(opts api.ListOptions) (result *v1.PersistentVolumeClaimList, err error) { + obj, err := c.Fake. + Invokes(core.NewListAction(persistentvolumeclaimsResource, c.ns, opts), &v1.PersistentVolumeClaimList{}) + + if obj == nil { + return nil, err + } + + label := opts.LabelSelector + if label == nil { + label = labels.Everything() + } + list := &v1.PersistentVolumeClaimList{} + for _, item := range obj.(*v1.PersistentVolumeClaimList).Items { + if label.Matches(labels.Set(item.Labels)) { + list.Items = append(list.Items, item) + } + } + return list, err +} + +// Watch returns a watch.Interface that watches the requested persistentVolumeClaims. +func (c *FakePersistentVolumeClaims) Watch(opts api.ListOptions) (watch.Interface, error) { + return c.Fake. + InvokesWatch(core.NewWatchAction(persistentvolumeclaimsResource, c.ns, opts)) + +} + +// Patch applies the patch and returns the patched persistentVolumeClaim. +func (c *FakePersistentVolumeClaims) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1.PersistentVolumeClaim, err error) { + obj, err := c.Fake. + Invokes(core.NewPatchSubresourceAction(persistentvolumeclaimsResource, c.ns, name, data, subresources...), &v1.PersistentVolumeClaim{}) + + if obj == nil { + return nil, err + } + return obj.(*v1.PersistentVolumeClaim), err +} diff --git a/pkg/client/clientset_generated/release_1_2/typed/core/v1/fake/fake_pod.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_pod.go similarity index 89% rename from pkg/client/clientset_generated/release_1_2/typed/core/v1/fake/fake_pod.go rename to pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_pod.go index bc50b696e47..a9f5f4d3abe 100644 --- a/pkg/client/clientset_generated/release_1_2/typed/core/v1/fake/fake_pod.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_pod.go @@ -114,3 +114,14 @@ func (c *FakePods) Watch(opts api.ListOptions) (watch.Interface, error) { InvokesWatch(core.NewWatchAction(podsResource, c.ns, opts)) } + +// Patch applies the patch and returns the patched pod. +func (c *FakePods) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1.Pod, err error) { + obj, err := c.Fake. + Invokes(core.NewPatchSubresourceAction(podsResource, c.ns, name, data, subresources...), &v1.Pod{}) + + if obj == nil { + return nil, err + } + return obj.(*v1.Pod), err +} diff --git a/pkg/client/clientset_generated/release_1_2/typed/core/v1/fake/fake_pod_expansion.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_pod_expansion.go similarity index 100% rename from pkg/client/clientset_generated/release_1_2/typed/core/v1/fake/fake_pod_expansion.go rename to pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_pod_expansion.go diff --git a/pkg/client/clientset_generated/release_1_2/typed/core/v1/fake/fake_podtemplate.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_podtemplate.go similarity index 88% rename from pkg/client/clientset_generated/release_1_2/typed/core/v1/fake/fake_podtemplate.go rename to pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_podtemplate.go index 00066c1071e..2c1f097d362 100644 --- a/pkg/client/clientset_generated/release_1_2/typed/core/v1/fake/fake_podtemplate.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_podtemplate.go @@ -104,3 +104,14 @@ func (c *FakePodTemplates) Watch(opts api.ListOptions) (watch.Interface, error) InvokesWatch(core.NewWatchAction(podtemplatesResource, c.ns, opts)) } + +// Patch applies the patch and returns the patched podTemplate. +func (c *FakePodTemplates) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1.PodTemplate, err error) { + obj, err := c.Fake. + Invokes(core.NewPatchSubresourceAction(podtemplatesResource, c.ns, name, data, subresources...), &v1.PodTemplate{}) + + if obj == nil { + return nil, err + } + return obj.(*v1.PodTemplate), err +} diff --git a/pkg/client/clientset_generated/release_1_2/typed/core/v1/fake/fake_replicationcontroller.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_replicationcontroller.go similarity index 89% rename from pkg/client/clientset_generated/release_1_2/typed/core/v1/fake/fake_replicationcontroller.go rename to pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_replicationcontroller.go index 298eb319bb6..23bb4e1b6b7 100644 --- a/pkg/client/clientset_generated/release_1_2/typed/core/v1/fake/fake_replicationcontroller.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_replicationcontroller.go @@ -114,3 +114,14 @@ func (c *FakeReplicationControllers) Watch(opts api.ListOptions) (watch.Interfac InvokesWatch(core.NewWatchAction(replicationcontrollersResource, c.ns, opts)) } + +// Patch applies the patch and returns the patched replicationController. +func (c *FakeReplicationControllers) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1.ReplicationController, err error) { + obj, err := c.Fake. + Invokes(core.NewPatchSubresourceAction(replicationcontrollersResource, c.ns, name, data, subresources...), &v1.ReplicationController{}) + + if obj == nil { + return nil, err + } + return obj.(*v1.ReplicationController), err +} diff --git a/pkg/client/clientset_generated/release_1_2/typed/core/v1/fake/fake_resourcequota.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_resourcequota.go similarity index 89% rename from pkg/client/clientset_generated/release_1_2/typed/core/v1/fake/fake_resourcequota.go rename to pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_resourcequota.go index 998c967a7b7..10836f48098 100644 --- a/pkg/client/clientset_generated/release_1_2/typed/core/v1/fake/fake_resourcequota.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_resourcequota.go @@ -114,3 +114,14 @@ func (c *FakeResourceQuotas) Watch(opts api.ListOptions) (watch.Interface, error InvokesWatch(core.NewWatchAction(resourcequotasResource, c.ns, opts)) } + +// Patch applies the patch and returns the patched resourceQuota. +func (c *FakeResourceQuotas) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1.ResourceQuota, err error) { + obj, err := c.Fake. + Invokes(core.NewPatchSubresourceAction(resourcequotasResource, c.ns, name, data, subresources...), &v1.ResourceQuota{}) + + if obj == nil { + return nil, err + } + return obj.(*v1.ResourceQuota), err +} diff --git a/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_secret.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_secret.go new file mode 100644 index 00000000000..5306c08dafa --- /dev/null +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_secret.go @@ -0,0 +1,117 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package fake + +import ( + api "k8s.io/kubernetes/pkg/api" + unversioned "k8s.io/kubernetes/pkg/api/unversioned" + v1 "k8s.io/kubernetes/pkg/api/v1" + core "k8s.io/kubernetes/pkg/client/testing/core" + labels "k8s.io/kubernetes/pkg/labels" + watch "k8s.io/kubernetes/pkg/watch" +) + +// FakeSecrets implements SecretInterface +type FakeSecrets struct { + Fake *FakeCore + ns string +} + +var secretsResource = unversioned.GroupVersionResource{Group: "", Version: "v1", Resource: "secrets"} + +func (c *FakeSecrets) Create(secret *v1.Secret) (result *v1.Secret, err error) { + obj, err := c.Fake. + Invokes(core.NewCreateAction(secretsResource, c.ns, secret), &v1.Secret{}) + + if obj == nil { + return nil, err + } + return obj.(*v1.Secret), err +} + +func (c *FakeSecrets) Update(secret *v1.Secret) (result *v1.Secret, err error) { + obj, err := c.Fake. + Invokes(core.NewUpdateAction(secretsResource, c.ns, secret), &v1.Secret{}) + + if obj == nil { + return nil, err + } + return obj.(*v1.Secret), err +} + +func (c *FakeSecrets) Delete(name string, options *api.DeleteOptions) error { + _, err := c.Fake. + Invokes(core.NewDeleteAction(secretsResource, c.ns, name), &v1.Secret{}) + + return err +} + +func (c *FakeSecrets) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error { + action := core.NewDeleteCollectionAction(secretsResource, c.ns, listOptions) + + _, err := c.Fake.Invokes(action, &v1.SecretList{}) + return err +} + +func (c *FakeSecrets) Get(name string) (result *v1.Secret, err error) { + obj, err := c.Fake. + Invokes(core.NewGetAction(secretsResource, c.ns, name), &v1.Secret{}) + + if obj == nil { + return nil, err + } + return obj.(*v1.Secret), err +} + +func (c *FakeSecrets) List(opts api.ListOptions) (result *v1.SecretList, err error) { + obj, err := c.Fake. + Invokes(core.NewListAction(secretsResource, c.ns, opts), &v1.SecretList{}) + + if obj == nil { + return nil, err + } + + label := opts.LabelSelector + if label == nil { + label = labels.Everything() + } + list := &v1.SecretList{} + for _, item := range obj.(*v1.SecretList).Items { + if label.Matches(labels.Set(item.Labels)) { + list.Items = append(list.Items, item) + } + } + return list, err +} + +// Watch returns a watch.Interface that watches the requested secrets. +func (c *FakeSecrets) Watch(opts api.ListOptions) (watch.Interface, error) { + return c.Fake. + InvokesWatch(core.NewWatchAction(secretsResource, c.ns, opts)) + +} + +// Patch applies the patch and returns the patched secret. +func (c *FakeSecrets) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1.Secret, err error) { + obj, err := c.Fake. + Invokes(core.NewPatchSubresourceAction(secretsResource, c.ns, name, data, subresources...), &v1.Secret{}) + + if obj == nil { + return nil, err + } + return obj.(*v1.Secret), err +} diff --git a/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_service.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_service.go new file mode 100644 index 00000000000..a30f05eb9bc --- /dev/null +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_service.go @@ -0,0 +1,127 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package fake + +import ( + api "k8s.io/kubernetes/pkg/api" + unversioned "k8s.io/kubernetes/pkg/api/unversioned" + v1 "k8s.io/kubernetes/pkg/api/v1" + core "k8s.io/kubernetes/pkg/client/testing/core" + labels "k8s.io/kubernetes/pkg/labels" + watch "k8s.io/kubernetes/pkg/watch" +) + +// FakeServices implements ServiceInterface +type FakeServices struct { + Fake *FakeCore + ns string +} + +var servicesResource = unversioned.GroupVersionResource{Group: "", Version: "v1", Resource: "services"} + +func (c *FakeServices) Create(service *v1.Service) (result *v1.Service, err error) { + obj, err := c.Fake. + Invokes(core.NewCreateAction(servicesResource, c.ns, service), &v1.Service{}) + + if obj == nil { + return nil, err + } + return obj.(*v1.Service), err +} + +func (c *FakeServices) Update(service *v1.Service) (result *v1.Service, err error) { + obj, err := c.Fake. + Invokes(core.NewUpdateAction(servicesResource, c.ns, service), &v1.Service{}) + + if obj == nil { + return nil, err + } + return obj.(*v1.Service), err +} + +func (c *FakeServices) UpdateStatus(service *v1.Service) (*v1.Service, error) { + obj, err := c.Fake. + Invokes(core.NewUpdateSubresourceAction(servicesResource, "status", c.ns, service), &v1.Service{}) + + if obj == nil { + return nil, err + } + return obj.(*v1.Service), err +} + +func (c *FakeServices) Delete(name string, options *api.DeleteOptions) error { + _, err := c.Fake. + Invokes(core.NewDeleteAction(servicesResource, c.ns, name), &v1.Service{}) + + return err +} + +func (c *FakeServices) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error { + action := core.NewDeleteCollectionAction(servicesResource, c.ns, listOptions) + + _, err := c.Fake.Invokes(action, &v1.ServiceList{}) + return err +} + +func (c *FakeServices) Get(name string) (result *v1.Service, err error) { + obj, err := c.Fake. + Invokes(core.NewGetAction(servicesResource, c.ns, name), &v1.Service{}) + + if obj == nil { + return nil, err + } + return obj.(*v1.Service), err +} + +func (c *FakeServices) List(opts api.ListOptions) (result *v1.ServiceList, err error) { + obj, err := c.Fake. + Invokes(core.NewListAction(servicesResource, c.ns, opts), &v1.ServiceList{}) + + if obj == nil { + return nil, err + } + + label := opts.LabelSelector + if label == nil { + label = labels.Everything() + } + list := &v1.ServiceList{} + for _, item := range obj.(*v1.ServiceList).Items { + if label.Matches(labels.Set(item.Labels)) { + list.Items = append(list.Items, item) + } + } + return list, err +} + +// Watch returns a watch.Interface that watches the requested services. +func (c *FakeServices) Watch(opts api.ListOptions) (watch.Interface, error) { + return c.Fake. + InvokesWatch(core.NewWatchAction(servicesResource, c.ns, opts)) + +} + +// Patch applies the patch and returns the patched service. +func (c *FakeServices) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1.Service, err error) { + obj, err := c.Fake. + Invokes(core.NewPatchSubresourceAction(servicesResource, c.ns, name, data, subresources...), &v1.Service{}) + + if obj == nil { + return nil, err + } + return obj.(*v1.Service), err +} diff --git a/pkg/client/clientset_generated/release_1_2/typed/core/v1/fake/fake_service_expansion.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_service_expansion.go similarity index 100% rename from pkg/client/clientset_generated/release_1_2/typed/core/v1/fake/fake_service_expansion.go rename to pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_service_expansion.go diff --git a/pkg/client/clientset_generated/release_1_2/typed/core/v1/fake/fake_serviceaccount.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_serviceaccount.go similarity index 88% rename from pkg/client/clientset_generated/release_1_2/typed/core/v1/fake/fake_serviceaccount.go rename to pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_serviceaccount.go index 700749b7a1d..e14e83b4bb1 100644 --- a/pkg/client/clientset_generated/release_1_2/typed/core/v1/fake/fake_serviceaccount.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_serviceaccount.go @@ -104,3 +104,14 @@ func (c *FakeServiceAccounts) Watch(opts api.ListOptions) (watch.Interface, erro InvokesWatch(core.NewWatchAction(serviceaccountsResource, c.ns, opts)) } + +// Patch applies the patch and returns the patched serviceAccount. +func (c *FakeServiceAccounts) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1.ServiceAccount, err error) { + obj, err := c.Fake. + Invokes(core.NewPatchSubresourceAction(serviceaccountsResource, c.ns, name, data, subresources...), &v1.ServiceAccount{}) + + if obj == nil { + return nil, err + } + return obj.(*v1.ServiceAccount), err +} diff --git a/pkg/client/clientset_generated/release_1_2/typed/core/v1/generated_expansion.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/generated_expansion.go similarity index 100% rename from pkg/client/clientset_generated/release_1_2/typed/core/v1/generated_expansion.go rename to pkg/client/clientset_generated/release_1_5/typed/core/v1/generated_expansion.go index dbcfd84ce42..0039ffd036f 100644 --- a/pkg/client/clientset_generated/release_1_2/typed/core/v1/generated_expansion.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/generated_expansion.go @@ -18,6 +18,8 @@ package v1 type ComponentStatusExpansion interface{} +type ConfigMapExpansion interface{} + type EndpointsExpansion interface{} type LimitRangeExpansion interface{} @@ -37,5 +39,3 @@ type ResourceQuotaExpansion interface{} type SecretExpansion interface{} type ServiceAccountExpansion interface{} - -type ConfigMapExpansion interface{} diff --git a/pkg/client/clientset_generated/release_1_2/typed/core/v1/limitrange.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/limitrange.go similarity index 89% rename from pkg/client/clientset_generated/release_1_2/typed/core/v1/limitrange.go rename to pkg/client/clientset_generated/release_1_5/typed/core/v1/limitrange.go index c735e47e8b7..11e575d18ff 100644 --- a/pkg/client/clientset_generated/release_1_2/typed/core/v1/limitrange.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/limitrange.go @@ -37,6 +37,7 @@ type LimitRangeInterface interface { Get(name string) (*v1.LimitRange, error) List(opts api.ListOptions) (*v1.LimitRangeList, error) Watch(opts api.ListOptions) (watch.Interface, error) + Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1.LimitRange, err error) LimitRangeExpansion } @@ -134,3 +135,17 @@ func (c *limitRanges) Watch(opts api.ListOptions) (watch.Interface, error) { VersionedParams(&opts, api.ParameterCodec). Watch() } + +// Patch applies the patch and returns the patched limitRange. +func (c *limitRanges) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1.LimitRange, err error) { + result = &v1.LimitRange{} + err = c.client.Patch(pt). + Namespace(c.ns). + Resource("limitranges"). + SubResource(subresources...). + Name(name). + Body(data). + Do(). + Into(result) + return +} diff --git a/pkg/client/clientset_generated/release_1_5/typed/core/v1/namespace.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/namespace.go new file mode 100644 index 00000000000..174e4e29f6e --- /dev/null +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/namespace.go @@ -0,0 +1,154 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package v1 + +import ( + api "k8s.io/kubernetes/pkg/api" + v1 "k8s.io/kubernetes/pkg/api/v1" + watch "k8s.io/kubernetes/pkg/watch" +) + +// NamespacesGetter has a method to return a NamespaceInterface. +// A group's client should implement this interface. +type NamespacesGetter interface { + Namespaces() NamespaceInterface +} + +// NamespaceInterface has methods to work with Namespace resources. +type NamespaceInterface interface { + Create(*v1.Namespace) (*v1.Namespace, error) + Update(*v1.Namespace) (*v1.Namespace, error) + UpdateStatus(*v1.Namespace) (*v1.Namespace, error) + Delete(name string, options *api.DeleteOptions) error + DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error + Get(name string) (*v1.Namespace, error) + List(opts api.ListOptions) (*v1.NamespaceList, error) + Watch(opts api.ListOptions) (watch.Interface, error) + Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1.Namespace, err error) + NamespaceExpansion +} + +// namespaces implements NamespaceInterface +type namespaces struct { + client *CoreClient +} + +// newNamespaces returns a Namespaces +func newNamespaces(c *CoreClient) *namespaces { + return &namespaces{ + client: c, + } +} + +// Create takes the representation of a namespace and creates it. Returns the server's representation of the namespace, and an error, if there is any. +func (c *namespaces) Create(namespace *v1.Namespace) (result *v1.Namespace, err error) { + result = &v1.Namespace{} + err = c.client.Post(). + Resource("namespaces"). + Body(namespace). + Do(). + Into(result) + return +} + +// Update takes the representation of a namespace and updates it. Returns the server's representation of the namespace, and an error, if there is any. +func (c *namespaces) Update(namespace *v1.Namespace) (result *v1.Namespace, err error) { + result = &v1.Namespace{} + err = c.client.Put(). + Resource("namespaces"). + Name(namespace.Name). + Body(namespace). + Do(). + Into(result) + return +} + +func (c *namespaces) UpdateStatus(namespace *v1.Namespace) (result *v1.Namespace, err error) { + result = &v1.Namespace{} + err = c.client.Put(). + Resource("namespaces"). + Name(namespace.Name). + SubResource("status"). + Body(namespace). + Do(). + Into(result) + return +} + +// Delete takes name of the namespace and deletes it. Returns an error if one occurs. +func (c *namespaces) Delete(name string, options *api.DeleteOptions) error { + return c.client.Delete(). + Resource("namespaces"). + Name(name). + Body(options). + Do(). + Error() +} + +// DeleteCollection deletes a collection of objects. +func (c *namespaces) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error { + return c.client.Delete(). + Resource("namespaces"). + VersionedParams(&listOptions, api.ParameterCodec). + Body(options). + Do(). + Error() +} + +// Get takes name of the namespace, and returns the corresponding namespace object, and an error if there is any. +func (c *namespaces) Get(name string) (result *v1.Namespace, err error) { + result = &v1.Namespace{} + err = c.client.Get(). + Resource("namespaces"). + Name(name). + Do(). + Into(result) + return +} + +// List takes label and field selectors, and returns the list of Namespaces that match those selectors. +func (c *namespaces) List(opts api.ListOptions) (result *v1.NamespaceList, err error) { + result = &v1.NamespaceList{} + err = c.client.Get(). + Resource("namespaces"). + VersionedParams(&opts, api.ParameterCodec). + Do(). + Into(result) + return +} + +// Watch returns a watch.Interface that watches the requested namespaces. +func (c *namespaces) Watch(opts api.ListOptions) (watch.Interface, error) { + return c.client.Get(). + Prefix("watch"). + Resource("namespaces"). + VersionedParams(&opts, api.ParameterCodec). + Watch() +} + +// Patch applies the patch and returns the patched namespace. +func (c *namespaces) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1.Namespace, err error) { + result = &v1.Namespace{} + err = c.client.Patch(pt). + Resource("namespaces"). + SubResource(subresources...). + Name(name). + Body(data). + Do(). + Into(result) + return +} diff --git a/pkg/client/clientset_generated/release_1_5/typed/core/v1/namespace_expansion.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/namespace_expansion.go new file mode 100644 index 00000000000..36de2beeaa5 --- /dev/null +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/namespace_expansion.go @@ -0,0 +1,31 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package v1 + +import "k8s.io/kubernetes/pkg/api/v1" + +// The NamespaceExpansion interface allows manually adding extra methods to the NamespaceInterface. +type NamespaceExpansion interface { + Finalize(item *v1.Namespace) (*v1.Namespace, error) +} + +// Finalize takes the representation of a namespace to update. Returns the server's representation of the namespace, and an error, if it occurs. +func (c *namespaces) Finalize(namespace *v1.Namespace) (result *v1.Namespace, err error) { + result = &v1.Namespace{} + err = c.client.Put().Resource("namespaces").Name(namespace.Name).SubResource("finalize").Body(namespace).Do().Into(result) + return +} diff --git a/pkg/client/clientset_generated/release_1_2/typed/core/v1/node.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/node.go similarity index 89% rename from pkg/client/clientset_generated/release_1_2/typed/core/v1/node.go rename to pkg/client/clientset_generated/release_1_5/typed/core/v1/node.go index 90a07ecb61a..47f9979c356 100644 --- a/pkg/client/clientset_generated/release_1_2/typed/core/v1/node.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/node.go @@ -38,6 +38,7 @@ type NodeInterface interface { Get(name string) (*v1.Node, error) List(opts api.ListOptions) (*v1.NodeList, error) Watch(opts api.ListOptions) (watch.Interface, error) + Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1.Node, err error) NodeExpansion } @@ -138,3 +139,16 @@ func (c *nodes) Watch(opts api.ListOptions) (watch.Interface, error) { VersionedParams(&opts, api.ParameterCodec). Watch() } + +// Patch applies the patch and returns the patched node. +func (c *nodes) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1.Node, err error) { + result = &v1.Node{} + err = c.client.Patch(pt). + Resource("nodes"). + SubResource(subresources...). + Name(name). + Body(data). + Do(). + Into(result) + return +} diff --git a/pkg/client/clientset_generated/release_1_2/typed/core/v1/persistentvolume.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/persistentvolume.go similarity index 90% rename from pkg/client/clientset_generated/release_1_2/typed/core/v1/persistentvolume.go rename to pkg/client/clientset_generated/release_1_5/typed/core/v1/persistentvolume.go index de51cb3b583..862be03a28d 100644 --- a/pkg/client/clientset_generated/release_1_2/typed/core/v1/persistentvolume.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/persistentvolume.go @@ -38,6 +38,7 @@ type PersistentVolumeInterface interface { Get(name string) (*v1.PersistentVolume, error) List(opts api.ListOptions) (*v1.PersistentVolumeList, error) Watch(opts api.ListOptions) (watch.Interface, error) + Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1.PersistentVolume, err error) PersistentVolumeExpansion } @@ -138,3 +139,16 @@ func (c *persistentVolumes) Watch(opts api.ListOptions) (watch.Interface, error) VersionedParams(&opts, api.ParameterCodec). Watch() } + +// Patch applies the patch and returns the patched persistentVolume. +func (c *persistentVolumes) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1.PersistentVolume, err error) { + result = &v1.PersistentVolume{} + err = c.client.Patch(pt). + Resource("persistentvolumes"). + SubResource(subresources...). + Name(name). + Body(data). + Do(). + Into(result) + return +} diff --git a/pkg/client/clientset_generated/release_1_5/typed/core/v1/persistentvolumeclaim.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/persistentvolumeclaim.go new file mode 100644 index 00000000000..7f4e86878fe --- /dev/null +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/persistentvolumeclaim.go @@ -0,0 +1,165 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package v1 + +import ( + api "k8s.io/kubernetes/pkg/api" + v1 "k8s.io/kubernetes/pkg/api/v1" + watch "k8s.io/kubernetes/pkg/watch" +) + +// PersistentVolumeClaimsGetter has a method to return a PersistentVolumeClaimInterface. +// A group's client should implement this interface. +type PersistentVolumeClaimsGetter interface { + PersistentVolumeClaims(namespace string) PersistentVolumeClaimInterface +} + +// PersistentVolumeClaimInterface has methods to work with PersistentVolumeClaim resources. +type PersistentVolumeClaimInterface interface { + Create(*v1.PersistentVolumeClaim) (*v1.PersistentVolumeClaim, error) + Update(*v1.PersistentVolumeClaim) (*v1.PersistentVolumeClaim, error) + UpdateStatus(*v1.PersistentVolumeClaim) (*v1.PersistentVolumeClaim, error) + Delete(name string, options *api.DeleteOptions) error + DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error + Get(name string) (*v1.PersistentVolumeClaim, error) + List(opts api.ListOptions) (*v1.PersistentVolumeClaimList, error) + Watch(opts api.ListOptions) (watch.Interface, error) + Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1.PersistentVolumeClaim, err error) + PersistentVolumeClaimExpansion +} + +// persistentVolumeClaims implements PersistentVolumeClaimInterface +type persistentVolumeClaims struct { + client *CoreClient + ns string +} + +// newPersistentVolumeClaims returns a PersistentVolumeClaims +func newPersistentVolumeClaims(c *CoreClient, namespace string) *persistentVolumeClaims { + return &persistentVolumeClaims{ + client: c, + ns: namespace, + } +} + +// Create takes the representation of a persistentVolumeClaim and creates it. Returns the server's representation of the persistentVolumeClaim, and an error, if there is any. +func (c *persistentVolumeClaims) Create(persistentVolumeClaim *v1.PersistentVolumeClaim) (result *v1.PersistentVolumeClaim, err error) { + result = &v1.PersistentVolumeClaim{} + err = c.client.Post(). + Namespace(c.ns). + Resource("persistentvolumeclaims"). + Body(persistentVolumeClaim). + Do(). + Into(result) + return +} + +// Update takes the representation of a persistentVolumeClaim and updates it. Returns the server's representation of the persistentVolumeClaim, and an error, if there is any. +func (c *persistentVolumeClaims) Update(persistentVolumeClaim *v1.PersistentVolumeClaim) (result *v1.PersistentVolumeClaim, err error) { + result = &v1.PersistentVolumeClaim{} + err = c.client.Put(). + Namespace(c.ns). + Resource("persistentvolumeclaims"). + Name(persistentVolumeClaim.Name). + Body(persistentVolumeClaim). + Do(). + Into(result) + return +} + +func (c *persistentVolumeClaims) UpdateStatus(persistentVolumeClaim *v1.PersistentVolumeClaim) (result *v1.PersistentVolumeClaim, err error) { + result = &v1.PersistentVolumeClaim{} + err = c.client.Put(). + Namespace(c.ns). + Resource("persistentvolumeclaims"). + Name(persistentVolumeClaim.Name). + SubResource("status"). + Body(persistentVolumeClaim). + Do(). + Into(result) + return +} + +// Delete takes name of the persistentVolumeClaim and deletes it. Returns an error if one occurs. +func (c *persistentVolumeClaims) Delete(name string, options *api.DeleteOptions) error { + return c.client.Delete(). + Namespace(c.ns). + Resource("persistentvolumeclaims"). + Name(name). + Body(options). + Do(). + Error() +} + +// DeleteCollection deletes a collection of objects. +func (c *persistentVolumeClaims) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error { + return c.client.Delete(). + Namespace(c.ns). + Resource("persistentvolumeclaims"). + VersionedParams(&listOptions, api.ParameterCodec). + Body(options). + Do(). + Error() +} + +// Get takes name of the persistentVolumeClaim, and returns the corresponding persistentVolumeClaim object, and an error if there is any. +func (c *persistentVolumeClaims) Get(name string) (result *v1.PersistentVolumeClaim, err error) { + result = &v1.PersistentVolumeClaim{} + err = c.client.Get(). + Namespace(c.ns). + Resource("persistentvolumeclaims"). + Name(name). + Do(). + Into(result) + return +} + +// List takes label and field selectors, and returns the list of PersistentVolumeClaims that match those selectors. +func (c *persistentVolumeClaims) List(opts api.ListOptions) (result *v1.PersistentVolumeClaimList, err error) { + result = &v1.PersistentVolumeClaimList{} + err = c.client.Get(). + Namespace(c.ns). + Resource("persistentvolumeclaims"). + VersionedParams(&opts, api.ParameterCodec). + Do(). + Into(result) + return +} + +// Watch returns a watch.Interface that watches the requested persistentVolumeClaims. +func (c *persistentVolumeClaims) Watch(opts api.ListOptions) (watch.Interface, error) { + return c.client.Get(). + Prefix("watch"). + Namespace(c.ns). + Resource("persistentvolumeclaims"). + VersionedParams(&opts, api.ParameterCodec). + Watch() +} + +// Patch applies the patch and returns the patched persistentVolumeClaim. +func (c *persistentVolumeClaims) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1.PersistentVolumeClaim, err error) { + result = &v1.PersistentVolumeClaim{} + err = c.client.Patch(pt). + Namespace(c.ns). + Resource("persistentvolumeclaims"). + SubResource(subresources...). + Name(name). + Body(data). + Do(). + Into(result) + return +} diff --git a/pkg/client/clientset_generated/release_1_2/typed/core/v1/pod.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/pod.go similarity index 89% rename from pkg/client/clientset_generated/release_1_2/typed/core/v1/pod.go rename to pkg/client/clientset_generated/release_1_5/typed/core/v1/pod.go index 3e4ba39a0e4..a448c1995a0 100644 --- a/pkg/client/clientset_generated/release_1_2/typed/core/v1/pod.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/pod.go @@ -38,6 +38,7 @@ type PodInterface interface { Get(name string) (*v1.Pod, error) List(opts api.ListOptions) (*v1.PodList, error) Watch(opts api.ListOptions) (watch.Interface, error) + Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1.Pod, err error) PodExpansion } @@ -148,3 +149,17 @@ func (c *pods) Watch(opts api.ListOptions) (watch.Interface, error) { VersionedParams(&opts, api.ParameterCodec). Watch() } + +// Patch applies the patch and returns the patched pod. +func (c *pods) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1.Pod, err error) { + result = &v1.Pod{} + err = c.client.Patch(pt). + Namespace(c.ns). + Resource("pods"). + SubResource(subresources...). + Name(name). + Body(data). + Do(). + Into(result) + return +} diff --git a/pkg/client/clientset_generated/release_1_2/typed/core/v1/pod_expansion.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/pod_expansion.go similarity index 100% rename from pkg/client/clientset_generated/release_1_2/typed/core/v1/pod_expansion.go rename to pkg/client/clientset_generated/release_1_5/typed/core/v1/pod_expansion.go diff --git a/pkg/client/clientset_generated/release_1_2/typed/core/v1/podtemplate.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/podtemplate.go similarity index 89% rename from pkg/client/clientset_generated/release_1_2/typed/core/v1/podtemplate.go rename to pkg/client/clientset_generated/release_1_5/typed/core/v1/podtemplate.go index f307c49723b..5be402206b4 100644 --- a/pkg/client/clientset_generated/release_1_2/typed/core/v1/podtemplate.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/podtemplate.go @@ -37,6 +37,7 @@ type PodTemplateInterface interface { Get(name string) (*v1.PodTemplate, error) List(opts api.ListOptions) (*v1.PodTemplateList, error) Watch(opts api.ListOptions) (watch.Interface, error) + Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1.PodTemplate, err error) PodTemplateExpansion } @@ -134,3 +135,17 @@ func (c *podTemplates) Watch(opts api.ListOptions) (watch.Interface, error) { VersionedParams(&opts, api.ParameterCodec). Watch() } + +// Patch applies the patch and returns the patched podTemplate. +func (c *podTemplates) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1.PodTemplate, err error) { + result = &v1.PodTemplate{} + err = c.client.Patch(pt). + Namespace(c.ns). + Resource("podtemplates"). + SubResource(subresources...). + Name(name). + Body(data). + Do(). + Into(result) + return +} diff --git a/pkg/client/clientset_generated/release_1_2/typed/core/v1/replicationcontroller.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/replicationcontroller.go similarity index 90% rename from pkg/client/clientset_generated/release_1_2/typed/core/v1/replicationcontroller.go rename to pkg/client/clientset_generated/release_1_5/typed/core/v1/replicationcontroller.go index 4646e591f9b..e339172cb92 100644 --- a/pkg/client/clientset_generated/release_1_2/typed/core/v1/replicationcontroller.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/replicationcontroller.go @@ -38,6 +38,7 @@ type ReplicationControllerInterface interface { Get(name string) (*v1.ReplicationController, error) List(opts api.ListOptions) (*v1.ReplicationControllerList, error) Watch(opts api.ListOptions) (watch.Interface, error) + Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1.ReplicationController, err error) ReplicationControllerExpansion } @@ -148,3 +149,17 @@ func (c *replicationControllers) Watch(opts api.ListOptions) (watch.Interface, e VersionedParams(&opts, api.ParameterCodec). Watch() } + +// Patch applies the patch and returns the patched replicationController. +func (c *replicationControllers) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1.ReplicationController, err error) { + result = &v1.ReplicationController{} + err = c.client.Patch(pt). + Namespace(c.ns). + Resource("replicationcontrollers"). + SubResource(subresources...). + Name(name). + Body(data). + Do(). + Into(result) + return +} diff --git a/pkg/client/clientset_generated/release_1_2/typed/core/v1/resourcequota.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/resourcequota.go similarity index 90% rename from pkg/client/clientset_generated/release_1_2/typed/core/v1/resourcequota.go rename to pkg/client/clientset_generated/release_1_5/typed/core/v1/resourcequota.go index 8330a26125a..149e08377c9 100644 --- a/pkg/client/clientset_generated/release_1_2/typed/core/v1/resourcequota.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/resourcequota.go @@ -38,6 +38,7 @@ type ResourceQuotaInterface interface { Get(name string) (*v1.ResourceQuota, error) List(opts api.ListOptions) (*v1.ResourceQuotaList, error) Watch(opts api.ListOptions) (watch.Interface, error) + Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1.ResourceQuota, err error) ResourceQuotaExpansion } @@ -148,3 +149,17 @@ func (c *resourceQuotas) Watch(opts api.ListOptions) (watch.Interface, error) { VersionedParams(&opts, api.ParameterCodec). Watch() } + +// Patch applies the patch and returns the patched resourceQuota. +func (c *resourceQuotas) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1.ResourceQuota, err error) { + result = &v1.ResourceQuota{} + err = c.client.Patch(pt). + Namespace(c.ns). + Resource("resourcequotas"). + SubResource(subresources...). + Name(name). + Body(data). + Do(). + Into(result) + return +} diff --git a/pkg/client/clientset_generated/release_1_5/typed/core/v1/secret.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/secret.go new file mode 100644 index 00000000000..4ecb29e909c --- /dev/null +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/secret.go @@ -0,0 +1,151 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package v1 + +import ( + api "k8s.io/kubernetes/pkg/api" + v1 "k8s.io/kubernetes/pkg/api/v1" + watch "k8s.io/kubernetes/pkg/watch" +) + +// SecretsGetter has a method to return a SecretInterface. +// A group's client should implement this interface. +type SecretsGetter interface { + Secrets(namespace string) SecretInterface +} + +// SecretInterface has methods to work with Secret resources. +type SecretInterface interface { + Create(*v1.Secret) (*v1.Secret, error) + Update(*v1.Secret) (*v1.Secret, error) + Delete(name string, options *api.DeleteOptions) error + DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error + Get(name string) (*v1.Secret, error) + List(opts api.ListOptions) (*v1.SecretList, error) + Watch(opts api.ListOptions) (watch.Interface, error) + Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1.Secret, err error) + SecretExpansion +} + +// secrets implements SecretInterface +type secrets struct { + client *CoreClient + ns string +} + +// newSecrets returns a Secrets +func newSecrets(c *CoreClient, namespace string) *secrets { + return &secrets{ + client: c, + ns: namespace, + } +} + +// Create takes the representation of a secret and creates it. Returns the server's representation of the secret, and an error, if there is any. +func (c *secrets) Create(secret *v1.Secret) (result *v1.Secret, err error) { + result = &v1.Secret{} + err = c.client.Post(). + Namespace(c.ns). + Resource("secrets"). + Body(secret). + Do(). + Into(result) + return +} + +// Update takes the representation of a secret and updates it. Returns the server's representation of the secret, and an error, if there is any. +func (c *secrets) Update(secret *v1.Secret) (result *v1.Secret, err error) { + result = &v1.Secret{} + err = c.client.Put(). + Namespace(c.ns). + Resource("secrets"). + Name(secret.Name). + Body(secret). + Do(). + Into(result) + return +} + +// Delete takes name of the secret and deletes it. Returns an error if one occurs. +func (c *secrets) Delete(name string, options *api.DeleteOptions) error { + return c.client.Delete(). + Namespace(c.ns). + Resource("secrets"). + Name(name). + Body(options). + Do(). + Error() +} + +// DeleteCollection deletes a collection of objects. +func (c *secrets) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error { + return c.client.Delete(). + Namespace(c.ns). + Resource("secrets"). + VersionedParams(&listOptions, api.ParameterCodec). + Body(options). + Do(). + Error() +} + +// Get takes name of the secret, and returns the corresponding secret object, and an error if there is any. +func (c *secrets) Get(name string) (result *v1.Secret, err error) { + result = &v1.Secret{} + err = c.client.Get(). + Namespace(c.ns). + Resource("secrets"). + Name(name). + Do(). + Into(result) + return +} + +// List takes label and field selectors, and returns the list of Secrets that match those selectors. +func (c *secrets) List(opts api.ListOptions) (result *v1.SecretList, err error) { + result = &v1.SecretList{} + err = c.client.Get(). + Namespace(c.ns). + Resource("secrets"). + VersionedParams(&opts, api.ParameterCodec). + Do(). + Into(result) + return +} + +// Watch returns a watch.Interface that watches the requested secrets. +func (c *secrets) Watch(opts api.ListOptions) (watch.Interface, error) { + return c.client.Get(). + Prefix("watch"). + Namespace(c.ns). + Resource("secrets"). + VersionedParams(&opts, api.ParameterCodec). + Watch() +} + +// Patch applies the patch and returns the patched secret. +func (c *secrets) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1.Secret, err error) { + result = &v1.Secret{} + err = c.client.Patch(pt). + Namespace(c.ns). + Resource("secrets"). + SubResource(subresources...). + Name(name). + Body(data). + Do(). + Into(result) + return +} diff --git a/pkg/client/clientset_generated/release_1_5/typed/core/v1/service.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/service.go new file mode 100644 index 00000000000..80fe4d72c2f --- /dev/null +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/service.go @@ -0,0 +1,165 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package v1 + +import ( + api "k8s.io/kubernetes/pkg/api" + v1 "k8s.io/kubernetes/pkg/api/v1" + watch "k8s.io/kubernetes/pkg/watch" +) + +// ServicesGetter has a method to return a ServiceInterface. +// A group's client should implement this interface. +type ServicesGetter interface { + Services(namespace string) ServiceInterface +} + +// ServiceInterface has methods to work with Service resources. +type ServiceInterface interface { + Create(*v1.Service) (*v1.Service, error) + Update(*v1.Service) (*v1.Service, error) + UpdateStatus(*v1.Service) (*v1.Service, error) + Delete(name string, options *api.DeleteOptions) error + DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error + Get(name string) (*v1.Service, error) + List(opts api.ListOptions) (*v1.ServiceList, error) + Watch(opts api.ListOptions) (watch.Interface, error) + Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1.Service, err error) + ServiceExpansion +} + +// services implements ServiceInterface +type services struct { + client *CoreClient + ns string +} + +// newServices returns a Services +func newServices(c *CoreClient, namespace string) *services { + return &services{ + client: c, + ns: namespace, + } +} + +// Create takes the representation of a service and creates it. Returns the server's representation of the service, and an error, if there is any. +func (c *services) Create(service *v1.Service) (result *v1.Service, err error) { + result = &v1.Service{} + err = c.client.Post(). + Namespace(c.ns). + Resource("services"). + Body(service). + Do(). + Into(result) + return +} + +// Update takes the representation of a service and updates it. Returns the server's representation of the service, and an error, if there is any. +func (c *services) Update(service *v1.Service) (result *v1.Service, err error) { + result = &v1.Service{} + err = c.client.Put(). + Namespace(c.ns). + Resource("services"). + Name(service.Name). + Body(service). + Do(). + Into(result) + return +} + +func (c *services) UpdateStatus(service *v1.Service) (result *v1.Service, err error) { + result = &v1.Service{} + err = c.client.Put(). + Namespace(c.ns). + Resource("services"). + Name(service.Name). + SubResource("status"). + Body(service). + Do(). + Into(result) + return +} + +// Delete takes name of the service and deletes it. Returns an error if one occurs. +func (c *services) Delete(name string, options *api.DeleteOptions) error { + return c.client.Delete(). + Namespace(c.ns). + Resource("services"). + Name(name). + Body(options). + Do(). + Error() +} + +// DeleteCollection deletes a collection of objects. +func (c *services) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error { + return c.client.Delete(). + Namespace(c.ns). + Resource("services"). + VersionedParams(&listOptions, api.ParameterCodec). + Body(options). + Do(). + Error() +} + +// Get takes name of the service, and returns the corresponding service object, and an error if there is any. +func (c *services) Get(name string) (result *v1.Service, err error) { + result = &v1.Service{} + err = c.client.Get(). + Namespace(c.ns). + Resource("services"). + Name(name). + Do(). + Into(result) + return +} + +// List takes label and field selectors, and returns the list of Services that match those selectors. +func (c *services) List(opts api.ListOptions) (result *v1.ServiceList, err error) { + result = &v1.ServiceList{} + err = c.client.Get(). + Namespace(c.ns). + Resource("services"). + VersionedParams(&opts, api.ParameterCodec). + Do(). + Into(result) + return +} + +// Watch returns a watch.Interface that watches the requested services. +func (c *services) Watch(opts api.ListOptions) (watch.Interface, error) { + return c.client.Get(). + Prefix("watch"). + Namespace(c.ns). + Resource("services"). + VersionedParams(&opts, api.ParameterCodec). + Watch() +} + +// Patch applies the patch and returns the patched service. +func (c *services) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1.Service, err error) { + result = &v1.Service{} + err = c.client.Patch(pt). + Namespace(c.ns). + Resource("services"). + SubResource(subresources...). + Name(name). + Body(data). + Do(). + Into(result) + return +} diff --git a/pkg/client/clientset_generated/release_1_2/typed/core/v1/service_expansion.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/service_expansion.go similarity index 100% rename from pkg/client/clientset_generated/release_1_2/typed/core/v1/service_expansion.go rename to pkg/client/clientset_generated/release_1_5/typed/core/v1/service_expansion.go diff --git a/pkg/client/clientset_generated/release_1_2/typed/core/v1/serviceaccount.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/serviceaccount.go similarity index 89% rename from pkg/client/clientset_generated/release_1_2/typed/core/v1/serviceaccount.go rename to pkg/client/clientset_generated/release_1_5/typed/core/v1/serviceaccount.go index 2db81701506..f8e4d1f8d7e 100644 --- a/pkg/client/clientset_generated/release_1_2/typed/core/v1/serviceaccount.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/serviceaccount.go @@ -37,6 +37,7 @@ type ServiceAccountInterface interface { Get(name string) (*v1.ServiceAccount, error) List(opts api.ListOptions) (*v1.ServiceAccountList, error) Watch(opts api.ListOptions) (watch.Interface, error) + Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1.ServiceAccount, err error) ServiceAccountExpansion } @@ -134,3 +135,17 @@ func (c *serviceAccounts) Watch(opts api.ListOptions) (watch.Interface, error) { VersionedParams(&opts, api.ParameterCodec). Watch() } + +// Patch applies the patch and returns the patched serviceAccount. +func (c *serviceAccounts) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1.ServiceAccount, err error) { + result = &v1.ServiceAccount{} + err = c.client.Patch(pt). + Namespace(c.ns). + Resource("serviceaccounts"). + SubResource(subresources...). + Name(name). + Body(data). + Do(). + Into(result) + return +} diff --git a/pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/daemonset.go b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/daemonset.go similarity index 89% rename from pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/daemonset.go rename to pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/daemonset.go index 1a0e1114d55..9a7cc051f4c 100644 --- a/pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/daemonset.go +++ b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/daemonset.go @@ -38,6 +38,7 @@ type DaemonSetInterface interface { Get(name string) (*v1beta1.DaemonSet, error) List(opts api.ListOptions) (*v1beta1.DaemonSetList, error) Watch(opts api.ListOptions) (watch.Interface, error) + Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1beta1.DaemonSet, err error) DaemonSetExpansion } @@ -148,3 +149,17 @@ func (c *daemonSets) Watch(opts api.ListOptions) (watch.Interface, error) { VersionedParams(&opts, api.ParameterCodec). Watch() } + +// Patch applies the patch and returns the patched daemonSet. +func (c *daemonSets) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1beta1.DaemonSet, err error) { + result = &v1beta1.DaemonSet{} + err = c.client.Patch(pt). + Namespace(c.ns). + Resource("daemonsets"). + SubResource(subresources...). + Name(name). + Body(data). + Do(). + Into(result) + return +} diff --git a/pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/deployment.go b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/deployment.go similarity index 90% rename from pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/deployment.go rename to pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/deployment.go index bd3ddbaebbe..b51a714d3af 100644 --- a/pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/deployment.go +++ b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/deployment.go @@ -38,6 +38,7 @@ type DeploymentInterface interface { Get(name string) (*v1beta1.Deployment, error) List(opts api.ListOptions) (*v1beta1.DeploymentList, error) Watch(opts api.ListOptions) (watch.Interface, error) + Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1beta1.Deployment, err error) DeploymentExpansion } @@ -148,3 +149,17 @@ func (c *deployments) Watch(opts api.ListOptions) (watch.Interface, error) { VersionedParams(&opts, api.ParameterCodec). Watch() } + +// Patch applies the patch and returns the patched deployment. +func (c *deployments) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1beta1.Deployment, err error) { + result = &v1beta1.Deployment{} + err = c.client.Patch(pt). + Namespace(c.ns). + Resource("deployments"). + SubResource(subresources...). + Name(name). + Body(data). + Do(). + Into(result) + return +} diff --git a/pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/deployment_expansion.go b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/deployment_expansion.go similarity index 100% rename from pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/deployment_expansion.go rename to pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/deployment_expansion.go diff --git a/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/doc.go b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/doc.go new file mode 100644 index 00000000000..831e702d926 --- /dev/null +++ b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/doc.go @@ -0,0 +1,20 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,authorization/v1beta1,autoscaling/v1,batch/v1,extensions/v1beta1,policy/v1alpha1] + +// This package has the automatically generated typed clients. +package v1beta1 diff --git a/pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/extensions_client.go b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/extensions_client.go similarity index 84% rename from pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/extensions_client.go rename to pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/extensions_client.go index e1352c5d193..9f796cbb7ea 100644 --- a/pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/extensions_client.go +++ b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/extensions_client.go @@ -20,14 +20,16 @@ import ( api "k8s.io/kubernetes/pkg/api" registered "k8s.io/kubernetes/pkg/apimachinery/registered" restclient "k8s.io/kubernetes/pkg/client/restclient" + serializer "k8s.io/kubernetes/pkg/runtime/serializer" ) type ExtensionsInterface interface { + GetRESTClient() *restclient.RESTClient DaemonSetsGetter DeploymentsGetter - HorizontalPodAutoscalersGetter IngressesGetter JobsGetter + PodSecurityPoliciesGetter ReplicaSetsGetter ScalesGetter ThirdPartyResourcesGetter @@ -46,10 +48,6 @@ func (c *ExtensionsClient) Deployments(namespace string) DeploymentInterface { return newDeployments(c, namespace) } -func (c *ExtensionsClient) HorizontalPodAutoscalers(namespace string) HorizontalPodAutoscalerInterface { - return newHorizontalPodAutoscalers(c, namespace) -} - func (c *ExtensionsClient) Ingresses(namespace string) IngressInterface { return newIngresses(c, namespace) } @@ -58,6 +56,10 @@ func (c *ExtensionsClient) Jobs(namespace string) JobInterface { return newJobs(c, namespace) } +func (c *ExtensionsClient) PodSecurityPolicies() PodSecurityPolicyInterface { + return newPodSecurityPolicies(c) +} + func (c *ExtensionsClient) ReplicaSets(namespace string) ReplicaSetInterface { return newReplicaSets(c, namespace) } @@ -114,13 +116,16 @@ func setConfigDefaults(config *restclient.Config) error { config.GroupVersion = ©GroupVersion //} - config.NegotiatedSerializer = api.Codecs + config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: api.Codecs} - if config.QPS == 0 { - config.QPS = 5 - } - if config.Burst == 0 { - config.Burst = 10 - } return nil } + +// GetRESTClient returns a RESTClient that is used to communicate +// with API server by this client implementation. +func (c *ExtensionsClient) GetRESTClient() *restclient.RESTClient { + if c == nil { + return nil + } + return c.RESTClient +} diff --git a/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/doc.go b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/doc.go new file mode 100644 index 00000000000..793bddf23ce --- /dev/null +++ b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/doc.go @@ -0,0 +1,20 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,authorization/v1beta1,autoscaling/v1,batch/v1,extensions/v1beta1,policy/v1alpha1] + +// Package fake has the automatically generated clients. +package fake diff --git a/pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/fake/fake_daemonset.go b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/fake_daemonset.go similarity index 89% rename from pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/fake/fake_daemonset.go rename to pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/fake_daemonset.go index 8cf03f7b1fc..fe3745c8268 100644 --- a/pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/fake/fake_daemonset.go +++ b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/fake_daemonset.go @@ -114,3 +114,14 @@ func (c *FakeDaemonSets) Watch(opts api.ListOptions) (watch.Interface, error) { InvokesWatch(core.NewWatchAction(daemonsetsResource, c.ns, opts)) } + +// Patch applies the patch and returns the patched daemonSet. +func (c *FakeDaemonSets) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1beta1.DaemonSet, err error) { + obj, err := c.Fake. + Invokes(core.NewPatchSubresourceAction(daemonsetsResource, c.ns, name, data, subresources...), &v1beta1.DaemonSet{}) + + if obj == nil { + return nil, err + } + return obj.(*v1beta1.DaemonSet), err +} diff --git a/pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/fake/fake_deployment.go b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/fake_deployment.go similarity index 89% rename from pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/fake/fake_deployment.go rename to pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/fake_deployment.go index 3c206311f34..9f5ae6f1ef3 100644 --- a/pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/fake/fake_deployment.go +++ b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/fake_deployment.go @@ -114,3 +114,14 @@ func (c *FakeDeployments) Watch(opts api.ListOptions) (watch.Interface, error) { InvokesWatch(core.NewWatchAction(deploymentsResource, c.ns, opts)) } + +// Patch applies the patch and returns the patched deployment. +func (c *FakeDeployments) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1beta1.Deployment, err error) { + obj, err := c.Fake. + Invokes(core.NewPatchSubresourceAction(deploymentsResource, c.ns, name, data, subresources...), &v1beta1.Deployment{}) + + if obj == nil { + return nil, err + } + return obj.(*v1beta1.Deployment), err +} diff --git a/pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/fake/fake_deployment_expansion.go b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/fake_deployment_expansion.go similarity index 100% rename from pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/fake/fake_deployment_expansion.go rename to pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/fake_deployment_expansion.go diff --git a/pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/fake/fake_extensions_client.go b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/fake_extensions_client.go similarity index 79% rename from pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/fake/fake_extensions_client.go rename to pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/fake_extensions_client.go index c0a254bdd31..0108289274f 100644 --- a/pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/fake/fake_extensions_client.go +++ b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/fake_extensions_client.go @@ -17,7 +17,8 @@ limitations under the License. package fake import ( - v1beta1 "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1" + v1beta1 "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1" + restclient "k8s.io/kubernetes/pkg/client/restclient" core "k8s.io/kubernetes/pkg/client/testing/core" ) @@ -33,10 +34,6 @@ func (c *FakeExtensions) Deployments(namespace string) v1beta1.DeploymentInterfa return &FakeDeployments{c, namespace} } -func (c *FakeExtensions) HorizontalPodAutoscalers(namespace string) v1beta1.HorizontalPodAutoscalerInterface { - return &FakeHorizontalPodAutoscalers{c, namespace} -} - func (c *FakeExtensions) Ingresses(namespace string) v1beta1.IngressInterface { return &FakeIngresses{c, namespace} } @@ -45,6 +42,10 @@ func (c *FakeExtensions) Jobs(namespace string) v1beta1.JobInterface { return &FakeJobs{c, namespace} } +func (c *FakeExtensions) PodSecurityPolicies() v1beta1.PodSecurityPolicyInterface { + return &FakePodSecurityPolicies{c} +} + func (c *FakeExtensions) ReplicaSets(namespace string) v1beta1.ReplicaSetInterface { return &FakeReplicaSets{c, namespace} } @@ -56,3 +57,9 @@ func (c *FakeExtensions) Scales(namespace string) v1beta1.ScaleInterface { func (c *FakeExtensions) ThirdPartyResources() v1beta1.ThirdPartyResourceInterface { return &FakeThirdPartyResources{c} } + +// GetRESTClient returns a RESTClient that is used to communicate +// with API server by this client implementation. +func (c *FakeExtensions) GetRESTClient() *restclient.RESTClient { + return nil +} diff --git a/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/fake_ingress.go b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/fake_ingress.go new file mode 100644 index 00000000000..7ab0f332ee8 --- /dev/null +++ b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/fake_ingress.go @@ -0,0 +1,127 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package fake + +import ( + api "k8s.io/kubernetes/pkg/api" + unversioned "k8s.io/kubernetes/pkg/api/unversioned" + v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + core "k8s.io/kubernetes/pkg/client/testing/core" + labels "k8s.io/kubernetes/pkg/labels" + watch "k8s.io/kubernetes/pkg/watch" +) + +// FakeIngresses implements IngressInterface +type FakeIngresses struct { + Fake *FakeExtensions + ns string +} + +var ingressesResource = unversioned.GroupVersionResource{Group: "extensions", Version: "v1beta1", Resource: "ingresses"} + +func (c *FakeIngresses) Create(ingress *v1beta1.Ingress) (result *v1beta1.Ingress, err error) { + obj, err := c.Fake. + Invokes(core.NewCreateAction(ingressesResource, c.ns, ingress), &v1beta1.Ingress{}) + + if obj == nil { + return nil, err + } + return obj.(*v1beta1.Ingress), err +} + +func (c *FakeIngresses) Update(ingress *v1beta1.Ingress) (result *v1beta1.Ingress, err error) { + obj, err := c.Fake. + Invokes(core.NewUpdateAction(ingressesResource, c.ns, ingress), &v1beta1.Ingress{}) + + if obj == nil { + return nil, err + } + return obj.(*v1beta1.Ingress), err +} + +func (c *FakeIngresses) UpdateStatus(ingress *v1beta1.Ingress) (*v1beta1.Ingress, error) { + obj, err := c.Fake. + Invokes(core.NewUpdateSubresourceAction(ingressesResource, "status", c.ns, ingress), &v1beta1.Ingress{}) + + if obj == nil { + return nil, err + } + return obj.(*v1beta1.Ingress), err +} + +func (c *FakeIngresses) Delete(name string, options *api.DeleteOptions) error { + _, err := c.Fake. + Invokes(core.NewDeleteAction(ingressesResource, c.ns, name), &v1beta1.Ingress{}) + + return err +} + +func (c *FakeIngresses) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error { + action := core.NewDeleteCollectionAction(ingressesResource, c.ns, listOptions) + + _, err := c.Fake.Invokes(action, &v1beta1.IngressList{}) + return err +} + +func (c *FakeIngresses) Get(name string) (result *v1beta1.Ingress, err error) { + obj, err := c.Fake. + Invokes(core.NewGetAction(ingressesResource, c.ns, name), &v1beta1.Ingress{}) + + if obj == nil { + return nil, err + } + return obj.(*v1beta1.Ingress), err +} + +func (c *FakeIngresses) List(opts api.ListOptions) (result *v1beta1.IngressList, err error) { + obj, err := c.Fake. + Invokes(core.NewListAction(ingressesResource, c.ns, opts), &v1beta1.IngressList{}) + + if obj == nil { + return nil, err + } + + label := opts.LabelSelector + if label == nil { + label = labels.Everything() + } + list := &v1beta1.IngressList{} + for _, item := range obj.(*v1beta1.IngressList).Items { + if label.Matches(labels.Set(item.Labels)) { + list.Items = append(list.Items, item) + } + } + return list, err +} + +// Watch returns a watch.Interface that watches the requested ingresses. +func (c *FakeIngresses) Watch(opts api.ListOptions) (watch.Interface, error) { + return c.Fake. + InvokesWatch(core.NewWatchAction(ingressesResource, c.ns, opts)) + +} + +// Patch applies the patch and returns the patched ingress. +func (c *FakeIngresses) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1beta1.Ingress, err error) { + obj, err := c.Fake. + Invokes(core.NewPatchSubresourceAction(ingressesResource, c.ns, name, data, subresources...), &v1beta1.Ingress{}) + + if obj == nil { + return nil, err + } + return obj.(*v1beta1.Ingress), err +} diff --git a/pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/fake/fake_job.go b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/fake_job.go similarity index 89% rename from pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/fake/fake_job.go rename to pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/fake_job.go index d870f86b3ba..0c257418f7a 100644 --- a/pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/fake/fake_job.go +++ b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/fake_job.go @@ -114,3 +114,14 @@ func (c *FakeJobs) Watch(opts api.ListOptions) (watch.Interface, error) { InvokesWatch(core.NewWatchAction(jobsResource, c.ns, opts)) } + +// Patch applies the patch and returns the patched job. +func (c *FakeJobs) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1beta1.Job, err error) { + obj, err := c.Fake. + Invokes(core.NewPatchSubresourceAction(jobsResource, c.ns, name, data, subresources...), &v1beta1.Job{}) + + if obj == nil { + return nil, err + } + return obj.(*v1beta1.Job), err +} diff --git a/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/fake_podsecuritypolicy.go b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/fake_podsecuritypolicy.go new file mode 100644 index 00000000000..4302d18963a --- /dev/null +++ b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/fake_podsecuritypolicy.go @@ -0,0 +1,109 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package fake + +import ( + api "k8s.io/kubernetes/pkg/api" + unversioned "k8s.io/kubernetes/pkg/api/unversioned" + v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + core "k8s.io/kubernetes/pkg/client/testing/core" + labels "k8s.io/kubernetes/pkg/labels" + watch "k8s.io/kubernetes/pkg/watch" +) + +// FakePodSecurityPolicies implements PodSecurityPolicyInterface +type FakePodSecurityPolicies struct { + Fake *FakeExtensions +} + +var podsecuritypoliciesResource = unversioned.GroupVersionResource{Group: "extensions", Version: "v1beta1", Resource: "podsecuritypolicies"} + +func (c *FakePodSecurityPolicies) Create(podSecurityPolicy *v1beta1.PodSecurityPolicy) (result *v1beta1.PodSecurityPolicy, err error) { + obj, err := c.Fake. + Invokes(core.NewRootCreateAction(podsecuritypoliciesResource, podSecurityPolicy), &v1beta1.PodSecurityPolicy{}) + if obj == nil { + return nil, err + } + return obj.(*v1beta1.PodSecurityPolicy), err +} + +func (c *FakePodSecurityPolicies) Update(podSecurityPolicy *v1beta1.PodSecurityPolicy) (result *v1beta1.PodSecurityPolicy, err error) { + obj, err := c.Fake. + Invokes(core.NewRootUpdateAction(podsecuritypoliciesResource, podSecurityPolicy), &v1beta1.PodSecurityPolicy{}) + if obj == nil { + return nil, err + } + return obj.(*v1beta1.PodSecurityPolicy), err +} + +func (c *FakePodSecurityPolicies) Delete(name string, options *api.DeleteOptions) error { + _, err := c.Fake. + Invokes(core.NewRootDeleteAction(podsecuritypoliciesResource, name), &v1beta1.PodSecurityPolicy{}) + return err +} + +func (c *FakePodSecurityPolicies) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error { + action := core.NewRootDeleteCollectionAction(podsecuritypoliciesResource, listOptions) + + _, err := c.Fake.Invokes(action, &v1beta1.PodSecurityPolicyList{}) + return err +} + +func (c *FakePodSecurityPolicies) Get(name string) (result *v1beta1.PodSecurityPolicy, err error) { + obj, err := c.Fake. + Invokes(core.NewRootGetAction(podsecuritypoliciesResource, name), &v1beta1.PodSecurityPolicy{}) + if obj == nil { + return nil, err + } + return obj.(*v1beta1.PodSecurityPolicy), err +} + +func (c *FakePodSecurityPolicies) List(opts api.ListOptions) (result *v1beta1.PodSecurityPolicyList, err error) { + obj, err := c.Fake. + Invokes(core.NewRootListAction(podsecuritypoliciesResource, opts), &v1beta1.PodSecurityPolicyList{}) + if obj == nil { + return nil, err + } + + label := opts.LabelSelector + if label == nil { + label = labels.Everything() + } + list := &v1beta1.PodSecurityPolicyList{} + for _, item := range obj.(*v1beta1.PodSecurityPolicyList).Items { + if label.Matches(labels.Set(item.Labels)) { + list.Items = append(list.Items, item) + } + } + return list, err +} + +// Watch returns a watch.Interface that watches the requested podSecurityPolicies. +func (c *FakePodSecurityPolicies) Watch(opts api.ListOptions) (watch.Interface, error) { + return c.Fake. + InvokesWatch(core.NewRootWatchAction(podsecuritypoliciesResource, opts)) +} + +// Patch applies the patch and returns the patched podSecurityPolicy. +func (c *FakePodSecurityPolicies) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1beta1.PodSecurityPolicy, err error) { + obj, err := c.Fake. + Invokes(core.NewRootPatchSubresourceAction(podsecuritypoliciesResource, name, data, subresources...), &v1beta1.PodSecurityPolicy{}) + if obj == nil { + return nil, err + } + return obj.(*v1beta1.PodSecurityPolicy), err +} diff --git a/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/fake_replicaset.go b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/fake_replicaset.go new file mode 100644 index 00000000000..86d25529195 --- /dev/null +++ b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/fake_replicaset.go @@ -0,0 +1,127 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package fake + +import ( + api "k8s.io/kubernetes/pkg/api" + unversioned "k8s.io/kubernetes/pkg/api/unversioned" + v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + core "k8s.io/kubernetes/pkg/client/testing/core" + labels "k8s.io/kubernetes/pkg/labels" + watch "k8s.io/kubernetes/pkg/watch" +) + +// FakeReplicaSets implements ReplicaSetInterface +type FakeReplicaSets struct { + Fake *FakeExtensions + ns string +} + +var replicasetsResource = unversioned.GroupVersionResource{Group: "extensions", Version: "v1beta1", Resource: "replicasets"} + +func (c *FakeReplicaSets) Create(replicaSet *v1beta1.ReplicaSet) (result *v1beta1.ReplicaSet, err error) { + obj, err := c.Fake. + Invokes(core.NewCreateAction(replicasetsResource, c.ns, replicaSet), &v1beta1.ReplicaSet{}) + + if obj == nil { + return nil, err + } + return obj.(*v1beta1.ReplicaSet), err +} + +func (c *FakeReplicaSets) Update(replicaSet *v1beta1.ReplicaSet) (result *v1beta1.ReplicaSet, err error) { + obj, err := c.Fake. + Invokes(core.NewUpdateAction(replicasetsResource, c.ns, replicaSet), &v1beta1.ReplicaSet{}) + + if obj == nil { + return nil, err + } + return obj.(*v1beta1.ReplicaSet), err +} + +func (c *FakeReplicaSets) UpdateStatus(replicaSet *v1beta1.ReplicaSet) (*v1beta1.ReplicaSet, error) { + obj, err := c.Fake. + Invokes(core.NewUpdateSubresourceAction(replicasetsResource, "status", c.ns, replicaSet), &v1beta1.ReplicaSet{}) + + if obj == nil { + return nil, err + } + return obj.(*v1beta1.ReplicaSet), err +} + +func (c *FakeReplicaSets) Delete(name string, options *api.DeleteOptions) error { + _, err := c.Fake. + Invokes(core.NewDeleteAction(replicasetsResource, c.ns, name), &v1beta1.ReplicaSet{}) + + return err +} + +func (c *FakeReplicaSets) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error { + action := core.NewDeleteCollectionAction(replicasetsResource, c.ns, listOptions) + + _, err := c.Fake.Invokes(action, &v1beta1.ReplicaSetList{}) + return err +} + +func (c *FakeReplicaSets) Get(name string) (result *v1beta1.ReplicaSet, err error) { + obj, err := c.Fake. + Invokes(core.NewGetAction(replicasetsResource, c.ns, name), &v1beta1.ReplicaSet{}) + + if obj == nil { + return nil, err + } + return obj.(*v1beta1.ReplicaSet), err +} + +func (c *FakeReplicaSets) List(opts api.ListOptions) (result *v1beta1.ReplicaSetList, err error) { + obj, err := c.Fake. + Invokes(core.NewListAction(replicasetsResource, c.ns, opts), &v1beta1.ReplicaSetList{}) + + if obj == nil { + return nil, err + } + + label := opts.LabelSelector + if label == nil { + label = labels.Everything() + } + list := &v1beta1.ReplicaSetList{} + for _, item := range obj.(*v1beta1.ReplicaSetList).Items { + if label.Matches(labels.Set(item.Labels)) { + list.Items = append(list.Items, item) + } + } + return list, err +} + +// Watch returns a watch.Interface that watches the requested replicaSets. +func (c *FakeReplicaSets) Watch(opts api.ListOptions) (watch.Interface, error) { + return c.Fake. + InvokesWatch(core.NewWatchAction(replicasetsResource, c.ns, opts)) + +} + +// Patch applies the patch and returns the patched replicaSet. +func (c *FakeReplicaSets) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1beta1.ReplicaSet, err error) { + obj, err := c.Fake. + Invokes(core.NewPatchSubresourceAction(replicasetsResource, c.ns, name, data, subresources...), &v1beta1.ReplicaSet{}) + + if obj == nil { + return nil, err + } + return obj.(*v1beta1.ReplicaSet), err +} diff --git a/pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/fake/fake_scale.go b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/fake_scale.go similarity index 100% rename from pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/fake/fake_scale.go rename to pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/fake_scale.go diff --git a/pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/fake/fake_scale_expansion.go b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/fake_scale_expansion.go similarity index 100% rename from pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/fake/fake_scale_expansion.go rename to pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/fake_scale_expansion.go diff --git a/pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/fake/fake_thirdpartyresource.go b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/fake_thirdpartyresource.go similarity index 88% rename from pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/fake/fake_thirdpartyresource.go rename to pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/fake_thirdpartyresource.go index 83b117c62e9..a3a6a91c0c7 100644 --- a/pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/fake/fake_thirdpartyresource.go +++ b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/fake_thirdpartyresource.go @@ -35,7 +35,6 @@ var thirdpartyresourcesResource = unversioned.GroupVersionResource{Group: "exten func (c *FakeThirdPartyResources) Create(thirdPartyResource *v1beta1.ThirdPartyResource) (result *v1beta1.ThirdPartyResource, err error) { obj, err := c.Fake. Invokes(core.NewRootCreateAction(thirdpartyresourcesResource, thirdPartyResource), &v1beta1.ThirdPartyResource{}) - if obj == nil { return nil, err } @@ -45,7 +44,6 @@ func (c *FakeThirdPartyResources) Create(thirdPartyResource *v1beta1.ThirdPartyR func (c *FakeThirdPartyResources) Update(thirdPartyResource *v1beta1.ThirdPartyResource) (result *v1beta1.ThirdPartyResource, err error) { obj, err := c.Fake. Invokes(core.NewRootUpdateAction(thirdpartyresourcesResource, thirdPartyResource), &v1beta1.ThirdPartyResource{}) - if obj == nil { return nil, err } @@ -55,7 +53,6 @@ func (c *FakeThirdPartyResources) Update(thirdPartyResource *v1beta1.ThirdPartyR func (c *FakeThirdPartyResources) Delete(name string, options *api.DeleteOptions) error { _, err := c.Fake. Invokes(core.NewRootDeleteAction(thirdpartyresourcesResource, name), &v1beta1.ThirdPartyResource{}) - return err } @@ -69,7 +66,6 @@ func (c *FakeThirdPartyResources) DeleteCollection(options *api.DeleteOptions, l func (c *FakeThirdPartyResources) Get(name string) (result *v1beta1.ThirdPartyResource, err error) { obj, err := c.Fake. Invokes(core.NewRootGetAction(thirdpartyresourcesResource, name), &v1beta1.ThirdPartyResource{}) - if obj == nil { return nil, err } @@ -79,7 +75,6 @@ func (c *FakeThirdPartyResources) Get(name string) (result *v1beta1.ThirdPartyRe func (c *FakeThirdPartyResources) List(opts api.ListOptions) (result *v1beta1.ThirdPartyResourceList, err error) { obj, err := c.Fake. Invokes(core.NewRootListAction(thirdpartyresourcesResource, opts), &v1beta1.ThirdPartyResourceList{}) - if obj == nil { return nil, err } @@ -101,5 +96,14 @@ func (c *FakeThirdPartyResources) List(opts api.ListOptions) (result *v1beta1.Th func (c *FakeThirdPartyResources) Watch(opts api.ListOptions) (watch.Interface, error) { return c.Fake. InvokesWatch(core.NewRootWatchAction(thirdpartyresourcesResource, opts)) - +} + +// Patch applies the patch and returns the patched thirdPartyResource. +func (c *FakeThirdPartyResources) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1beta1.ThirdPartyResource, err error) { + obj, err := c.Fake. + Invokes(core.NewRootPatchSubresourceAction(thirdpartyresourcesResource, name, data, subresources...), &v1beta1.ThirdPartyResource{}) + if obj == nil { + return nil, err + } + return obj.(*v1beta1.ThirdPartyResource), err } diff --git a/pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/generated_expansion.go b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/generated_expansion.go similarity index 93% rename from pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/generated_expansion.go rename to pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/generated_expansion.go index b593b6d644e..60cf61d4b26 100644 --- a/pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/generated_expansion.go +++ b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/generated_expansion.go @@ -18,12 +18,12 @@ package v1beta1 type DaemonSetExpansion interface{} -type HorizontalPodAutoscalerExpansion interface{} - type IngressExpansion interface{} type JobExpansion interface{} -type ThirdPartyResourceExpansion interface{} +type PodSecurityPolicyExpansion interface{} type ReplicaSetExpansion interface{} + +type ThirdPartyResourceExpansion interface{} diff --git a/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/ingress.go b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/ingress.go new file mode 100644 index 00000000000..738c1edcd34 --- /dev/null +++ b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/ingress.go @@ -0,0 +1,165 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package v1beta1 + +import ( + api "k8s.io/kubernetes/pkg/api" + v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + watch "k8s.io/kubernetes/pkg/watch" +) + +// IngressesGetter has a method to return a IngressInterface. +// A group's client should implement this interface. +type IngressesGetter interface { + Ingresses(namespace string) IngressInterface +} + +// IngressInterface has methods to work with Ingress resources. +type IngressInterface interface { + Create(*v1beta1.Ingress) (*v1beta1.Ingress, error) + Update(*v1beta1.Ingress) (*v1beta1.Ingress, error) + UpdateStatus(*v1beta1.Ingress) (*v1beta1.Ingress, error) + Delete(name string, options *api.DeleteOptions) error + DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error + Get(name string) (*v1beta1.Ingress, error) + List(opts api.ListOptions) (*v1beta1.IngressList, error) + Watch(opts api.ListOptions) (watch.Interface, error) + Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1beta1.Ingress, err error) + IngressExpansion +} + +// ingresses implements IngressInterface +type ingresses struct { + client *ExtensionsClient + ns string +} + +// newIngresses returns a Ingresses +func newIngresses(c *ExtensionsClient, namespace string) *ingresses { + return &ingresses{ + client: c, + ns: namespace, + } +} + +// Create takes the representation of a ingress and creates it. Returns the server's representation of the ingress, and an error, if there is any. +func (c *ingresses) Create(ingress *v1beta1.Ingress) (result *v1beta1.Ingress, err error) { + result = &v1beta1.Ingress{} + err = c.client.Post(). + Namespace(c.ns). + Resource("ingresses"). + Body(ingress). + Do(). + Into(result) + return +} + +// Update takes the representation of a ingress and updates it. Returns the server's representation of the ingress, and an error, if there is any. +func (c *ingresses) Update(ingress *v1beta1.Ingress) (result *v1beta1.Ingress, err error) { + result = &v1beta1.Ingress{} + err = c.client.Put(). + Namespace(c.ns). + Resource("ingresses"). + Name(ingress.Name). + Body(ingress). + Do(). + Into(result) + return +} + +func (c *ingresses) UpdateStatus(ingress *v1beta1.Ingress) (result *v1beta1.Ingress, err error) { + result = &v1beta1.Ingress{} + err = c.client.Put(). + Namespace(c.ns). + Resource("ingresses"). + Name(ingress.Name). + SubResource("status"). + Body(ingress). + Do(). + Into(result) + return +} + +// Delete takes name of the ingress and deletes it. Returns an error if one occurs. +func (c *ingresses) Delete(name string, options *api.DeleteOptions) error { + return c.client.Delete(). + Namespace(c.ns). + Resource("ingresses"). + Name(name). + Body(options). + Do(). + Error() +} + +// DeleteCollection deletes a collection of objects. +func (c *ingresses) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error { + return c.client.Delete(). + Namespace(c.ns). + Resource("ingresses"). + VersionedParams(&listOptions, api.ParameterCodec). + Body(options). + Do(). + Error() +} + +// 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) (result *v1beta1.Ingress, err error) { + result = &v1beta1.Ingress{} + err = c.client.Get(). + Namespace(c.ns). + Resource("ingresses"). + Name(name). + Do(). + Into(result) + return +} + +// List takes label and field selectors, and returns the list of Ingresses that match those selectors. +func (c *ingresses) List(opts api.ListOptions) (result *v1beta1.IngressList, err error) { + result = &v1beta1.IngressList{} + err = c.client.Get(). + Namespace(c.ns). + Resource("ingresses"). + VersionedParams(&opts, api.ParameterCodec). + Do(). + Into(result) + return +} + +// Watch returns a watch.Interface that watches the requested ingresses. +func (c *ingresses) Watch(opts api.ListOptions) (watch.Interface, error) { + return c.client.Get(). + Prefix("watch"). + Namespace(c.ns). + Resource("ingresses"). + VersionedParams(&opts, api.ParameterCodec). + Watch() +} + +// Patch applies the patch and returns the patched ingress. +func (c *ingresses) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1beta1.Ingress, err error) { + result = &v1beta1.Ingress{} + err = c.client.Patch(pt). + Namespace(c.ns). + Resource("ingresses"). + SubResource(subresources...). + Name(name). + Body(data). + Do(). + Into(result) + return +} diff --git a/pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/job.go b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/job.go similarity index 89% rename from pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/job.go rename to pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/job.go index f40d4c3e333..a4e26185176 100644 --- a/pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/job.go +++ b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/job.go @@ -38,6 +38,7 @@ type JobInterface interface { Get(name string) (*v1beta1.Job, error) List(opts api.ListOptions) (*v1beta1.JobList, error) Watch(opts api.ListOptions) (watch.Interface, error) + Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1beta1.Job, err error) JobExpansion } @@ -148,3 +149,17 @@ func (c *jobs) Watch(opts api.ListOptions) (watch.Interface, error) { VersionedParams(&opts, api.ParameterCodec). Watch() } + +// Patch applies the patch and returns the patched job. +func (c *jobs) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1beta1.Job, err error) { + result = &v1beta1.Job{} + err = c.client.Patch(pt). + Namespace(c.ns). + Resource("jobs"). + SubResource(subresources...). + Name(name). + Body(data). + Do(). + Into(result) + return +} diff --git a/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/podsecuritypolicy.go b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/podsecuritypolicy.go new file mode 100644 index 00000000000..db7d24c3c63 --- /dev/null +++ b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/podsecuritypolicy.go @@ -0,0 +1,141 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package v1beta1 + +import ( + api "k8s.io/kubernetes/pkg/api" + v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + watch "k8s.io/kubernetes/pkg/watch" +) + +// PodSecurityPoliciesGetter has a method to return a PodSecurityPolicyInterface. +// A group's client should implement this interface. +type PodSecurityPoliciesGetter interface { + PodSecurityPolicies() PodSecurityPolicyInterface +} + +// PodSecurityPolicyInterface has methods to work with PodSecurityPolicy resources. +type PodSecurityPolicyInterface interface { + Create(*v1beta1.PodSecurityPolicy) (*v1beta1.PodSecurityPolicy, error) + Update(*v1beta1.PodSecurityPolicy) (*v1beta1.PodSecurityPolicy, error) + Delete(name string, options *api.DeleteOptions) error + DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error + Get(name string) (*v1beta1.PodSecurityPolicy, error) + List(opts api.ListOptions) (*v1beta1.PodSecurityPolicyList, error) + Watch(opts api.ListOptions) (watch.Interface, error) + Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1beta1.PodSecurityPolicy, err error) + PodSecurityPolicyExpansion +} + +// podSecurityPolicies implements PodSecurityPolicyInterface +type podSecurityPolicies struct { + client *ExtensionsClient +} + +// newPodSecurityPolicies returns a PodSecurityPolicies +func newPodSecurityPolicies(c *ExtensionsClient) *podSecurityPolicies { + return &podSecurityPolicies{ + client: c, + } +} + +// Create takes the representation of a podSecurityPolicy and creates it. Returns the server's representation of the podSecurityPolicy, and an error, if there is any. +func (c *podSecurityPolicies) Create(podSecurityPolicy *v1beta1.PodSecurityPolicy) (result *v1beta1.PodSecurityPolicy, err error) { + result = &v1beta1.PodSecurityPolicy{} + err = c.client.Post(). + Resource("podsecuritypolicies"). + Body(podSecurityPolicy). + Do(). + Into(result) + return +} + +// Update takes the representation of a podSecurityPolicy and updates it. Returns the server's representation of the podSecurityPolicy, and an error, if there is any. +func (c *podSecurityPolicies) Update(podSecurityPolicy *v1beta1.PodSecurityPolicy) (result *v1beta1.PodSecurityPolicy, err error) { + result = &v1beta1.PodSecurityPolicy{} + err = c.client.Put(). + Resource("podsecuritypolicies"). + Name(podSecurityPolicy.Name). + Body(podSecurityPolicy). + Do(). + Into(result) + return +} + +// Delete takes name of the podSecurityPolicy and deletes it. Returns an error if one occurs. +func (c *podSecurityPolicies) Delete(name string, options *api.DeleteOptions) error { + return c.client.Delete(). + Resource("podsecuritypolicies"). + Name(name). + Body(options). + Do(). + Error() +} + +// DeleteCollection deletes a collection of objects. +func (c *podSecurityPolicies) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error { + return c.client.Delete(). + Resource("podsecuritypolicies"). + VersionedParams(&listOptions, api.ParameterCodec). + Body(options). + Do(). + Error() +} + +// 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) (result *v1beta1.PodSecurityPolicy, err error) { + result = &v1beta1.PodSecurityPolicy{} + err = c.client.Get(). + Resource("podsecuritypolicies"). + Name(name). + Do(). + Into(result) + return +} + +// List takes label and field selectors, and returns the list of PodSecurityPolicies that match those selectors. +func (c *podSecurityPolicies) List(opts api.ListOptions) (result *v1beta1.PodSecurityPolicyList, err error) { + result = &v1beta1.PodSecurityPolicyList{} + err = c.client.Get(). + Resource("podsecuritypolicies"). + VersionedParams(&opts, api.ParameterCodec). + Do(). + Into(result) + return +} + +// Watch returns a watch.Interface that watches the requested podSecurityPolicies. +func (c *podSecurityPolicies) Watch(opts api.ListOptions) (watch.Interface, error) { + return c.client.Get(). + Prefix("watch"). + Resource("podsecuritypolicies"). + VersionedParams(&opts, api.ParameterCodec). + Watch() +} + +// Patch applies the patch and returns the patched podSecurityPolicy. +func (c *podSecurityPolicies) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1beta1.PodSecurityPolicy, err error) { + result = &v1beta1.PodSecurityPolicy{} + err = c.client.Patch(pt). + Resource("podsecuritypolicies"). + SubResource(subresources...). + Name(name). + Body(data). + Do(). + Into(result) + return +} diff --git a/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/replicaset.go b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/replicaset.go new file mode 100644 index 00000000000..54330156571 --- /dev/null +++ b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/replicaset.go @@ -0,0 +1,165 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package v1beta1 + +import ( + api "k8s.io/kubernetes/pkg/api" + v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + watch "k8s.io/kubernetes/pkg/watch" +) + +// ReplicaSetsGetter has a method to return a ReplicaSetInterface. +// A group's client should implement this interface. +type ReplicaSetsGetter interface { + ReplicaSets(namespace string) ReplicaSetInterface +} + +// ReplicaSetInterface has methods to work with ReplicaSet resources. +type ReplicaSetInterface interface { + Create(*v1beta1.ReplicaSet) (*v1beta1.ReplicaSet, error) + Update(*v1beta1.ReplicaSet) (*v1beta1.ReplicaSet, error) + UpdateStatus(*v1beta1.ReplicaSet) (*v1beta1.ReplicaSet, error) + Delete(name string, options *api.DeleteOptions) error + DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error + Get(name string) (*v1beta1.ReplicaSet, error) + List(opts api.ListOptions) (*v1beta1.ReplicaSetList, error) + Watch(opts api.ListOptions) (watch.Interface, error) + Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1beta1.ReplicaSet, err error) + ReplicaSetExpansion +} + +// replicaSets implements ReplicaSetInterface +type replicaSets struct { + client *ExtensionsClient + ns string +} + +// newReplicaSets returns a ReplicaSets +func newReplicaSets(c *ExtensionsClient, namespace string) *replicaSets { + return &replicaSets{ + client: c, + ns: namespace, + } +} + +// Create takes the representation of a replicaSet and creates it. Returns the server's representation of the replicaSet, and an error, if there is any. +func (c *replicaSets) Create(replicaSet *v1beta1.ReplicaSet) (result *v1beta1.ReplicaSet, err error) { + result = &v1beta1.ReplicaSet{} + err = c.client.Post(). + Namespace(c.ns). + Resource("replicasets"). + Body(replicaSet). + Do(). + Into(result) + return +} + +// Update takes the representation of a replicaSet and updates it. Returns the server's representation of the replicaSet, and an error, if there is any. +func (c *replicaSets) Update(replicaSet *v1beta1.ReplicaSet) (result *v1beta1.ReplicaSet, err error) { + result = &v1beta1.ReplicaSet{} + err = c.client.Put(). + Namespace(c.ns). + Resource("replicasets"). + Name(replicaSet.Name). + Body(replicaSet). + Do(). + Into(result) + return +} + +func (c *replicaSets) UpdateStatus(replicaSet *v1beta1.ReplicaSet) (result *v1beta1.ReplicaSet, err error) { + result = &v1beta1.ReplicaSet{} + err = c.client.Put(). + Namespace(c.ns). + Resource("replicasets"). + Name(replicaSet.Name). + SubResource("status"). + Body(replicaSet). + Do(). + Into(result) + return +} + +// Delete takes name of the replicaSet and deletes it. Returns an error if one occurs. +func (c *replicaSets) Delete(name string, options *api.DeleteOptions) error { + return c.client.Delete(). + Namespace(c.ns). + Resource("replicasets"). + Name(name). + Body(options). + Do(). + Error() +} + +// DeleteCollection deletes a collection of objects. +func (c *replicaSets) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error { + return c.client.Delete(). + Namespace(c.ns). + Resource("replicasets"). + VersionedParams(&listOptions, api.ParameterCodec). + Body(options). + Do(). + Error() +} + +// 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) (result *v1beta1.ReplicaSet, err error) { + result = &v1beta1.ReplicaSet{} + err = c.client.Get(). + Namespace(c.ns). + Resource("replicasets"). + Name(name). + Do(). + Into(result) + return +} + +// List takes label and field selectors, and returns the list of ReplicaSets that match those selectors. +func (c *replicaSets) List(opts api.ListOptions) (result *v1beta1.ReplicaSetList, err error) { + result = &v1beta1.ReplicaSetList{} + err = c.client.Get(). + Namespace(c.ns). + Resource("replicasets"). + VersionedParams(&opts, api.ParameterCodec). + Do(). + Into(result) + return +} + +// Watch returns a watch.Interface that watches the requested replicaSets. +func (c *replicaSets) Watch(opts api.ListOptions) (watch.Interface, error) { + return c.client.Get(). + Prefix("watch"). + Namespace(c.ns). + Resource("replicasets"). + VersionedParams(&opts, api.ParameterCodec). + Watch() +} + +// Patch applies the patch and returns the patched replicaSet. +func (c *replicaSets) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1beta1.ReplicaSet, err error) { + result = &v1beta1.ReplicaSet{} + err = c.client.Patch(pt). + Namespace(c.ns). + Resource("replicasets"). + SubResource(subresources...). + Name(name). + Body(data). + Do(). + Into(result) + return +} diff --git a/pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/scale.go b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/scale.go similarity index 100% rename from pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/scale.go rename to pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/scale.go diff --git a/pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/scale_expansion.go b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/scale_expansion.go similarity index 100% rename from pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/scale_expansion.go rename to pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/scale_expansion.go diff --git a/pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/thirdpartyresource.go b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/thirdpartyresource.go similarity index 89% rename from pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/thirdpartyresource.go rename to pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/thirdpartyresource.go index 1c9221c6755..421a48c409a 100644 --- a/pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/thirdpartyresource.go +++ b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/thirdpartyresource.go @@ -37,6 +37,7 @@ type ThirdPartyResourceInterface interface { Get(name string) (*v1beta1.ThirdPartyResource, error) List(opts api.ListOptions) (*v1beta1.ThirdPartyResourceList, error) Watch(opts api.ListOptions) (watch.Interface, error) + Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1beta1.ThirdPartyResource, err error) ThirdPartyResourceExpansion } @@ -125,3 +126,16 @@ func (c *thirdPartyResources) Watch(opts api.ListOptions) (watch.Interface, erro VersionedParams(&opts, api.ParameterCodec). Watch() } + +// Patch applies the patch and returns the patched thirdPartyResource. +func (c *thirdPartyResources) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1beta1.ThirdPartyResource, err error) { + result = &v1beta1.ThirdPartyResource{} + err = c.client.Patch(pt). + Resource("thirdpartyresources"). + SubResource(subresources...). + Name(name). + Body(data). + Do(). + Into(result) + return +} diff --git a/pkg/client/clientset_generated/release_1_5/typed/policy/v1alpha1/doc.go b/pkg/client/clientset_generated/release_1_5/typed/policy/v1alpha1/doc.go new file mode 100644 index 00000000000..6035018e232 --- /dev/null +++ b/pkg/client/clientset_generated/release_1_5/typed/policy/v1alpha1/doc.go @@ -0,0 +1,20 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,authorization/v1beta1,autoscaling/v1,batch/v1,extensions/v1beta1,policy/v1alpha1] + +// This package has the automatically generated typed clients. +package v1alpha1 diff --git a/pkg/client/clientset_generated/release_1_5/typed/policy/v1alpha1/fake/doc.go b/pkg/client/clientset_generated/release_1_5/typed/policy/v1alpha1/fake/doc.go new file mode 100644 index 00000000000..793bddf23ce --- /dev/null +++ b/pkg/client/clientset_generated/release_1_5/typed/policy/v1alpha1/fake/doc.go @@ -0,0 +1,20 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,authorization/v1beta1,autoscaling/v1,batch/v1,extensions/v1beta1,policy/v1alpha1] + +// Package fake has the automatically generated clients. +package fake diff --git a/pkg/client/clientset_generated/release_1_5/typed/policy/v1alpha1/fake/fake_poddisruptionbudget.go b/pkg/client/clientset_generated/release_1_5/typed/policy/v1alpha1/fake/fake_poddisruptionbudget.go new file mode 100644 index 00000000000..0fdf2d585da --- /dev/null +++ b/pkg/client/clientset_generated/release_1_5/typed/policy/v1alpha1/fake/fake_poddisruptionbudget.go @@ -0,0 +1,127 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package fake + +import ( + api "k8s.io/kubernetes/pkg/api" + unversioned "k8s.io/kubernetes/pkg/api/unversioned" + v1alpha1 "k8s.io/kubernetes/pkg/apis/policy/v1alpha1" + core "k8s.io/kubernetes/pkg/client/testing/core" + labels "k8s.io/kubernetes/pkg/labels" + watch "k8s.io/kubernetes/pkg/watch" +) + +// FakePodDisruptionBudgets implements PodDisruptionBudgetInterface +type FakePodDisruptionBudgets struct { + Fake *FakePolicy + ns string +} + +var poddisruptionbudgetsResource = unversioned.GroupVersionResource{Group: "policy", Version: "v1alpha1", Resource: "poddisruptionbudgets"} + +func (c *FakePodDisruptionBudgets) Create(podDisruptionBudget *v1alpha1.PodDisruptionBudget) (result *v1alpha1.PodDisruptionBudget, err error) { + obj, err := c.Fake. + Invokes(core.NewCreateAction(poddisruptionbudgetsResource, c.ns, podDisruptionBudget), &v1alpha1.PodDisruptionBudget{}) + + if obj == nil { + return nil, err + } + return obj.(*v1alpha1.PodDisruptionBudget), err +} + +func (c *FakePodDisruptionBudgets) Update(podDisruptionBudget *v1alpha1.PodDisruptionBudget) (result *v1alpha1.PodDisruptionBudget, err error) { + obj, err := c.Fake. + Invokes(core.NewUpdateAction(poddisruptionbudgetsResource, c.ns, podDisruptionBudget), &v1alpha1.PodDisruptionBudget{}) + + if obj == nil { + return nil, err + } + return obj.(*v1alpha1.PodDisruptionBudget), err +} + +func (c *FakePodDisruptionBudgets) UpdateStatus(podDisruptionBudget *v1alpha1.PodDisruptionBudget) (*v1alpha1.PodDisruptionBudget, error) { + obj, err := c.Fake. + Invokes(core.NewUpdateSubresourceAction(poddisruptionbudgetsResource, "status", c.ns, podDisruptionBudget), &v1alpha1.PodDisruptionBudget{}) + + if obj == nil { + return nil, err + } + return obj.(*v1alpha1.PodDisruptionBudget), err +} + +func (c *FakePodDisruptionBudgets) Delete(name string, options *api.DeleteOptions) error { + _, err := c.Fake. + Invokes(core.NewDeleteAction(poddisruptionbudgetsResource, c.ns, name), &v1alpha1.PodDisruptionBudget{}) + + return err +} + +func (c *FakePodDisruptionBudgets) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error { + action := core.NewDeleteCollectionAction(poddisruptionbudgetsResource, c.ns, listOptions) + + _, err := c.Fake.Invokes(action, &v1alpha1.PodDisruptionBudgetList{}) + return err +} + +func (c *FakePodDisruptionBudgets) Get(name string) (result *v1alpha1.PodDisruptionBudget, err error) { + obj, err := c.Fake. + Invokes(core.NewGetAction(poddisruptionbudgetsResource, c.ns, name), &v1alpha1.PodDisruptionBudget{}) + + if obj == nil { + return nil, err + } + return obj.(*v1alpha1.PodDisruptionBudget), err +} + +func (c *FakePodDisruptionBudgets) List(opts api.ListOptions) (result *v1alpha1.PodDisruptionBudgetList, err error) { + obj, err := c.Fake. + Invokes(core.NewListAction(poddisruptionbudgetsResource, c.ns, opts), &v1alpha1.PodDisruptionBudgetList{}) + + if obj == nil { + return nil, err + } + + label := opts.LabelSelector + if label == nil { + label = labels.Everything() + } + list := &v1alpha1.PodDisruptionBudgetList{} + for _, item := range obj.(*v1alpha1.PodDisruptionBudgetList).Items { + if label.Matches(labels.Set(item.Labels)) { + list.Items = append(list.Items, item) + } + } + return list, err +} + +// Watch returns a watch.Interface that watches the requested podDisruptionBudgets. +func (c *FakePodDisruptionBudgets) Watch(opts api.ListOptions) (watch.Interface, error) { + return c.Fake. + InvokesWatch(core.NewWatchAction(poddisruptionbudgetsResource, c.ns, opts)) + +} + +// Patch applies the patch and returns the patched podDisruptionBudget. +func (c *FakePodDisruptionBudgets) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1alpha1.PodDisruptionBudget, err error) { + obj, err := c.Fake. + Invokes(core.NewPatchSubresourceAction(poddisruptionbudgetsResource, c.ns, name, data, subresources...), &v1alpha1.PodDisruptionBudget{}) + + if obj == nil { + return nil, err + } + return obj.(*v1alpha1.PodDisruptionBudget), err +} diff --git a/pkg/client/clientset_generated/release_1_5/typed/policy/v1alpha1/fake/fake_policy_client.go b/pkg/client/clientset_generated/release_1_5/typed/policy/v1alpha1/fake/fake_policy_client.go new file mode 100644 index 00000000000..bc8eba9b185 --- /dev/null +++ b/pkg/client/clientset_generated/release_1_5/typed/policy/v1alpha1/fake/fake_policy_client.go @@ -0,0 +1,37 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package fake + +import ( + v1alpha1 "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/policy/v1alpha1" + restclient "k8s.io/kubernetes/pkg/client/restclient" + core "k8s.io/kubernetes/pkg/client/testing/core" +) + +type FakePolicy struct { + *core.Fake +} + +func (c *FakePolicy) PodDisruptionBudgets(namespace string) v1alpha1.PodDisruptionBudgetInterface { + return &FakePodDisruptionBudgets{c, namespace} +} + +// GetRESTClient returns a RESTClient that is used to communicate +// with API server by this client implementation. +func (c *FakePolicy) GetRESTClient() *restclient.RESTClient { + return nil +} diff --git a/pkg/client/clientset_generated/release_1_5/typed/policy/v1alpha1/generated_expansion.go b/pkg/client/clientset_generated/release_1_5/typed/policy/v1alpha1/generated_expansion.go new file mode 100644 index 00000000000..a2e74c84dff --- /dev/null +++ b/pkg/client/clientset_generated/release_1_5/typed/policy/v1alpha1/generated_expansion.go @@ -0,0 +1,19 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package v1alpha1 + +type PodDisruptionBudgetExpansion interface{} diff --git a/pkg/client/clientset_generated/release_1_5/typed/policy/v1alpha1/poddisruptionbudget.go b/pkg/client/clientset_generated/release_1_5/typed/policy/v1alpha1/poddisruptionbudget.go new file mode 100644 index 00000000000..d9851b51b86 --- /dev/null +++ b/pkg/client/clientset_generated/release_1_5/typed/policy/v1alpha1/poddisruptionbudget.go @@ -0,0 +1,165 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package v1alpha1 + +import ( + api "k8s.io/kubernetes/pkg/api" + v1alpha1 "k8s.io/kubernetes/pkg/apis/policy/v1alpha1" + watch "k8s.io/kubernetes/pkg/watch" +) + +// PodDisruptionBudgetsGetter has a method to return a PodDisruptionBudgetInterface. +// A group's client should implement this interface. +type PodDisruptionBudgetsGetter interface { + PodDisruptionBudgets(namespace string) PodDisruptionBudgetInterface +} + +// PodDisruptionBudgetInterface has methods to work with PodDisruptionBudget resources. +type PodDisruptionBudgetInterface interface { + Create(*v1alpha1.PodDisruptionBudget) (*v1alpha1.PodDisruptionBudget, error) + Update(*v1alpha1.PodDisruptionBudget) (*v1alpha1.PodDisruptionBudget, error) + UpdateStatus(*v1alpha1.PodDisruptionBudget) (*v1alpha1.PodDisruptionBudget, error) + Delete(name string, options *api.DeleteOptions) error + DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error + Get(name string) (*v1alpha1.PodDisruptionBudget, error) + List(opts api.ListOptions) (*v1alpha1.PodDisruptionBudgetList, error) + Watch(opts api.ListOptions) (watch.Interface, error) + Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1alpha1.PodDisruptionBudget, err error) + PodDisruptionBudgetExpansion +} + +// podDisruptionBudgets implements PodDisruptionBudgetInterface +type podDisruptionBudgets struct { + client *PolicyClient + ns string +} + +// newPodDisruptionBudgets returns a PodDisruptionBudgets +func newPodDisruptionBudgets(c *PolicyClient, namespace string) *podDisruptionBudgets { + return &podDisruptionBudgets{ + client: c, + ns: namespace, + } +} + +// Create takes the representation of a podDisruptionBudget and creates it. Returns the server's representation of the podDisruptionBudget, and an error, if there is any. +func (c *podDisruptionBudgets) Create(podDisruptionBudget *v1alpha1.PodDisruptionBudget) (result *v1alpha1.PodDisruptionBudget, err error) { + result = &v1alpha1.PodDisruptionBudget{} + err = c.client.Post(). + Namespace(c.ns). + Resource("poddisruptionbudgets"). + Body(podDisruptionBudget). + Do(). + Into(result) + return +} + +// Update takes the representation of a podDisruptionBudget and updates it. Returns the server's representation of the podDisruptionBudget, and an error, if there is any. +func (c *podDisruptionBudgets) Update(podDisruptionBudget *v1alpha1.PodDisruptionBudget) (result *v1alpha1.PodDisruptionBudget, err error) { + result = &v1alpha1.PodDisruptionBudget{} + err = c.client.Put(). + Namespace(c.ns). + Resource("poddisruptionbudgets"). + Name(podDisruptionBudget.Name). + Body(podDisruptionBudget). + Do(). + Into(result) + return +} + +func (c *podDisruptionBudgets) UpdateStatus(podDisruptionBudget *v1alpha1.PodDisruptionBudget) (result *v1alpha1.PodDisruptionBudget, err error) { + result = &v1alpha1.PodDisruptionBudget{} + err = c.client.Put(). + Namespace(c.ns). + Resource("poddisruptionbudgets"). + Name(podDisruptionBudget.Name). + SubResource("status"). + Body(podDisruptionBudget). + Do(). + Into(result) + return +} + +// Delete takes name of the podDisruptionBudget and deletes it. Returns an error if one occurs. +func (c *podDisruptionBudgets) Delete(name string, options *api.DeleteOptions) error { + return c.client.Delete(). + Namespace(c.ns). + Resource("poddisruptionbudgets"). + Name(name). + Body(options). + Do(). + Error() +} + +// DeleteCollection deletes a collection of objects. +func (c *podDisruptionBudgets) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error { + return c.client.Delete(). + Namespace(c.ns). + Resource("poddisruptionbudgets"). + VersionedParams(&listOptions, api.ParameterCodec). + Body(options). + Do(). + Error() +} + +// 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) (result *v1alpha1.PodDisruptionBudget, err error) { + result = &v1alpha1.PodDisruptionBudget{} + err = c.client.Get(). + Namespace(c.ns). + Resource("poddisruptionbudgets"). + Name(name). + Do(). + Into(result) + return +} + +// List takes label and field selectors, and returns the list of PodDisruptionBudgets that match those selectors. +func (c *podDisruptionBudgets) List(opts api.ListOptions) (result *v1alpha1.PodDisruptionBudgetList, err error) { + result = &v1alpha1.PodDisruptionBudgetList{} + err = c.client.Get(). + Namespace(c.ns). + Resource("poddisruptionbudgets"). + VersionedParams(&opts, api.ParameterCodec). + Do(). + Into(result) + return +} + +// Watch returns a watch.Interface that watches the requested podDisruptionBudgets. +func (c *podDisruptionBudgets) Watch(opts api.ListOptions) (watch.Interface, error) { + return c.client.Get(). + Prefix("watch"). + Namespace(c.ns). + Resource("poddisruptionbudgets"). + VersionedParams(&opts, api.ParameterCodec). + Watch() +} + +// Patch applies the patch and returns the patched podDisruptionBudget. +func (c *podDisruptionBudgets) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1alpha1.PodDisruptionBudget, err error) { + result = &v1alpha1.PodDisruptionBudget{} + err = c.client.Patch(pt). + Namespace(c.ns). + Resource("poddisruptionbudgets"). + SubResource(subresources...). + Name(name). + Body(data). + Do(). + Into(result) + return +} diff --git a/pkg/client/clientset_generated/release_1_5/typed/policy/v1alpha1/policy_client.go b/pkg/client/clientset_generated/release_1_5/typed/policy/v1alpha1/policy_client.go new file mode 100644 index 00000000000..f8841b962b4 --- /dev/null +++ b/pkg/client/clientset_generated/release_1_5/typed/policy/v1alpha1/policy_client.go @@ -0,0 +1,96 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package v1alpha1 + +import ( + api "k8s.io/kubernetes/pkg/api" + registered "k8s.io/kubernetes/pkg/apimachinery/registered" + restclient "k8s.io/kubernetes/pkg/client/restclient" + serializer "k8s.io/kubernetes/pkg/runtime/serializer" +) + +type PolicyInterface interface { + GetRESTClient() *restclient.RESTClient + PodDisruptionBudgetsGetter +} + +// PolicyClient is used to interact with features provided by the Policy group. +type PolicyClient struct { + *restclient.RESTClient +} + +func (c *PolicyClient) PodDisruptionBudgets(namespace string) PodDisruptionBudgetInterface { + return newPodDisruptionBudgets(c, namespace) +} + +// NewForConfig creates a new PolicyClient for the given config. +func NewForConfig(c *restclient.Config) (*PolicyClient, error) { + config := *c + if err := setConfigDefaults(&config); err != nil { + return nil, err + } + client, err := restclient.RESTClientFor(&config) + if err != nil { + return nil, err + } + return &PolicyClient{client}, nil +} + +// NewForConfigOrDie creates a new PolicyClient for the given config and +// panics if there is an error in the config. +func NewForConfigOrDie(c *restclient.Config) *PolicyClient { + client, err := NewForConfig(c) + if err != nil { + panic(err) + } + return client +} + +// New creates a new PolicyClient for the given RESTClient. +func New(c *restclient.RESTClient) *PolicyClient { + return &PolicyClient{c} +} + +func setConfigDefaults(config *restclient.Config) error { + // if policy group is not registered, return an error + g, err := registered.Group("policy") + if err != nil { + return err + } + config.APIPath = "/apis" + if config.UserAgent == "" { + config.UserAgent = restclient.DefaultKubernetesUserAgent() + } + // TODO: Unconditionally set the config.Version, until we fix the config. + //if config.Version == "" { + copyGroupVersion := g.GroupVersion + config.GroupVersion = ©GroupVersion + //} + + config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: api.Codecs} + + return nil +} + +// GetRESTClient returns a RESTClient that is used to communicate +// with API server by this client implementation. +func (c *PolicyClient) GetRESTClient() *restclient.RESTClient { + if c == nil { + return nil + } + return c.RESTClient +} diff --git a/test/e2e/framework/framework.go b/test/e2e/framework/framework.go index aae2570d179..744699cbf6d 100644 --- a/test/e2e/framework/framework.go +++ b/test/e2e/framework/framework.go @@ -26,7 +26,7 @@ import ( "sync" "time" - release_1_4 "k8s.io/client-go/1.4/kubernetes" + staging "k8s.io/client-go/1.4/kubernetes" "k8s.io/client-go/1.4/pkg/util/sets" clientreporestclient "k8s.io/client-go/1.4/rest" "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_4" @@ -34,8 +34,7 @@ import ( apierrs "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/api/v1" - "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" - "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_3" + "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/client/typed/dynamic" client "k8s.io/kubernetes/pkg/client/unversioned" @@ -60,9 +59,8 @@ type Framework struct { BaseName string Client *client.Client - Clientset_1_2 *release_1_2.Clientset - Clientset_1_3 *release_1_3.Clientset - StagingClient *release_1_4.Clientset + Clientset_1_5 *release_1_5.Clientset + StagingClient *staging.Clientset ClientPool dynamic.ClientPool Namespace *api.Namespace // Every test has at least one namespace @@ -188,11 +186,10 @@ func (f *Framework) BeforeEach() { c, err := loadClientFromConfig(config) Expect(err).NotTo(HaveOccurred()) f.Client = c - f.Clientset_1_2, err = release_1_2.NewForConfig(config) - f.Clientset_1_3, err = release_1_3.NewForConfig(config) + f.Clientset_1_5, err = release_1_5.NewForConfig(config) Expect(err).NotTo(HaveOccurred()) clientRepoConfig := getClientRepoConfig(config) - f.StagingClient, err = release_1_4.NewForConfig(clientRepoConfig) + f.StagingClient, err = staging.NewForConfig(clientRepoConfig) Expect(err).NotTo(HaveOccurred()) f.ClientPool = dynamic.NewClientPool(config, dynamic.LegacyAPIPathResolverFunc) } diff --git a/test/e2e/garbage_collector.go b/test/e2e/garbage_collector.go index 322eb9e8f31..edc33eca072 100644 --- a/test/e2e/garbage_collector.go +++ b/test/e2e/garbage_collector.go @@ -23,7 +23,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/api/v1" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_3" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/metrics" "k8s.io/kubernetes/pkg/util/wait" "k8s.io/kubernetes/test/e2e/framework" @@ -118,7 +118,7 @@ func gatherMetrics(f *framework.Framework) { var _ = framework.KubeDescribe("Garbage collector", func() { f := framework.NewDefaultFramework("gc") It("[Feature:GarbageCollector] should delete pods created by rc when not orphaning", func() { - clientSet := f.Clientset_1_3 + clientSet := f.Clientset_1_5 rcClient := clientSet.Core().ReplicationControllers(f.Namespace.Name) podClient := clientSet.Core().Pods(f.Namespace.Name) rcName := "simpletest.rc" @@ -169,7 +169,7 @@ var _ = framework.KubeDescribe("Garbage collector", func() { }) It("[Feature:GarbageCollector] should orphan pods created by rc if delete options say so", func() { - clientSet := f.Clientset_1_3 + clientSet := f.Clientset_1_5 rcClient := clientSet.Core().ReplicationControllers(f.Namespace.Name) podClient := clientSet.Core().Pods(f.Namespace.Name) rcName := "simpletest.rc" @@ -231,7 +231,7 @@ var _ = framework.KubeDescribe("Garbage collector", func() { }) It("[Feature:GarbageCollector] should orphan pods created by rc if deleteOptions.OrphanDependents is nil", func() { - clientSet := f.Clientset_1_3 + clientSet := f.Clientset_1_5 rcClient := clientSet.Core().ReplicationControllers(f.Namespace.Name) podClient := clientSet.Core().Pods(f.Namespace.Name) rcName := "simpletest.rc" diff --git a/test/e2e/generated_clientset.go b/test/e2e/generated_clientset.go index 8027e40dcce..ac3d3dc98ff 100644 --- a/test/e2e/generated_clientset.go +++ b/test/e2e/generated_clientset.go @@ -119,84 +119,10 @@ func observeObjectDeletion(w watch.Interface) (obj runtime.Object) { return } -var _ = framework.KubeDescribe("Generated release_1_2 clientset", func() { +var _ = framework.KubeDescribe("Generated release_1_5 clientset", func() { f := framework.NewDefaultFramework("clientset") It("should create pods, delete pods, watch pods", func() { - podClient := f.Clientset_1_2.Core().Pods(f.Namespace.Name) - By("constructing the pod") - name := "pod" + string(uuid.NewUUID()) - value := strconv.Itoa(time.Now().Nanosecond()) - podCopy := testingPod(name, value) - pod := &podCopy - By("setting up watch") - selector := labels.SelectorFromSet(labels.Set(map[string]string{"time": value})) - options := api.ListOptions{LabelSelector: selector} - pods, err := podClient.List(options) - if err != nil { - framework.Failf("Failed to query for pods: %v", err) - } - Expect(len(pods.Items)).To(Equal(0)) - options = api.ListOptions{ - LabelSelector: selector, - ResourceVersion: pods.ListMeta.ResourceVersion, - } - w, err := podClient.Watch(options) - if err != nil { - framework.Failf("Failed to set up watch: %v", err) - } - - By("creating the pod") - pod, err = podClient.Create(pod) - if err != nil { - framework.Failf("Failed to create pod: %v", err) - } - // We call defer here in case there is a problem with - // the test so we can ensure that we clean up after - // ourselves - defer podClient.Delete(pod.Name, api.NewDeleteOptions(0)) - - By("verifying the pod is in kubernetes") - options = api.ListOptions{ - LabelSelector: selector, - ResourceVersion: pod.ResourceVersion, - } - pods, err = podClient.List(options) - if err != nil { - framework.Failf("Failed to query for pods: %v", err) - } - Expect(len(pods.Items)).To(Equal(1)) - - By("verifying pod creation was observed") - observePodCreation(w) - - // We need to wait for the pod to be scheduled, otherwise the deletion - // will be carried out immediately rather than gracefully. - framework.ExpectNoError(f.WaitForPodRunning(pod.Name)) - - By("deleting the pod gracefully") - if err := podClient.Delete(pod.Name, api.NewDeleteOptions(30)); err != nil { - framework.Failf("Failed to delete pod: %v", err) - } - - By("verifying pod deletion was observed") - obj := observeObjectDeletion(w) - lastPod := obj.(*api.Pod) - Expect(lastPod.DeletionTimestamp).ToNot(BeNil()) - Expect(lastPod.Spec.TerminationGracePeriodSeconds).ToNot(BeZero()) - - options = api.ListOptions{LabelSelector: selector} - pods, err = podClient.List(options) - if err != nil { - framework.Failf("Failed to list pods to verify deletion: %v", err) - } - Expect(len(pods.Items)).To(Equal(0)) - }) -}) - -var _ = framework.KubeDescribe("Generated release_1_3 clientset", func() { - f := framework.NewDefaultFramework("clientset") - It("should create pods, delete pods, watch pods", func() { - podClient := f.Clientset_1_3.Core().Pods(f.Namespace.Name) + podClient := f.Clientset_1_5.Core().Pods(f.Namespace.Name) By("constructing the pod") name := "pod" + string(uuid.NewUUID()) value := strconv.Itoa(time.Now().Nanosecond())