From bc0662b3e9bee5f8622ef52845ebe51f38da37ad Mon Sep 17 00:00:00 2001 From: Chao Xu Date: Fri, 8 Apr 2016 12:31:25 -0700 Subject: [PATCH] generated changes --- .../test_internalclientset/clientset.go | 2 +- .../unversioned/doc.go | 0 .../unversioned/generated_expansion.go | 0 .../unversioned/testgroup_client.go | 2 +- .../unversioned/testtype.go | 32 +++++++++---------- .../unversioned/testtype_expansion.go | 0 6 files changed, 18 insertions(+), 18 deletions(-) rename cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/{testgroup => testgroup.k8s.io}/unversioned/doc.go (100%) rename cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/{testgroup => testgroup.k8s.io}/unversioned/generated_expansion.go (100%) rename cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/{testgroup => testgroup.k8s.io}/unversioned/testgroup_client.go (98%) rename cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/{testgroup => testgroup.k8s.io}/unversioned/testtype.go (76%) rename cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/{testgroup => testgroup.k8s.io}/unversioned/testtype_expansion.go (100%) diff --git a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/clientset.go b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/clientset.go index a10eef661e..4a6c17d313 100644 --- a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/clientset.go +++ b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/clientset.go @@ -18,7 +18,7 @@ package test_internalclientset import ( "github.com/golang/glog" - unversionedtestgroup "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/unversioned" + unversionedtestgroup "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned" restclient "k8s.io/kubernetes/pkg/client/restclient" discovery "k8s.io/kubernetes/pkg/client/typed/discovery" ) diff --git a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/unversioned/doc.go b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/doc.go similarity index 100% rename from cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/unversioned/doc.go rename to cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/doc.go diff --git a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/unversioned/generated_expansion.go b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/generated_expansion.go similarity index 100% rename from cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/unversioned/generated_expansion.go rename to cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/generated_expansion.go diff --git a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/unversioned/testgroup_client.go b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/testgroup_client.go similarity index 98% rename from cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/unversioned/testgroup_client.go rename to cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/testgroup_client.go index 86dfe639cd..eed0d008ab 100644 --- a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/unversioned/testgroup_client.go +++ b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/testgroup_client.go @@ -65,7 +65,7 @@ func New(c *restclient.RESTClient) *TestgroupClient { func setConfigDefaults(config *restclient.Config) error { // if testgroup group is not registered, return an error - g, err := registered.Group("testgroup") + g, err := registered.Group("testgroup.k8s.io") if err != nil { return err } diff --git a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/unversioned/testtype.go b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/testtype.go similarity index 76% rename from cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/unversioned/testtype.go rename to cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/testtype.go index ec735a4e37..3125dd27cb 100644 --- a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/unversioned/testtype.go +++ b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/testtype.go @@ -17,7 +17,7 @@ limitations under the License. package unversioned import ( - testgroup "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testdata/apis/testgroup" + testgroup_k8s_io "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testdata/apis/testgroup.k8s.io" api "k8s.io/kubernetes/pkg/api" watch "k8s.io/kubernetes/pkg/watch" ) @@ -30,13 +30,13 @@ type TestTypesGetter interface { // TestTypeInterface has methods to work with TestType resources. type TestTypeInterface interface { - Create(*testgroup.TestType) (*testgroup.TestType, error) - Update(*testgroup.TestType) (*testgroup.TestType, error) - UpdateStatus(*testgroup.TestType) (*testgroup.TestType, error) + Create(*testgroup_k8s_io.TestType) (*testgroup_k8s_io.TestType, error) + Update(*testgroup_k8s_io.TestType) (*testgroup_k8s_io.TestType, error) + UpdateStatus(*testgroup_k8s_io.TestType) (*testgroup_k8s_io.TestType, error) Delete(name string, options *api.DeleteOptions) error DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error - Get(name string) (*testgroup.TestType, error) - List(opts api.ListOptions) (*testgroup.TestTypeList, error) + Get(name string) (*testgroup_k8s_io.TestType, error) + List(opts api.ListOptions) (*testgroup_k8s_io.TestTypeList, error) Watch(opts api.ListOptions) (watch.Interface, error) TestTypeExpansion } @@ -56,8 +56,8 @@ func newTestTypes(c *TestgroupClient, namespace string) *testTypes { } // Create takes the representation of a testType and creates it. Returns the server's representation of the testType, and an error, if there is any. -func (c *testTypes) Create(testType *testgroup.TestType) (result *testgroup.TestType, err error) { - result = &testgroup.TestType{} +func (c *testTypes) Create(testType *testgroup_k8s_io.TestType) (result *testgroup_k8s_io.TestType, err error) { + result = &testgroup_k8s_io.TestType{} err = c.client.Post(). Namespace(c.ns). Resource("testtypes"). @@ -68,8 +68,8 @@ func (c *testTypes) Create(testType *testgroup.TestType) (result *testgroup.Test } // Update takes the representation of a testType and updates it. Returns the server's representation of the testType, and an error, if there is any. -func (c *testTypes) Update(testType *testgroup.TestType) (result *testgroup.TestType, err error) { - result = &testgroup.TestType{} +func (c *testTypes) Update(testType *testgroup_k8s_io.TestType) (result *testgroup_k8s_io.TestType, err error) { + result = &testgroup_k8s_io.TestType{} err = c.client.Put(). Namespace(c.ns). Resource("testtypes"). @@ -80,8 +80,8 @@ func (c *testTypes) Update(testType *testgroup.TestType) (result *testgroup.Test return } -func (c *testTypes) UpdateStatus(testType *testgroup.TestType) (result *testgroup.TestType, err error) { - result = &testgroup.TestType{} +func (c *testTypes) UpdateStatus(testType *testgroup_k8s_io.TestType) (result *testgroup_k8s_io.TestType, err error) { + result = &testgroup_k8s_io.TestType{} err = c.client.Put(). Namespace(c.ns). Resource("testtypes"). @@ -116,8 +116,8 @@ func (c *testTypes) DeleteCollection(options *api.DeleteOptions, listOptions api } // Get takes name of the testType, and returns the corresponding testType object, and an error if there is any. -func (c *testTypes) Get(name string) (result *testgroup.TestType, err error) { - result = &testgroup.TestType{} +func (c *testTypes) Get(name string) (result *testgroup_k8s_io.TestType, err error) { + result = &testgroup_k8s_io.TestType{} err = c.client.Get(). Namespace(c.ns). Resource("testtypes"). @@ -128,8 +128,8 @@ func (c *testTypes) Get(name string) (result *testgroup.TestType, err error) { } // List takes label and field selectors, and returns the list of TestTypes that match those selectors. -func (c *testTypes) List(opts api.ListOptions) (result *testgroup.TestTypeList, err error) { - result = &testgroup.TestTypeList{} +func (c *testTypes) List(opts api.ListOptions) (result *testgroup_k8s_io.TestTypeList, err error) { + result = &testgroup_k8s_io.TestTypeList{} err = c.client.Get(). Namespace(c.ns). Resource("testtypes"). diff --git a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/unversioned/testtype_expansion.go b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/testtype_expansion.go similarity index 100% rename from cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/unversioned/testtype_expansion.go rename to cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/testtype_expansion.go