From 7d4b594c64e40b031416f62d5a35f570b2468cad Mon Sep 17 00:00:00 2001 From: tanshanshan Date: Wed, 14 Dec 2016 09:18:12 +0800 Subject: [PATCH] check nil --- .../pkg/client/clientset_generated/clientset/clientset.go | 3 +++ .../client/clientset_generated/internalclientset/clientset.go | 3 +++ .../go2idl/client-gen/generators/generator_for_clientset.go | 3 +++ .../clientset_generated/test_internalclientset/clientset.go | 3 +++ .../clientset_generated/federation_clientset/clientset.go | 3 +++ .../federation_internalclientset/clientset.go | 3 +++ pkg/client/clientset_generated/clientset/clientset.go | 3 +++ pkg/client/clientset_generated/internalclientset/clientset.go | 3 +++ 8 files changed, 24 insertions(+) diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/clientset.go b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/clientset.go index 46de81603ca..6195f1084b9 100644 --- a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/clientset.go +++ b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/clientset.go @@ -58,6 +58,9 @@ func (c *Clientset) Apiregistration() v1alpha1apiregistration.ApiregistrationV1a // Discovery retrieves the DiscoveryClient func (c *Clientset) Discovery() discovery.DiscoveryInterface { + if c == nil { + return nil + } return c.DiscoveryClient } diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/clientset.go b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/clientset.go index 12175032fdf..64a53e67fd2 100644 --- a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/clientset.go +++ b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/clientset.go @@ -47,6 +47,9 @@ func (c *Clientset) Apiregistration() internalversionapiregistration.Apiregistra // Discovery retrieves the DiscoveryClient func (c *Clientset) Discovery() discovery.DiscoveryInterface { + if c == nil { + return nil + } return c.DiscoveryClient } diff --git a/cmd/libs/go2idl/client-gen/generators/generator_for_clientset.go b/cmd/libs/go2idl/client-gen/generators/generator_for_clientset.go index 82a58051df8..fc33fb61478 100644 --- a/cmd/libs/go2idl/client-gen/generators/generator_for_clientset.go +++ b/cmd/libs/go2idl/client-gen/generators/generator_for_clientset.go @@ -149,6 +149,9 @@ func (c *Clientset) $.Group$() $.PackageName$.$.GroupVersion$Interface { var getDiscoveryTemplate = ` // Discovery retrieves the DiscoveryClient func (c *Clientset) Discovery() $.DiscoveryInterface|raw$ { + if c == nil { + return nil + } return c.DiscoveryClient } ` 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 15ae1206dc7..34c4b9a9330 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 @@ -47,6 +47,9 @@ func (c *Clientset) Testgroup() internalversiontestgroup.TestgroupInterface { // Discovery retrieves the DiscoveryClient func (c *Clientset) Discovery() discovery.DiscoveryInterface { + if c == nil { + return nil + } return c.DiscoveryClient } diff --git a/federation/client/clientset_generated/federation_clientset/clientset.go b/federation/client/clientset_generated/federation_clientset/clientset.go index bdec3560378..b9f91ba56dc 100644 --- a/federation/client/clientset_generated/federation_clientset/clientset.go +++ b/federation/client/clientset_generated/federation_clientset/clientset.go @@ -124,6 +124,9 @@ func (c *Clientset) Federation() v1beta1federation.FederationV1beta1Interface { // Discovery retrieves the DiscoveryClient func (c *Clientset) Discovery() discovery.DiscoveryInterface { + if c == nil { + return nil + } return c.DiscoveryClient } diff --git a/federation/client/clientset_generated/federation_internalclientset/clientset.go b/federation/client/clientset_generated/federation_internalclientset/clientset.go index 0d92853bc17..6d9bb063e6e 100644 --- a/federation/client/clientset_generated/federation_internalclientset/clientset.go +++ b/federation/client/clientset_generated/federation_internalclientset/clientset.go @@ -83,6 +83,9 @@ func (c *Clientset) Federation() internalversionfederation.FederationInterface { // Discovery retrieves the DiscoveryClient func (c *Clientset) Discovery() discovery.DiscoveryInterface { + if c == nil { + return nil + } return c.DiscoveryClient } diff --git a/pkg/client/clientset_generated/clientset/clientset.go b/pkg/client/clientset_generated/clientset/clientset.go index 2ae6f3f783f..98745441bd5 100644 --- a/pkg/client/clientset_generated/clientset/clientset.go +++ b/pkg/client/clientset_generated/clientset/clientset.go @@ -290,6 +290,9 @@ func (c *Clientset) Storage() v1beta1storage.StorageV1beta1Interface { // Discovery retrieves the DiscoveryClient func (c *Clientset) Discovery() discovery.DiscoveryInterface { + if c == nil { + return nil + } return c.DiscoveryClient } diff --git a/pkg/client/clientset_generated/internalclientset/clientset.go b/pkg/client/clientset_generated/internalclientset/clientset.go index 15bc923e028..985eb1f0544 100644 --- a/pkg/client/clientset_generated/internalclientset/clientset.go +++ b/pkg/client/clientset_generated/internalclientset/clientset.go @@ -167,6 +167,9 @@ func (c *Clientset) Storage() internalversionstorage.StorageInterface { // Discovery retrieves the DiscoveryClient func (c *Clientset) Discovery() discovery.DiscoveryInterface { + if c == nil { + return nil + } return c.DiscoveryClient }