From 754848cf52424193ba534ba773ad17e0483c942d Mon Sep 17 00:00:00 2001 From: nikhiljindal Date: Tue, 10 May 2016 17:20:21 -0700 Subject: [PATCH 1/2] Updating update-codegen to update federation_clientset as well --- hack/update-codegen.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh index ae8e7363cdf..7a46a30fcfa 100755 --- a/hack/update-codegen.sh +++ b/hack/update-codegen.sh @@ -43,6 +43,11 @@ setgen=$(kube::util::find-binary "set-gen") # update- and verify- scripts. ${clientgen} "$@" ${clientgen} -t "$@" + +# Clientgen for federation clientset. +${clientgen} --clientset-name=federation_internalclientset --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --input="../../federation/apis/federation/" "$@" +${clientgen} --clientset-name=federation_release_1_3 --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --input="../../federation/apis/federation/v1alpha1" "$@" + ${conversiongen} "$@" ${deepcopygen} "$@" ${setgen} "$@" From 90897efcf666af397bf920506228bc9f07348802 Mon Sep 17 00:00:00 2001 From: nikhiljindal Date: Tue, 10 May 2016 17:20:52 -0700 Subject: [PATCH 2/2] Running hack/update-codegen.sh so that hack/verify-codegen.sh passes --- .../federation_internalclientset/clientset.go | 3 +++ .../federation_internalclientset/doc.go | 2 +- .../federation_internalclientset/fake/doc.go | 2 +- .../typed/federation/unversioned/doc.go | 2 +- .../typed/federation/unversioned/fake/doc.go | 2 +- .../unversioned/fake/fake_federation_client.go | 7 +++++++ .../federation/unversioned/federation_client.go | 13 ++++++++++++- .../federation_release_1_3/clientset.go | 3 +++ .../federation_release_1_3/doc.go | 2 +- .../federation_release_1_3/fake/doc.go | 2 +- .../typed/federation/v1alpha1/doc.go | 2 +- .../typed/federation/v1alpha1/fake/doc.go | 2 +- .../v1alpha1/fake/fake_federation_client.go | 7 +++++++ .../federation/v1alpha1/federation_client.go | 17 +++++++++++------ 14 files changed, 51 insertions(+), 15 deletions(-) diff --git a/federation/client/clientset_generated/federation_internalclientset/clientset.go b/federation/client/clientset_generated/federation_internalclientset/clientset.go index ce038402b6d..f7d7d7ae4a5 100644 --- a/federation/client/clientset_generated/federation_internalclientset/clientset.go +++ b/federation/client/clientset_generated/federation_internalclientset/clientset.go @@ -38,6 +38,9 @@ type Clientset struct { // Federation retrieves the FederationClient func (c *Clientset) Federation() unversionedfederation.FederationInterface { + if c == nil { + return nil + } return c.FederationClient } diff --git a/federation/client/clientset_generated/federation_internalclientset/doc.go b/federation/client/clientset_generated/federation_internalclientset/doc.go index 5906c774317..04a11b0ad60 100644 --- a/federation/client/clientset_generated/federation_internalclientset/doc.go +++ b/federation/client/clientset_generated/federation_internalclientset/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=federation_internalclientset --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --input=[federation/] --input-base=k8s.io/kubernetes/federation/apis +// This package is generated by client-gen with arguments: --clientset-name=federation_internalclientset --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --input=[../../federation/apis/federation/] // This package has the automatically generated clientset. package federation_internalclientset diff --git a/federation/client/clientset_generated/federation_internalclientset/fake/doc.go b/federation/client/clientset_generated/federation_internalclientset/fake/doc.go index 95b2b29ba33..362c9efa86c 100644 --- a/federation/client/clientset_generated/federation_internalclientset/fake/doc.go +++ b/federation/client/clientset_generated/federation_internalclientset/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=federation_internalclientset --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --input=[federation/] --input-base=k8s.io/kubernetes/federation/apis +// This package is generated by client-gen with arguments: --clientset-name=federation_internalclientset --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --input=[../../federation/apis/federation/] // This package has the automatically generated fake clientset. package fake diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/federation/unversioned/doc.go b/federation/client/clientset_generated/federation_internalclientset/typed/federation/unversioned/doc.go index 8ebff890648..3a89008e1dc 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/federation/unversioned/doc.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/federation/unversioned/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=federation_internalclientset --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --input=[federation/] --input-base=k8s.io/kubernetes/federation/apis +// This package is generated by client-gen with arguments: --clientset-name=federation_internalclientset --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --input=[../../federation/apis/federation/] // This package has the automatically generated typed clients. package unversioned diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/federation/unversioned/fake/doc.go b/federation/client/clientset_generated/federation_internalclientset/typed/federation/unversioned/fake/doc.go index ca9e1fd9d7a..65237d81b3a 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/federation/unversioned/fake/doc.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/federation/unversioned/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=federation_internalclientset --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --input=[federation/] --input-base=k8s.io/kubernetes/federation/apis +// This package is generated by client-gen with arguments: --clientset-name=federation_internalclientset --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --input=[../../federation/apis/federation/] // Package fake has the automatically generated clients. package fake diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/federation/unversioned/fake/fake_federation_client.go b/federation/client/clientset_generated/federation_internalclientset/typed/federation/unversioned/fake/fake_federation_client.go index 9b3687b1224..f829ab0eca2 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/federation/unversioned/fake/fake_federation_client.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/federation/unversioned/fake/fake_federation_client.go @@ -18,6 +18,7 @@ package fake import ( unversioned "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/typed/federation/unversioned" + restclient "k8s.io/kubernetes/pkg/client/restclient" core "k8s.io/kubernetes/pkg/client/testing/core" ) @@ -28,3 +29,9 @@ type FakeFederation struct { func (c *FakeFederation) Clusters() unversioned.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_internalclientset/typed/federation/unversioned/federation_client.go b/federation/client/clientset_generated/federation_internalclientset/typed/federation/unversioned/federation_client.go index b995f0c6e84..be2a8a153c1 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/federation/unversioned/federation_client.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/federation/unversioned/federation_client.go @@ -23,6 +23,7 @@ import ( ) type FederationInterface interface { + GetRESTClient() *restclient.RESTClient ClustersGetter } @@ -79,7 +80,8 @@ func setConfigDefaults(config *restclient.Config) error { config.GroupVersion = ©GroupVersion //} - config.Codec = api.Codecs.LegacyCodec(*config.GroupVersion) + config.NegotiatedSerializer = api.Codecs + if config.QPS == 0 { config.QPS = 5 } @@ -88,3 +90,12 @@ func setConfigDefaults(config *restclient.Config) error { } 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_3/clientset.go b/federation/client/clientset_generated/federation_release_1_3/clientset.go index ffb7a96cf96..9bccf731613 100644 --- a/federation/client/clientset_generated/federation_release_1_3/clientset.go +++ b/federation/client/clientset_generated/federation_release_1_3/clientset.go @@ -38,6 +38,9 @@ type Clientset struct { // Federation retrieves the FederationClient func (c *Clientset) Federation() v1alpha1federation.FederationInterface { + if c == nil { + return nil + } return c.FederationClient } diff --git a/federation/client/clientset_generated/federation_release_1_3/doc.go b/federation/client/clientset_generated/federation_release_1_3/doc.go index 1d9f2783070..357e29a0404 100644 --- a/federation/client/clientset_generated/federation_release_1_3/doc.go +++ b/federation/client/clientset_generated/federation_release_1_3/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=federation_release_1_3 --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --input=[federation/v1alpha1] --input-base=k8s.io/kubernetes/federation/apis +// This package is generated by client-gen with arguments: --clientset-name=federation_release_1_3 --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --input=[../../federation/apis/federation/v1alpha1] // This package has the automatically generated clientset. package federation_release_1_3 diff --git a/federation/client/clientset_generated/federation_release_1_3/fake/doc.go b/federation/client/clientset_generated/federation_release_1_3/fake/doc.go index 30f5b44cd12..c661228b856 100644 --- a/federation/client/clientset_generated/federation_release_1_3/fake/doc.go +++ b/federation/client/clientset_generated/federation_release_1_3/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=federation_release_1_3 --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --input=[federation/v1alpha1] --input-base=k8s.io/kubernetes/federation/apis +// This package is generated by client-gen with arguments: --clientset-name=federation_release_1_3 --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --input=[../../federation/apis/federation/v1alpha1] // This package has the automatically generated fake clientset. package fake diff --git a/federation/client/clientset_generated/federation_release_1_3/typed/federation/v1alpha1/doc.go b/federation/client/clientset_generated/federation_release_1_3/typed/federation/v1alpha1/doc.go index d940668ee68..2983bb90d62 100644 --- a/federation/client/clientset_generated/federation_release_1_3/typed/federation/v1alpha1/doc.go +++ b/federation/client/clientset_generated/federation_release_1_3/typed/federation/v1alpha1/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=federation_release_1_3 --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --input=[federation/v1alpha1] --input-base=k8s.io/kubernetes/federation/apis +// This package is generated by client-gen with arguments: --clientset-name=federation_release_1_3 --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --input=[../../federation/apis/federation/v1alpha1] // This package has the automatically generated typed clients. package v1alpha1 diff --git a/federation/client/clientset_generated/federation_release_1_3/typed/federation/v1alpha1/fake/doc.go b/federation/client/clientset_generated/federation_release_1_3/typed/federation/v1alpha1/fake/doc.go index 487a9eafad5..a6255484741 100644 --- a/federation/client/clientset_generated/federation_release_1_3/typed/federation/v1alpha1/fake/doc.go +++ b/federation/client/clientset_generated/federation_release_1_3/typed/federation/v1alpha1/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=federation_release_1_3 --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --input=[federation/v1alpha1] --input-base=k8s.io/kubernetes/federation/apis +// This package is generated by client-gen with arguments: --clientset-name=federation_release_1_3 --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --input=[../../federation/apis/federation/v1alpha1] // Package fake has the automatically generated clients. package fake diff --git a/federation/client/clientset_generated/federation_release_1_3/typed/federation/v1alpha1/fake/fake_federation_client.go b/federation/client/clientset_generated/federation_release_1_3/typed/federation/v1alpha1/fake/fake_federation_client.go index 73e72601ab4..48390713fd6 100644 --- a/federation/client/clientset_generated/federation_release_1_3/typed/federation/v1alpha1/fake/fake_federation_client.go +++ b/federation/client/clientset_generated/federation_release_1_3/typed/federation/v1alpha1/fake/fake_federation_client.go @@ -18,6 +18,7 @@ package fake import ( v1alpha1 "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_3/typed/federation/v1alpha1" + restclient "k8s.io/kubernetes/pkg/client/restclient" core "k8s.io/kubernetes/pkg/client/testing/core" ) @@ -28,3 +29,9 @@ type FakeFederation struct { func (c *FakeFederation) Clusters() v1alpha1.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_3/typed/federation/v1alpha1/federation_client.go b/federation/client/clientset_generated/federation_release_1_3/typed/federation/v1alpha1/federation_client.go index 64689aaad84..57ce4bc4efc 100644 --- a/federation/client/clientset_generated/federation_release_1_3/typed/federation/v1alpha1/federation_client.go +++ b/federation/client/clientset_generated/federation_release_1_3/typed/federation/v1alpha1/federation_client.go @@ -17,13 +17,13 @@ limitations under the License. package v1alpha1 import ( - fmt "fmt" api "k8s.io/kubernetes/pkg/api" registered "k8s.io/kubernetes/pkg/apimachinery/registered" restclient "k8s.io/kubernetes/pkg/client/restclient" ) type FederationInterface interface { + GetRESTClient() *restclient.RESTClient ClustersGetter } @@ -80,11 +80,7 @@ func setConfigDefaults(config *restclient.Config) error { config.GroupVersion = ©GroupVersion //} - codec, ok := api.Codecs.SerializerForFileExtension("json") - if !ok { - return fmt.Errorf("unable to find serializer for JSON") - } - config.Codec = codec + config.NegotiatedSerializer = api.Codecs if config.QPS == 0 { config.QPS = 5 @@ -94,3 +90,12 @@ func setConfigDefaults(config *restclient.Config) error { } 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 +}