From 6079053407705212c8cc3f039e8b767c6bccd0a0 Mon Sep 17 00:00:00 2001 From: Jan Chaloupka Date: Thu, 13 Oct 2016 14:56:07 +0200 Subject: [PATCH] Update clientset generator to use RESTClient interface instead of the RESTClient data type --- .../fake/generator_fake_for_group.go | 16 ++++++----- .../generators/generator_for_clientset.go | 4 +-- .../generators/generator_for_group.go | 14 +++++----- .../generators/generator_for_type.go | 27 +++++++++--------- .../test_internalclientset/clientset.go | 2 +- .../test_internalclientset/clientset_test.go | 2 +- .../unversioned/fake/fake_testgroup_client.go | 7 +++-- .../unversioned/testgroup_client.go | 12 ++++---- .../testgroup.k8s.io/unversioned/testtype.go | 5 ++-- .../federation_internalclientset/clientset.go | 2 +- .../typed/core/unversioned/configmap.go | 5 ++-- .../typed/core/unversioned/core_client.go | 12 ++++---- .../typed/core/unversioned/event.go | 5 ++-- .../core/unversioned/fake/fake_core_client.go | 7 +++-- .../typed/core/unversioned/namespace.go | 5 ++-- .../typed/core/unversioned/secret.go | 5 ++-- .../typed/core/unversioned/service.go | 5 ++-- .../typed/extensions/unversioned/daemonset.go | 5 ++-- .../extensions/unversioned/deployment.go | 5 ++-- .../unversioned/extensions_client.go | 12 ++++---- .../fake/fake_extensions_client.go | 7 +++-- .../typed/extensions/unversioned/ingress.go | 5 ++-- .../extensions/unversioned/replicaset.go | 5 ++-- .../typed/federation/unversioned/cluster.go | 5 ++-- .../fake/fake_federation_client.go | 7 +++-- .../unversioned/federation_client.go | 12 ++++---- .../federation_release_1_5/clientset.go | 2 +- .../typed/core/v1/configmap.go | 5 ++-- .../typed/core/v1/core_client.go | 12 ++++---- .../typed/core/v1/event.go | 5 ++-- .../typed/core/v1/fake/fake_core_client.go | 7 +++-- .../typed/core/v1/namespace.go | 5 ++-- .../typed/core/v1/secret.go | 5 ++-- .../typed/core/v1/service.go | 5 ++-- .../typed/extensions/v1beta1/daemonset.go | 5 ++-- .../typed/extensions/v1beta1/deployment.go | 5 ++-- .../extensions/v1beta1/extensions_client.go | 12 ++++---- .../v1beta1/fake/fake_extensions_client.go | 7 +++-- .../typed/extensions/v1beta1/ingress.go | 5 ++-- .../typed/extensions/v1beta1/replicaset.go | 5 ++-- .../typed/federation/v1beta1/cluster.go | 5 ++-- .../v1beta1/fake/fake_federation_client.go | 7 +++-- .../federation/v1beta1/federation_client.go | 12 ++++---- .../cluster/cluster_client.go | 2 +- .../internalclientset/clientset.go | 2 +- .../typed/apps/unversioned/apps_client.go | 12 ++++---- .../apps/unversioned/fake/fake_apps_client.go | 7 +++-- .../typed/apps/unversioned/petset.go | 5 ++-- .../unversioned/authentication_client.go | 12 ++++---- .../fake/fake_authentication_client.go | 7 +++-- .../authentication/unversioned/tokenreview.go | 8 ++++-- .../unversioned/authorization_client.go | 12 ++++---- .../fake/fake_authorization_client.go | 7 +++-- .../unversioned/localsubjectaccessreview.go | 8 ++++-- .../unversioned/selfsubjectaccessreview.go | 8 ++++-- .../unversioned/subjectaccessreview.go | 8 ++++-- .../unversioned/autoscaling_client.go | 12 ++++---- .../fake/fake_autoscaling_client.go | 7 +++-- .../unversioned/horizontalpodautoscaler.go | 5 ++-- .../typed/batch/unversioned/batch_client.go | 12 ++++---- .../unversioned/fake/fake_batch_client.go | 7 +++-- .../typed/batch/unversioned/job.go | 5 ++-- .../typed/batch/unversioned/scheduledjob.go | 5 ++-- .../unversioned/certificates_client.go | 12 ++++---- .../unversioned/certificatesigningrequest.go | 5 ++-- .../fake/fake_certificates_client.go | 7 +++-- .../typed/core/unversioned/componentstatus.go | 5 ++-- .../typed/core/unversioned/configmap.go | 5 ++-- .../typed/core/unversioned/core_client.go | 12 ++++---- .../typed/core/unversioned/endpoints.go | 5 ++-- .../typed/core/unversioned/event.go | 5 ++-- .../core/unversioned/fake/fake_core_client.go | 7 +++-- .../typed/core/unversioned/limitrange.go | 5 ++-- .../typed/core/unversioned/namespace.go | 5 ++-- .../typed/core/unversioned/node.go | 5 ++-- .../core/unversioned/persistentvolume.go | 5 ++-- .../core/unversioned/persistentvolumeclaim.go | 5 ++-- .../typed/core/unversioned/pod.go | 5 ++-- .../typed/core/unversioned/podtemplate.go | 5 ++-- .../core/unversioned/replicationcontroller.go | 5 ++-- .../typed/core/unversioned/resourcequota.go | 5 ++-- .../typed/core/unversioned/secret.go | 5 ++-- .../typed/core/unversioned/service.go | 5 ++-- .../typed/core/unversioned/serviceaccount.go | 5 ++-- .../typed/extensions/unversioned/daemonset.go | 5 ++-- .../extensions/unversioned/deployment.go | 5 ++-- .../unversioned/extensions_client.go | 12 ++++---- .../fake/fake_extensions_client.go | 7 +++-- .../typed/extensions/unversioned/ingress.go | 5 ++-- .../extensions/unversioned/networkpolicy.go | 5 ++-- .../unversioned/podsecuritypolicy.go | 5 ++-- .../extensions/unversioned/replicaset.go | 5 ++-- .../typed/extensions/unversioned/scale.go | 8 ++++-- .../unversioned/thirdpartyresource.go | 5 ++-- .../unversioned/fake/fake_policy_client.go | 7 +++-- .../policy/unversioned/poddisruptionbudget.go | 5 ++-- .../typed/policy/unversioned/policy_client.go | 12 ++++---- .../typed/rbac/unversioned/clusterrole.go | 5 ++-- .../rbac/unversioned/clusterrolebinding.go | 5 ++-- .../rbac/unversioned/fake/fake_rbac_client.go | 7 +++-- .../typed/rbac/unversioned/rbac_client.go | 12 ++++---- .../typed/rbac/unversioned/role.go | 5 ++-- .../typed/rbac/unversioned/rolebinding.go | 5 ++-- .../unversioned/fake/fake_storage_client.go | 7 +++-- .../storage/unversioned/storage_client.go | 12 ++++---- .../typed/storage/unversioned/storageclass.go | 5 ++-- .../release_1_5/clientset.go | 2 +- .../typed/apps/v1alpha1/apps_client.go | 12 ++++---- .../apps/v1alpha1/fake/fake_apps_client.go | 7 +++-- .../release_1_5/typed/apps/v1alpha1/petset.go | 5 ++-- .../v1beta1/authentication_client.go | 12 ++++---- .../fake/fake_authentication_client.go | 7 +++-- .../authentication/v1beta1/tokenreview.go | 8 ++++-- .../v1beta1/authorization_client.go | 12 ++++---- .../v1beta1/fake/fake_authorization_client.go | 7 +++-- .../v1beta1/localsubjectaccessreview.go | 8 ++++-- .../v1beta1/selfsubjectaccessreview.go | 8 ++++-- .../v1beta1/subjectaccessreview.go | 8 ++++-- .../autoscaling/v1/autoscaling_client.go | 12 ++++---- .../v1/fake/fake_autoscaling_client.go | 7 +++-- .../autoscaling/v1/horizontalpodautoscaler.go | 5 ++-- .../typed/batch/v1/batch_client.go | 12 ++++---- .../typed/batch/v1/fake/fake_batch_client.go | 7 +++-- .../release_1_5/typed/batch/v1/job.go | 5 ++-- .../v1alpha1/certificates_client.go | 12 ++++---- .../v1alpha1/certificatesigningrequest.go | 5 ++-- .../v1alpha1/fake/fake_certificates_client.go | 7 +++-- .../typed/core/v1/componentstatus.go | 5 ++-- .../release_1_5/typed/core/v1/configmap.go | 5 ++-- .../release_1_5/typed/core/v1/core_client.go | 12 ++++---- .../release_1_5/typed/core/v1/endpoints.go | 5 ++-- .../release_1_5/typed/core/v1/event.go | 5 ++-- .../typed/core/v1/fake/fake_core_client.go | 7 +++-- .../release_1_5/typed/core/v1/limitrange.go | 5 ++-- .../release_1_5/typed/core/v1/namespace.go | 5 ++-- .../release_1_5/typed/core/v1/node.go | 5 ++-- .../typed/core/v1/persistentvolume.go | 5 ++-- .../typed/core/v1/persistentvolumeclaim.go | 5 ++-- .../release_1_5/typed/core/v1/pod.go | 5 ++-- .../release_1_5/typed/core/v1/podtemplate.go | 5 ++-- .../typed/core/v1/replicationcontroller.go | 5 ++-- .../typed/core/v1/resourcequota.go | 5 ++-- .../release_1_5/typed/core/v1/secret.go | 5 ++-- .../release_1_5/typed/core/v1/service.go | 5 ++-- .../typed/core/v1/serviceaccount.go | 5 ++-- .../typed/extensions/v1beta1/daemonset.go | 5 ++-- .../typed/extensions/v1beta1/deployment.go | 5 ++-- .../extensions/v1beta1/extensions_client.go | 12 ++++---- .../v1beta1/fake/fake_extensions_client.go | 7 +++-- .../typed/extensions/v1beta1/ingress.go | 5 ++-- .../typed/extensions/v1beta1/job.go | 5 ++-- .../extensions/v1beta1/podsecuritypolicy.go | 5 ++-- .../typed/extensions/v1beta1/replicaset.go | 5 ++-- .../typed/extensions/v1beta1/scale.go | 8 ++++-- .../extensions/v1beta1/thirdpartyresource.go | 5 ++-- .../v1alpha1/fake/fake_policy_client.go | 7 +++-- .../policy/v1alpha1/poddisruptionbudget.go | 5 ++-- .../typed/policy/v1alpha1/policy_client.go | 12 ++++---- .../typed/rbac/v1alpha1/clusterrole.go | 5 ++-- .../typed/rbac/v1alpha1/clusterrolebinding.go | 5 ++-- .../rbac/v1alpha1/fake/fake_rbac_client.go | 7 +++-- .../typed/rbac/v1alpha1/rbac_client.go | 12 ++++---- .../release_1_5/typed/rbac/v1alpha1/role.go | 5 ++-- .../typed/rbac/v1alpha1/rolebinding.go | 5 ++-- .../v1beta1/fake/fake_storage_client.go | 7 +++-- .../typed/storage/v1beta1/storage_client.go | 12 ++++---- .../typed/storage/v1beta1/storageclass.go | 5 ++-- pkg/client/restclient/client.go | 12 ++++++++ .../typed/discovery/discovery_client.go | 28 +++++++++++++------ pkg/client/typed/discovery/fake/discovery.go | 5 ++++ pkg/client/unversioned/fake/fake.go | 14 ++++++++++ .../unversioned/helper_blackbox_test.go | 2 +- .../unversioned/testclient/testclient.go | 4 +++ pkg/controller/daemon/daemoncontroller.go | 4 +-- .../deployment/deployment_controller.go | 4 +-- .../endpoint/endpoints_controller.go | 4 +-- pkg/controller/job/jobcontroller.go | 4 +-- .../namespace/namespace_controller.go | 4 +-- pkg/controller/node/nodecontroller.go | 4 +-- pkg/controller/podgc/gc_controller.go | 4 +-- pkg/controller/replicaset/replica_set.go | 4 +-- .../replication/replication_controller.go | 4 +-- .../resourcequota/replenishment_controller.go | 4 +-- .../resource_quota_controller.go | 4 +-- pkg/controller/route/routecontroller.go | 4 +-- pkg/controller/scheduledjob/controller.go | 4 +-- pkg/controller/service/servicecontroller.go | 6 ++-- .../serviceaccounts_controller.go | 4 +-- .../serviceaccount/tokens_controller.go | 4 +-- pkg/kubectl/cmd/rollingupdate.go | 2 +- pkg/kubectl/cmd/util/clientcache.go | 2 +- pkg/kubelet/config/apiserver.go | 2 +- pkg/kubelet/kubelet.go | 4 +-- plugin/pkg/scheduler/factory/factory.go | 18 ++++++------ 194 files changed, 755 insertions(+), 550 deletions(-) diff --git a/cmd/libs/go2idl/client-gen/generators/fake/generator_fake_for_group.go b/cmd/libs/go2idl/client-gen/generators/fake/generator_fake_for_group.go index 8e1bbd486b0..98fa195e722 100644 --- a/cmd/libs/go2idl/client-gen/generators/fake/generator_fake_for_group.go +++ b/cmd/libs/go2idl/client-gen/generators/fake/generator_fake_for_group.go @@ -60,10 +60,11 @@ func (g *genFakeForGroup) GenerateType(c *generator.Context, t *types.Type, w io const pkgTestingCore = "k8s.io/kubernetes/pkg/client/testing/core" const pkgRESTClient = "k8s.io/kubernetes/pkg/client/restclient" m := map[string]interface{}{ - "group": g.group, - "Group": namer.IC(g.group), - "Fake": c.Universe.Type(types.Name{Package: pkgTestingCore, Name: "Fake"}), - "RESTClient": c.Universe.Type(types.Name{Package: pkgRESTClient, Name: "RESTClient"}), + "group": g.group, + "Group": namer.IC(g.group), + "Fake": c.Universe.Type(types.Name{Package: pkgTestingCore, Name: "Fake"}), + "RESTClientInterface": c.Universe.Type(types.Name{Package: pkgRESTClient, Name: "Interface"}), + "RESTClient": c.Universe.Type(types.Name{Package: pkgRESTClient, Name: "RESTClient"}), } sw.Do(groupClientTemplate, m) for _, t := range g.types { @@ -103,9 +104,10 @@ func (c *Fake$.Group$) $.type|publicPlural$() $.realClientPackage$.$.type|public ` var getRESTClient = ` -// GetRESTClient returns a RESTClient that is used to communicate +// RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *Fake$.Group$) GetRESTClient() *$.RESTClient|raw$ { - return nil +func (c *Fake$.Group$) RESTClient() $.RESTClientInterface|raw$ { + var ret *$.RESTClient|raw$ + return ret } ` 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 4198b3ffe16..56571a3882d 100644 --- a/cmd/libs/go2idl/client-gen/generators/generator_for_clientset.go +++ b/cmd/libs/go2idl/client-gen/generators/generator_for_clientset.go @@ -92,7 +92,7 @@ func (g *genClientset) GenerateType(c *generator.Context, t *types.Type, w io.Wr "allGroups": allGroups, "Config": c.Universe.Type(types.Name{Package: pkgRESTClient, Name: "Config"}), "DefaultKubernetesUserAgent": c.Universe.Function(types.Name{Package: pkgRESTClient, Name: "DefaultKubernetesUserAgent"}), - "RESTClient": c.Universe.Type(types.Name{Package: pkgRESTClient, Name: "RESTClient"}), + "RESTClientInterface": c.Universe.Type(types.Name{Package: pkgRESTClient, Name: "Interface"}), "DiscoveryInterface": c.Universe.Type(types.Name{Package: pkgDiscovery, Name: "DiscoveryInterface"}), "DiscoveryClient": c.Universe.Type(types.Name{Package: pkgDiscovery, Name: "DiscoveryClient"}), "NewDiscoveryClientForConfig": c.Universe.Function(types.Name{Package: pkgDiscovery, Name: "NewDiscoveryClientForConfig"}), @@ -183,7 +183,7 @@ $end$ var newClientsetForRESTClientTemplate = ` // New creates a new Clientset for the given RESTClient. -func New(c *$.RESTClient|raw$) *Clientset { +func New(c $.RESTClientInterface|raw$) *Clientset { var clientset Clientset $range .allGroups$ clientset.$.Group$Client =$.PackageName$.New(c) $end$ diff --git a/cmd/libs/go2idl/client-gen/generators/generator_for_group.go b/cmd/libs/go2idl/client-gen/generators/generator_for_group.go index 4539c44c29b..5d642e888e2 100644 --- a/cmd/libs/go2idl/client-gen/generators/generator_for_group.go +++ b/cmd/libs/go2idl/client-gen/generators/generator_for_group.go @@ -89,7 +89,7 @@ func (g *genGroup) GenerateType(c *generator.Context, t *types.Type, w io.Writer "types": g.types, "Config": c.Universe.Type(types.Name{Package: pkgRESTClient, Name: "Config"}), "DefaultKubernetesUserAgent": c.Universe.Function(types.Name{Package: pkgRESTClient, Name: "DefaultKubernetesUserAgent"}), - "RESTClient": c.Universe.Type(types.Name{Package: pkgRESTClient, Name: "RESTClient"}), + "RESTClientInterface": c.Universe.Type(types.Name{Package: pkgRESTClient, Name: "Interface"}), "RESTClientFor": c.Universe.Function(types.Name{Package: pkgRESTClient, Name: "RESTClientFor"}), "latestGroup": c.Universe.Variable(types.Name{Package: pkgRegistered, Name: "Group"}), "GroupOrDie": c.Universe.Variable(types.Name{Package: pkgRegistered, Name: "GroupOrDie"}), @@ -128,7 +128,7 @@ func (g *genGroup) GenerateType(c *generator.Context, t *types.Type, w io.Writer var groupInterfaceTemplate = ` type $.Group$Interface interface { - GetRESTClient() *$.RESTClient|raw$ + RESTClient() $.RESTClientInterface|raw$ $range .types$ $.|publicPlural$Getter $end$ } @@ -137,7 +137,7 @@ type $.Group$Interface interface { var groupClientTemplate = ` // $.Group$Client is used to interact with features provided by the $.Group$ group. type $.Group$Client struct { - *$.RESTClient|raw$ + restClient $.RESTClientInterface|raw$ } ` @@ -181,19 +181,19 @@ func NewForConfigOrDie(c *$.Config|raw$) *$.Group$Client { ` var getRESTClient = ` -// GetRESTClient returns a RESTClient that is used to communicate +// RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *$.Group$Client) GetRESTClient() *$.RESTClient|raw$ { +func (c *$.Group$Client) RESTClient() $.RESTClientInterface|raw$ { if c == nil { return nil } - return c.RESTClient + return c.restClient } ` var newClientForRESTClientTemplate = ` // New creates a new $.Group$Client for the given RESTClient. -func New(c *$.RESTClient|raw$) *$.Group$Client { +func New(c $.RESTClientInterface|raw$) *$.Group$Client { return &$.Group$Client{c} } ` diff --git a/cmd/libs/go2idl/client-gen/generators/generator_for_type.go b/cmd/libs/go2idl/client-gen/generators/generator_for_type.go index ac5129f68d6..94971a47c0d 100644 --- a/cmd/libs/go2idl/client-gen/generators/generator_for_type.go +++ b/cmd/libs/go2idl/client-gen/generators/generator_for_type.go @@ -69,14 +69,15 @@ func (g *genClientForType) GenerateType(c *generator.Context, t *types.Type, w i pkg := filepath.Base(t.Name.Package) namespaced := !extractBoolTagOrDie("nonNamespaced", t.SecondClosestCommentLines) m := map[string]interface{}{ - "type": t, - "package": pkg, - "Package": namer.IC(pkg), - "Group": namer.IC(g.group), - "watchInterface": c.Universe.Type(types.Name{Package: "k8s.io/kubernetes/pkg/watch", Name: "Interface"}), - "apiParameterCodec": c.Universe.Type(types.Name{Package: "k8s.io/kubernetes/pkg/api", Name: "ParameterCodec"}), - "PatchType": c.Universe.Type(types.Name{Package: "k8s.io/kubernetes/pkg/api", Name: "PatchType"}), - "namespaced": namespaced, + "type": t, + "package": pkg, + "Package": namer.IC(pkg), + "Group": namer.IC(g.group), + "watchInterface": c.Universe.Type(types.Name{Package: "k8s.io/kubernetes/pkg/watch", Name: "Interface"}), + "RESTClientInterface": c.Universe.Type(types.Name{Package: "k8s.io/kubernetes/pkg/client/restclient", Name: "Interface"}), + "apiParameterCodec": c.Universe.Type(types.Name{Package: "k8s.io/kubernetes/pkg/api", Name: "ParameterCodec"}), + "PatchType": c.Universe.Type(types.Name{Package: "k8s.io/kubernetes/pkg/api", Name: "PatchType"}), + "namespaced": namespaced, } if g.version == "unversioned" { @@ -134,7 +135,7 @@ func (g *genClientForType) GenerateType(c *generator.Context, t *types.Type, w i // group client will implement this interface. var getterComment = ` -// $.type|publicPlural$Getter has a method to return a $.type|public$Interface. +// $.type|publicPlural$Getter has a method to return a $.type|public$Interface. // A group's client should implement this interface.` var getterNamesapced = ` @@ -179,7 +180,7 @@ var interfaceTemplate4 = ` var structNamespaced = ` // $.type|privatePlural$ implements $.type|public$Interface type $.type|privatePlural$ struct { - client *$.Group$Client + client $.RESTClientInterface|raw$ ns string } ` @@ -188,7 +189,7 @@ type $.type|privatePlural$ struct { var structNonNamespaced = ` // $.type|privatePlural$ implements $.type|public$Interface type $.type|privatePlural$ struct { - client *$.Group$Client + client $.RESTClientInterface|raw$ } ` @@ -196,7 +197,7 @@ var newStructNamespaced = ` // new$.type|publicPlural$ returns a $.type|publicPlural$ func new$.type|publicPlural$(c *$.Group$Client, namespace string) *$.type|privatePlural$ { return &$.type|privatePlural${ - client: c, + client: c.RESTClient(), ns: namespace, } } @@ -206,7 +207,7 @@ var newStructNonNamespaced = ` // new$.type|publicPlural$ returns a $.type|publicPlural$ func new$.type|publicPlural$(c *$.Group$Client) *$.type|privatePlural$ { return &$.type|privatePlural${ - client: c, + client: c.RESTClient(), } } ` 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 223bb84b843..fec63bcc24f 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 @@ -82,7 +82,7 @@ func NewForConfigOrDie(c *restclient.Config) *Clientset { } // New creates a new Clientset for the given RESTClient. -func New(c *restclient.RESTClient) *Clientset { +func New(c restclient.Interface) *Clientset { var clientset Clientset clientset.TestgroupClient = unversionedtestgroup.New(c) diff --git a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/clientset_test.go b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/clientset_test.go index becc13b03d7..e6558f2bd77 100644 --- a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/clientset_test.go +++ b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/clientset_test.go @@ -35,7 +35,7 @@ func ClientSetRateLimiterTest(t *testing.T) { if err != nil { t.Errorf("creating clientset for config %v failed: %v", config, err) } - testGroupThrottler := clientSet.Testgroup().GetRESTClient().GetRateLimiter() + testGroupThrottler := clientSet.Testgroup().RESTClient().GetRateLimiter() if rateLimiter != testGroupThrottler { t.Errorf("Clients in client set should use rateLimiter passed in config:\noriginal: %v\ntestGroup: %v", rateLimiter, testGroupThrottler) diff --git a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/fake/fake_testgroup_client.go b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/fake/fake_testgroup_client.go index 29fd8d1918e..308537d6123 100644 --- a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/fake/fake_testgroup_client.go +++ b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/fake/fake_testgroup_client.go @@ -30,8 +30,9 @@ func (c *FakeTestgroup) TestTypes(namespace string) unversioned.TestTypeInterfac return &FakeTestTypes{c, namespace} } -// GetRESTClient returns a RESTClient that is used to communicate +// RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeTestgroup) GetRESTClient() *restclient.RESTClient { - return nil +func (c *FakeTestgroup) RESTClient() restclient.Interface { + var ret *restclient.RESTClient + return ret } diff --git a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/testgroup_client.go b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/testgroup_client.go index d324770d55a..6891ce825b2 100644 --- a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/testgroup_client.go +++ b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/testgroup_client.go @@ -23,13 +23,13 @@ import ( ) type TestgroupInterface interface { - GetRESTClient() *restclient.RESTClient + RESTClient() restclient.Interface TestTypesGetter } // TestgroupClient is used to interact with features provided by the Testgroup group. type TestgroupClient struct { - *restclient.RESTClient + restClient restclient.Interface } func (c *TestgroupClient) TestTypes(namespace string) TestTypeInterface { @@ -60,7 +60,7 @@ func NewForConfigOrDie(c *restclient.Config) *TestgroupClient { } // New creates a new TestgroupClient for the given RESTClient. -func New(c *restclient.RESTClient) *TestgroupClient { +func New(c restclient.Interface) *TestgroupClient { return &TestgroupClient{c} } @@ -89,11 +89,11 @@ func setConfigDefaults(config *restclient.Config) error { return nil } -// GetRESTClient returns a RESTClient that is used to communicate +// RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *TestgroupClient) GetRESTClient() *restclient.RESTClient { +func (c *TestgroupClient) RESTClient() restclient.Interface { if c == nil { return nil } - return c.RESTClient + return c.restClient } diff --git a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/testtype.go b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/testtype.go index c61f353f2b3..857d3c1ec6c 100644 --- a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/testtype.go +++ b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/testtype.go @@ -19,6 +19,7 @@ package unversioned import ( testgroup_k8s_io "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io" api "k8s.io/kubernetes/pkg/api" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -44,14 +45,14 @@ type TestTypeInterface interface { // testTypes implements TestTypeInterface type testTypes struct { - client *TestgroupClient + client restclient.Interface ns string } // newTestTypes returns a TestTypes func newTestTypes(c *TestgroupClient, namespace string) *testTypes { return &testTypes{ - client: c, + client: c.RESTClient(), ns: namespace, } } diff --git a/federation/client/clientset_generated/federation_internalclientset/clientset.go b/federation/client/clientset_generated/federation_internalclientset/clientset.go index fe26740acf8..f33fd27741f 100644 --- a/federation/client/clientset_generated/federation_internalclientset/clientset.go +++ b/federation/client/clientset_generated/federation_internalclientset/clientset.go @@ -114,7 +114,7 @@ func NewForConfigOrDie(c *restclient.Config) *Clientset { } // New creates a new Clientset for the given RESTClient. -func New(c *restclient.RESTClient) *Clientset { +func New(c restclient.Interface) *Clientset { var clientset Clientset clientset.FederationClient = unversionedfederation.New(c) clientset.CoreClient = unversionedcore.New(c) diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/configmap.go b/federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/configmap.go index c937328dcf4..0f8352b5c90 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/configmap.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/configmap.go @@ -18,6 +18,7 @@ package unversioned import ( api "k8s.io/kubernetes/pkg/api" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -42,14 +43,14 @@ type ConfigMapInterface interface { // configMaps implements ConfigMapInterface type configMaps struct { - client *CoreClient + client restclient.Interface ns string } // newConfigMaps returns a ConfigMaps func newConfigMaps(c *CoreClient, namespace string) *configMaps { return &configMaps{ - client: c, + client: c.RESTClient(), ns: namespace, } } diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/core_client.go b/federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/core_client.go index 8a23faa75d9..37e4fe7e577 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/core_client.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/core_client.go @@ -23,7 +23,7 @@ import ( ) type CoreInterface interface { - GetRESTClient() *restclient.RESTClient + RESTClient() restclient.Interface ConfigMapsGetter EventsGetter NamespacesGetter @@ -33,7 +33,7 @@ type CoreInterface interface { // CoreClient is used to interact with features provided by the Core group. type CoreClient struct { - *restclient.RESTClient + restClient restclient.Interface } func (c *CoreClient) ConfigMaps(namespace string) ConfigMapInterface { @@ -80,7 +80,7 @@ func NewForConfigOrDie(c *restclient.Config) *CoreClient { } // New creates a new CoreClient for the given RESTClient. -func New(c *restclient.RESTClient) *CoreClient { +func New(c restclient.Interface) *CoreClient { return &CoreClient{c} } @@ -109,11 +109,11 @@ func setConfigDefaults(config *restclient.Config) error { return nil } -// GetRESTClient returns a RESTClient that is used to communicate +// RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *CoreClient) GetRESTClient() *restclient.RESTClient { +func (c *CoreClient) RESTClient() restclient.Interface { if c == nil { return nil } - return c.RESTClient + return c.restClient } diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/event.go b/federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/event.go index d4edcd37a81..dbf92eec99f 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/event.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/event.go @@ -18,6 +18,7 @@ package unversioned import ( api "k8s.io/kubernetes/pkg/api" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -42,14 +43,14 @@ type EventInterface interface { // events implements EventInterface type events struct { - client *CoreClient + client restclient.Interface ns string } // newEvents returns a Events func newEvents(c *CoreClient, namespace string) *events { return &events{ - client: c, + client: c.RESTClient(), ns: namespace, } } diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/fake/fake_core_client.go b/federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/fake/fake_core_client.go index b885f4320e2..cceb505a831 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/fake/fake_core_client.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/fake/fake_core_client.go @@ -46,8 +46,9 @@ func (c *FakeCore) Services(namespace string) unversioned.ServiceInterface { return &FakeServices{c, namespace} } -// GetRESTClient returns a RESTClient that is used to communicate +// RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeCore) GetRESTClient() *restclient.RESTClient { - return nil +func (c *FakeCore) RESTClient() restclient.Interface { + var ret *restclient.RESTClient + return ret } diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/namespace.go b/federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/namespace.go index 7b39f2b8648..fb75e5e7b2d 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/namespace.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/namespace.go @@ -18,6 +18,7 @@ package unversioned import ( api "k8s.io/kubernetes/pkg/api" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -43,13 +44,13 @@ type NamespaceInterface interface { // namespaces implements NamespaceInterface type namespaces struct { - client *CoreClient + client restclient.Interface } // newNamespaces returns a Namespaces func newNamespaces(c *CoreClient) *namespaces { return &namespaces{ - client: c, + client: c.RESTClient(), } } diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/secret.go b/federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/secret.go index f87263cbbb7..a937f8f4b75 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/secret.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/secret.go @@ -18,6 +18,7 @@ package unversioned import ( api "k8s.io/kubernetes/pkg/api" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -42,14 +43,14 @@ type SecretInterface interface { // secrets implements SecretInterface type secrets struct { - client *CoreClient + client restclient.Interface ns string } // newSecrets returns a Secrets func newSecrets(c *CoreClient, namespace string) *secrets { return &secrets{ - client: c, + client: c.RESTClient(), ns: namespace, } } diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/service.go b/federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/service.go index 86fa3b22962..97680b33202 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/service.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/service.go @@ -18,6 +18,7 @@ package unversioned import ( api "k8s.io/kubernetes/pkg/api" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -43,14 +44,14 @@ type ServiceInterface interface { // services implements ServiceInterface type services struct { - client *CoreClient + client restclient.Interface ns string } // newServices returns a Services func newServices(c *CoreClient, namespace string) *services { return &services{ - client: c, + client: c.RESTClient(), ns: namespace, } } diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned/daemonset.go b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned/daemonset.go index 827677d9d8b..75ba112abbe 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned/daemonset.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned/daemonset.go @@ -19,6 +19,7 @@ package unversioned import ( api "k8s.io/kubernetes/pkg/api" extensions "k8s.io/kubernetes/pkg/apis/extensions" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -44,14 +45,14 @@ type DaemonSetInterface interface { // daemonSets implements DaemonSetInterface type daemonSets struct { - client *ExtensionsClient + client restclient.Interface ns string } // newDaemonSets returns a DaemonSets func newDaemonSets(c *ExtensionsClient, namespace string) *daemonSets { return &daemonSets{ - client: c, + client: c.RESTClient(), ns: namespace, } } diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned/deployment.go b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned/deployment.go index 894a7d397c3..f008b338011 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned/deployment.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned/deployment.go @@ -19,6 +19,7 @@ package unversioned import ( api "k8s.io/kubernetes/pkg/api" extensions "k8s.io/kubernetes/pkg/apis/extensions" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -44,14 +45,14 @@ type DeploymentInterface interface { // deployments implements DeploymentInterface type deployments struct { - client *ExtensionsClient + client restclient.Interface ns string } // newDeployments returns a Deployments func newDeployments(c *ExtensionsClient, namespace string) *deployments { return &deployments{ - client: c, + client: c.RESTClient(), ns: namespace, } } diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned/extensions_client.go b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned/extensions_client.go index 2e8a17c34eb..589569be30a 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned/extensions_client.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned/extensions_client.go @@ -23,7 +23,7 @@ import ( ) type ExtensionsInterface interface { - GetRESTClient() *restclient.RESTClient + RESTClient() restclient.Interface DaemonSetsGetter DeploymentsGetter IngressesGetter @@ -32,7 +32,7 @@ type ExtensionsInterface interface { // ExtensionsClient is used to interact with features provided by the Extensions group. type ExtensionsClient struct { - *restclient.RESTClient + restClient restclient.Interface } func (c *ExtensionsClient) DaemonSets(namespace string) DaemonSetInterface { @@ -75,7 +75,7 @@ func NewForConfigOrDie(c *restclient.Config) *ExtensionsClient { } // New creates a new ExtensionsClient for the given RESTClient. -func New(c *restclient.RESTClient) *ExtensionsClient { +func New(c restclient.Interface) *ExtensionsClient { return &ExtensionsClient{c} } @@ -104,11 +104,11 @@ func setConfigDefaults(config *restclient.Config) error { return nil } -// GetRESTClient returns a RESTClient that is used to communicate +// RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *ExtensionsClient) GetRESTClient() *restclient.RESTClient { +func (c *ExtensionsClient) RESTClient() restclient.Interface { if c == nil { return nil } - return c.RESTClient + return c.restClient } diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned/fake/fake_extensions_client.go b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned/fake/fake_extensions_client.go index 0f25aedaa27..6ed05f50211 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned/fake/fake_extensions_client.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned/fake/fake_extensions_client.go @@ -42,8 +42,9 @@ func (c *FakeExtensions) ReplicaSets(namespace string) unversioned.ReplicaSetInt return &FakeReplicaSets{c, namespace} } -// GetRESTClient returns a RESTClient that is used to communicate +// RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeExtensions) GetRESTClient() *restclient.RESTClient { - return nil +func (c *FakeExtensions) RESTClient() restclient.Interface { + var ret *restclient.RESTClient + return ret } diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned/ingress.go b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned/ingress.go index 7d941ac8702..0fdfc118b8f 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned/ingress.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned/ingress.go @@ -19,6 +19,7 @@ package unversioned import ( api "k8s.io/kubernetes/pkg/api" extensions "k8s.io/kubernetes/pkg/apis/extensions" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -44,14 +45,14 @@ type IngressInterface interface { // ingresses implements IngressInterface type ingresses struct { - client *ExtensionsClient + client restclient.Interface ns string } // newIngresses returns a Ingresses func newIngresses(c *ExtensionsClient, namespace string) *ingresses { return &ingresses{ - client: c, + client: c.RESTClient(), ns: namespace, } } diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned/replicaset.go b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned/replicaset.go index fc6987b5ba0..804f2d7f2a2 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned/replicaset.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned/replicaset.go @@ -19,6 +19,7 @@ package unversioned import ( api "k8s.io/kubernetes/pkg/api" extensions "k8s.io/kubernetes/pkg/apis/extensions" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -44,14 +45,14 @@ type ReplicaSetInterface interface { // replicaSets implements ReplicaSetInterface type replicaSets struct { - client *ExtensionsClient + client restclient.Interface ns string } // newReplicaSets returns a ReplicaSets func newReplicaSets(c *ExtensionsClient, namespace string) *replicaSets { return &replicaSets{ - client: c, + client: c.RESTClient(), ns: namespace, } } diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/federation/unversioned/cluster.go b/federation/client/clientset_generated/federation_internalclientset/typed/federation/unversioned/cluster.go index a9698d51404..7a3cc4d2cdc 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/federation/unversioned/cluster.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/federation/unversioned/cluster.go @@ -19,6 +19,7 @@ package unversioned import ( federation "k8s.io/kubernetes/federation/apis/federation" api "k8s.io/kubernetes/pkg/api" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -44,13 +45,13 @@ type ClusterInterface interface { // clusters implements ClusterInterface type clusters struct { - client *FederationClient + client restclient.Interface } // newClusters returns a Clusters func newClusters(c *FederationClient) *clusters { return &clusters{ - client: c, + client: c.RESTClient(), } } 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 3c8d85dfd94..958b904bb11 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 @@ -30,8 +30,9 @@ func (c *FakeFederation) Clusters() unversioned.ClusterInterface { return &FakeClusters{c} } -// GetRESTClient returns a RESTClient that is used to communicate +// RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeFederation) GetRESTClient() *restclient.RESTClient { - return nil +func (c *FakeFederation) RESTClient() restclient.Interface { + var ret *restclient.RESTClient + return ret } 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 12c33129f66..ca8a97a1d38 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,13 +23,13 @@ import ( ) type FederationInterface interface { - GetRESTClient() *restclient.RESTClient + RESTClient() restclient.Interface ClustersGetter } // FederationClient is used to interact with features provided by the Federation group. type FederationClient struct { - *restclient.RESTClient + restClient restclient.Interface } func (c *FederationClient) Clusters() ClusterInterface { @@ -60,7 +60,7 @@ func NewForConfigOrDie(c *restclient.Config) *FederationClient { } // New creates a new FederationClient for the given RESTClient. -func New(c *restclient.RESTClient) *FederationClient { +func New(c restclient.Interface) *FederationClient { return &FederationClient{c} } @@ -89,11 +89,11 @@ func setConfigDefaults(config *restclient.Config) error { return nil } -// GetRESTClient returns a RESTClient that is used to communicate +// RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FederationClient) GetRESTClient() *restclient.RESTClient { +func (c *FederationClient) RESTClient() restclient.Interface { if c == nil { return nil } - return c.RESTClient + return c.restClient } diff --git a/federation/client/clientset_generated/federation_release_1_5/clientset.go b/federation/client/clientset_generated/federation_release_1_5/clientset.go index 22b514a4bf6..d389ea266ae 100644 --- a/federation/client/clientset_generated/federation_release_1_5/clientset.go +++ b/federation/client/clientset_generated/federation_release_1_5/clientset.go @@ -114,7 +114,7 @@ func NewForConfigOrDie(c *restclient.Config) *Clientset { } // New creates a new Clientset for the given RESTClient. -func New(c *restclient.RESTClient) *Clientset { +func New(c restclient.Interface) *Clientset { var clientset Clientset clientset.FederationClient = v1beta1federation.New(c) clientset.CoreClient = v1core.New(c) diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/configmap.go b/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/configmap.go index 8ded33fb0bd..74831c42f99 100644 --- a/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/configmap.go +++ b/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/configmap.go @@ -19,6 +19,7 @@ package v1 import ( api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -43,14 +44,14 @@ type ConfigMapInterface interface { // configMaps implements ConfigMapInterface type configMaps struct { - client *CoreClient + client restclient.Interface ns string } // newConfigMaps returns a ConfigMaps func newConfigMaps(c *CoreClient, namespace string) *configMaps { return &configMaps{ - client: c, + client: c.RESTClient(), ns: namespace, } } 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 index 2a95ac70b7e..323fe8dc1fc 100644 --- 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 @@ -24,7 +24,7 @@ import ( ) type CoreInterface interface { - GetRESTClient() *restclient.RESTClient + RESTClient() restclient.Interface ConfigMapsGetter EventsGetter NamespacesGetter @@ -34,7 +34,7 @@ type CoreInterface interface { // CoreClient is used to interact with features provided by the Core group. type CoreClient struct { - *restclient.RESTClient + restClient restclient.Interface } func (c *CoreClient) ConfigMaps(namespace string) ConfigMapInterface { @@ -81,7 +81,7 @@ func NewForConfigOrDie(c *restclient.Config) *CoreClient { } // New creates a new CoreClient for the given RESTClient. -func New(c *restclient.RESTClient) *CoreClient { +func New(c restclient.Interface) *CoreClient { return &CoreClient{c} } @@ -106,11 +106,11 @@ func setConfigDefaults(config *restclient.Config) error { return nil } -// GetRESTClient returns a RESTClient that is used to communicate +// RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *CoreClient) GetRESTClient() *restclient.RESTClient { +func (c *CoreClient) RESTClient() restclient.Interface { if c == nil { return nil } - return c.RESTClient + return c.restClient } diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/event.go b/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/event.go index b0502c650c5..fc9287bc318 100644 --- a/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/event.go +++ b/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/event.go @@ -19,6 +19,7 @@ package v1 import ( api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -43,14 +44,14 @@ type EventInterface interface { // events implements EventInterface type events struct { - client *CoreClient + client restclient.Interface ns string } // newEvents returns a Events func newEvents(c *CoreClient, namespace string) *events { return &events{ - client: c, + client: c.RESTClient(), ns: namespace, } } 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 index 041ec3f8dfe..628a0451cd1 100644 --- 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 @@ -46,8 +46,9 @@ func (c *FakeCore) Services(namespace string) v1.ServiceInterface { return &FakeServices{c, namespace} } -// GetRESTClient returns a RESTClient that is used to communicate +// RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeCore) GetRESTClient() *restclient.RESTClient { - return nil +func (c *FakeCore) RESTClient() restclient.Interface { + var ret *restclient.RESTClient + return ret } diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/namespace.go b/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/namespace.go index 59b73631593..287a0367191 100644 --- a/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/namespace.go +++ b/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/namespace.go @@ -19,6 +19,7 @@ package v1 import ( api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -44,13 +45,13 @@ type NamespaceInterface interface { // namespaces implements NamespaceInterface type namespaces struct { - client *CoreClient + client restclient.Interface } // newNamespaces returns a Namespaces func newNamespaces(c *CoreClient) *namespaces { return &namespaces{ - client: c, + client: c.RESTClient(), } } diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/secret.go b/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/secret.go index 394c08cc408..c0f7095e01b 100644 --- a/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/secret.go +++ b/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/secret.go @@ -19,6 +19,7 @@ package v1 import ( api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -43,14 +44,14 @@ type SecretInterface interface { // secrets implements SecretInterface type secrets struct { - client *CoreClient + client restclient.Interface ns string } // newSecrets returns a Secrets func newSecrets(c *CoreClient, namespace string) *secrets { return &secrets{ - client: c, + client: c.RESTClient(), ns: namespace, } } diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/service.go b/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/service.go index 493795ff8a3..4b2fd5bcf68 100644 --- a/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/service.go +++ b/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/service.go @@ -19,6 +19,7 @@ package v1 import ( api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -44,14 +45,14 @@ type ServiceInterface interface { // services implements ServiceInterface type services struct { - client *CoreClient + client restclient.Interface ns string } // newServices returns a Services func newServices(c *CoreClient, namespace string) *services { return &services{ - client: c, + client: c.RESTClient(), ns: namespace, } } diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/daemonset.go b/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/daemonset.go index e474283543f..071e9825349 100644 --- a/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/daemonset.go +++ b/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/daemonset.go @@ -20,6 +20,7 @@ import ( api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -45,14 +46,14 @@ type DaemonSetInterface interface { // daemonSets implements DaemonSetInterface type daemonSets struct { - client *ExtensionsClient + client restclient.Interface ns string } // newDaemonSets returns a DaemonSets func newDaemonSets(c *ExtensionsClient, namespace string) *daemonSets { return &daemonSets{ - client: c, + client: c.RESTClient(), ns: namespace, } } diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/deployment.go b/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/deployment.go index ec06e754f99..d77fa7931e4 100644 --- a/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/deployment.go +++ b/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/deployment.go @@ -20,6 +20,7 @@ import ( api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -45,14 +46,14 @@ type DeploymentInterface interface { // deployments implements DeploymentInterface type deployments struct { - client *ExtensionsClient + client restclient.Interface ns string } // newDeployments returns a Deployments func newDeployments(c *ExtensionsClient, namespace string) *deployments { return &deployments{ - client: c, + client: c.RESTClient(), ns: namespace, } } 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 index 2fa472acd63..89ecdc0020e 100644 --- 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 @@ -24,7 +24,7 @@ import ( ) type ExtensionsInterface interface { - GetRESTClient() *restclient.RESTClient + RESTClient() restclient.Interface DaemonSetsGetter DeploymentsGetter IngressesGetter @@ -33,7 +33,7 @@ type ExtensionsInterface interface { // ExtensionsClient is used to interact with features provided by the Extensions group. type ExtensionsClient struct { - *restclient.RESTClient + restClient restclient.Interface } func (c *ExtensionsClient) DaemonSets(namespace string) DaemonSetInterface { @@ -76,7 +76,7 @@ func NewForConfigOrDie(c *restclient.Config) *ExtensionsClient { } // New creates a new ExtensionsClient for the given RESTClient. -func New(c *restclient.RESTClient) *ExtensionsClient { +func New(c restclient.Interface) *ExtensionsClient { return &ExtensionsClient{c} } @@ -101,11 +101,11 @@ func setConfigDefaults(config *restclient.Config) error { return nil } -// GetRESTClient returns a RESTClient that is used to communicate +// RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *ExtensionsClient) GetRESTClient() *restclient.RESTClient { +func (c *ExtensionsClient) RESTClient() restclient.Interface { if c == nil { return nil } - return c.RESTClient + return c.restClient } 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 index cf656f1f0ca..30931d2bc27 100644 --- 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 @@ -42,8 +42,9 @@ func (c *FakeExtensions) ReplicaSets(namespace string) v1beta1.ReplicaSetInterfa return &FakeReplicaSets{c, namespace} } -// GetRESTClient returns a RESTClient that is used to communicate +// RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeExtensions) GetRESTClient() *restclient.RESTClient { - return nil +func (c *FakeExtensions) RESTClient() restclient.Interface { + var ret *restclient.RESTClient + return ret } diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/ingress.go b/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/ingress.go index f383279836f..287fbba9493 100644 --- a/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/ingress.go +++ b/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/ingress.go @@ -20,6 +20,7 @@ import ( api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -45,14 +46,14 @@ type IngressInterface interface { // ingresses implements IngressInterface type ingresses struct { - client *ExtensionsClient + client restclient.Interface ns string } // newIngresses returns a Ingresses func newIngresses(c *ExtensionsClient, namespace string) *ingresses { return &ingresses{ - client: c, + client: c.RESTClient(), ns: namespace, } } diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/replicaset.go b/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/replicaset.go index e30b4552f96..c3de95de5f5 100644 --- a/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/replicaset.go +++ b/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/replicaset.go @@ -20,6 +20,7 @@ import ( api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -45,14 +46,14 @@ type ReplicaSetInterface interface { // replicaSets implements ReplicaSetInterface type replicaSets struct { - client *ExtensionsClient + client restclient.Interface ns string } // newReplicaSets returns a ReplicaSets func newReplicaSets(c *ExtensionsClient, namespace string) *replicaSets { return &replicaSets{ - client: c, + client: c.RESTClient(), ns: namespace, } } 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 index 90522499844..f80e2e7f6b2 100644 --- 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 @@ -20,6 +20,7 @@ import ( v1beta1 "k8s.io/kubernetes/federation/apis/federation/v1beta1" api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -45,13 +46,13 @@ type ClusterInterface interface { // clusters implements ClusterInterface type clusters struct { - client *FederationClient + client restclient.Interface } // newClusters returns a Clusters func newClusters(c *FederationClient) *clusters { return &clusters{ - client: c, + client: c.RESTClient(), } } 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 index 62ae50c3dd1..2826f7eb0d3 100644 --- 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 @@ -30,8 +30,9 @@ func (c *FakeFederation) Clusters() v1beta1.ClusterInterface { return &FakeClusters{c} } -// GetRESTClient returns a RESTClient that is used to communicate +// RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeFederation) GetRESTClient() *restclient.RESTClient { - return nil +func (c *FakeFederation) RESTClient() restclient.Interface { + var ret *restclient.RESTClient + return ret } 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 index 02cdf84a6a5..5231d77ea70 100644 --- 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 @@ -24,13 +24,13 @@ import ( ) type FederationInterface interface { - GetRESTClient() *restclient.RESTClient + RESTClient() restclient.Interface ClustersGetter } // FederationClient is used to interact with features provided by the Federation group. type FederationClient struct { - *restclient.RESTClient + restClient restclient.Interface } func (c *FederationClient) Clusters() ClusterInterface { @@ -61,7 +61,7 @@ func NewForConfigOrDie(c *restclient.Config) *FederationClient { } // New creates a new FederationClient for the given RESTClient. -func New(c *restclient.RESTClient) *FederationClient { +func New(c restclient.Interface) *FederationClient { return &FederationClient{c} } @@ -86,11 +86,11 @@ func setConfigDefaults(config *restclient.Config) error { return nil } -// GetRESTClient returns a RESTClient that is used to communicate +// RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FederationClient) GetRESTClient() *restclient.RESTClient { +func (c *FederationClient) RESTClient() restclient.Interface { if c == nil { return nil } - return c.RESTClient + return c.restClient } diff --git a/federation/pkg/federation-controller/cluster/cluster_client.go b/federation/pkg/federation-controller/cluster/cluster_client.go index 450b4a9c2cc..5f4c2a3411a 100644 --- a/federation/pkg/federation-controller/cluster/cluster_client.go +++ b/federation/pkg/federation-controller/cluster/cluster_client.go @@ -99,7 +99,7 @@ func (self *ClusterClient) GetClusterHealthStatus() *federation_v1beta1.ClusterS LastProbeTime: currentTime, LastTransitionTime: currentTime, } - body, err := self.discoveryClient.Get().AbsPath("/healthz").Do().Raw() + body, err := self.discoveryClient.RESTClient().Get().AbsPath("/healthz").Do().Raw() if err != nil { clusterStatus.Conditions = append(clusterStatus.Conditions, newNodeOfflineCondition) } else { diff --git a/pkg/client/clientset_generated/internalclientset/clientset.go b/pkg/client/clientset_generated/internalclientset/clientset.go index 4333ae1dbb5..f53df1020a8 100644 --- a/pkg/client/clientset_generated/internalclientset/clientset.go +++ b/pkg/client/clientset_generated/internalclientset/clientset.go @@ -242,7 +242,7 @@ func NewForConfigOrDie(c *restclient.Config) *Clientset { } // New creates a new Clientset for the given RESTClient. -func New(c *restclient.RESTClient) *Clientset { +func New(c restclient.Interface) *Clientset { var clientset Clientset clientset.CoreClient = unversionedcore.New(c) clientset.AuthenticationClient = unversionedauthentication.New(c) diff --git a/pkg/client/clientset_generated/internalclientset/typed/apps/unversioned/apps_client.go b/pkg/client/clientset_generated/internalclientset/typed/apps/unversioned/apps_client.go index 6d9edf7b57f..3eb27a34745 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/apps/unversioned/apps_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/apps/unversioned/apps_client.go @@ -23,13 +23,13 @@ import ( ) type AppsInterface interface { - GetRESTClient() *restclient.RESTClient + RESTClient() restclient.Interface PetSetsGetter } // AppsClient is used to interact with features provided by the Apps group. type AppsClient struct { - *restclient.RESTClient + restClient restclient.Interface } func (c *AppsClient) PetSets(namespace string) PetSetInterface { @@ -60,7 +60,7 @@ func NewForConfigOrDie(c *restclient.Config) *AppsClient { } // New creates a new AppsClient for the given RESTClient. -func New(c *restclient.RESTClient) *AppsClient { +func New(c restclient.Interface) *AppsClient { return &AppsClient{c} } @@ -89,11 +89,11 @@ func setConfigDefaults(config *restclient.Config) error { return nil } -// GetRESTClient returns a RESTClient that is used to communicate +// RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *AppsClient) GetRESTClient() *restclient.RESTClient { +func (c *AppsClient) RESTClient() restclient.Interface { if c == nil { return nil } - return c.RESTClient + return c.restClient } diff --git a/pkg/client/clientset_generated/internalclientset/typed/apps/unversioned/fake/fake_apps_client.go b/pkg/client/clientset_generated/internalclientset/typed/apps/unversioned/fake/fake_apps_client.go index 5b0e6973ecc..188532178c2 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/apps/unversioned/fake/fake_apps_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/apps/unversioned/fake/fake_apps_client.go @@ -30,8 +30,9 @@ func (c *FakeApps) PetSets(namespace string) unversioned.PetSetInterface { return &FakePetSets{c, namespace} } -// GetRESTClient returns a RESTClient that is used to communicate +// RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeApps) GetRESTClient() *restclient.RESTClient { - return nil +func (c *FakeApps) RESTClient() restclient.Interface { + var ret *restclient.RESTClient + return ret } diff --git a/pkg/client/clientset_generated/internalclientset/typed/apps/unversioned/petset.go b/pkg/client/clientset_generated/internalclientset/typed/apps/unversioned/petset.go index d88f0755960..fe012bb905c 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/apps/unversioned/petset.go +++ b/pkg/client/clientset_generated/internalclientset/typed/apps/unversioned/petset.go @@ -19,6 +19,7 @@ package unversioned import ( api "k8s.io/kubernetes/pkg/api" apps "k8s.io/kubernetes/pkg/apis/apps" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -44,14 +45,14 @@ type PetSetInterface interface { // petSets implements PetSetInterface type petSets struct { - client *AppsClient + client restclient.Interface ns string } // newPetSets returns a PetSets func newPetSets(c *AppsClient, namespace string) *petSets { return &petSets{ - client: c, + client: c.RESTClient(), ns: namespace, } } diff --git a/pkg/client/clientset_generated/internalclientset/typed/authentication/unversioned/authentication_client.go b/pkg/client/clientset_generated/internalclientset/typed/authentication/unversioned/authentication_client.go index 10d354a9686..5e2563dd082 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/authentication/unversioned/authentication_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/authentication/unversioned/authentication_client.go @@ -23,13 +23,13 @@ import ( ) type AuthenticationInterface interface { - GetRESTClient() *restclient.RESTClient + RESTClient() restclient.Interface TokenReviewsGetter } // AuthenticationClient is used to interact with features provided by the Authentication group. type AuthenticationClient struct { - *restclient.RESTClient + restClient restclient.Interface } func (c *AuthenticationClient) TokenReviews() TokenReviewInterface { @@ -60,7 +60,7 @@ func NewForConfigOrDie(c *restclient.Config) *AuthenticationClient { } // New creates a new AuthenticationClient for the given RESTClient. -func New(c *restclient.RESTClient) *AuthenticationClient { +func New(c restclient.Interface) *AuthenticationClient { return &AuthenticationClient{c} } @@ -89,11 +89,11 @@ func setConfigDefaults(config *restclient.Config) error { return nil } -// GetRESTClient returns a RESTClient that is used to communicate +// RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *AuthenticationClient) GetRESTClient() *restclient.RESTClient { +func (c *AuthenticationClient) RESTClient() restclient.Interface { if c == nil { return nil } - return c.RESTClient + return c.restClient } diff --git a/pkg/client/clientset_generated/internalclientset/typed/authentication/unversioned/fake/fake_authentication_client.go b/pkg/client/clientset_generated/internalclientset/typed/authentication/unversioned/fake/fake_authentication_client.go index 0bbd6bdb74a..325f8a5b08e 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/authentication/unversioned/fake/fake_authentication_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/authentication/unversioned/fake/fake_authentication_client.go @@ -30,8 +30,9 @@ func (c *FakeAuthentication) TokenReviews() unversioned.TokenReviewInterface { return &FakeTokenReviews{c} } -// GetRESTClient returns a RESTClient that is used to communicate +// RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeAuthentication) GetRESTClient() *restclient.RESTClient { - return nil +func (c *FakeAuthentication) RESTClient() restclient.Interface { + var ret *restclient.RESTClient + return ret } diff --git a/pkg/client/clientset_generated/internalclientset/typed/authentication/unversioned/tokenreview.go b/pkg/client/clientset_generated/internalclientset/typed/authentication/unversioned/tokenreview.go index d7ab94b635d..9540b1673c6 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/authentication/unversioned/tokenreview.go +++ b/pkg/client/clientset_generated/internalclientset/typed/authentication/unversioned/tokenreview.go @@ -16,6 +16,10 @@ limitations under the License. package unversioned +import ( + restclient "k8s.io/kubernetes/pkg/client/restclient" +) + // TokenReviewsGetter has a method to return a TokenReviewInterface. // A group's client should implement this interface. type TokenReviewsGetter interface { @@ -29,12 +33,12 @@ type TokenReviewInterface interface { // tokenReviews implements TokenReviewInterface type tokenReviews struct { - client *AuthenticationClient + client restclient.Interface } // newTokenReviews returns a TokenReviews func newTokenReviews(c *AuthenticationClient) *tokenReviews { return &tokenReviews{ - client: c, + client: c.RESTClient(), } } diff --git a/pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned/authorization_client.go b/pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned/authorization_client.go index 88b7c540463..3caf9d7c6fe 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned/authorization_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned/authorization_client.go @@ -23,7 +23,7 @@ import ( ) type AuthorizationInterface interface { - GetRESTClient() *restclient.RESTClient + RESTClient() restclient.Interface LocalSubjectAccessReviewsGetter SelfSubjectAccessReviewsGetter SubjectAccessReviewsGetter @@ -31,7 +31,7 @@ type AuthorizationInterface interface { // AuthorizationClient is used to interact with features provided by the Authorization group. type AuthorizationClient struct { - *restclient.RESTClient + restClient restclient.Interface } func (c *AuthorizationClient) LocalSubjectAccessReviews(namespace string) LocalSubjectAccessReviewInterface { @@ -70,7 +70,7 @@ func NewForConfigOrDie(c *restclient.Config) *AuthorizationClient { } // New creates a new AuthorizationClient for the given RESTClient. -func New(c *restclient.RESTClient) *AuthorizationClient { +func New(c restclient.Interface) *AuthorizationClient { return &AuthorizationClient{c} } @@ -99,11 +99,11 @@ func setConfigDefaults(config *restclient.Config) error { return nil } -// GetRESTClient returns a RESTClient that is used to communicate +// RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *AuthorizationClient) GetRESTClient() *restclient.RESTClient { +func (c *AuthorizationClient) RESTClient() restclient.Interface { if c == nil { return nil } - return c.RESTClient + return c.restClient } diff --git a/pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned/fake/fake_authorization_client.go b/pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned/fake/fake_authorization_client.go index 62d962795a2..35aa290e6fb 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned/fake/fake_authorization_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned/fake/fake_authorization_client.go @@ -38,8 +38,9 @@ func (c *FakeAuthorization) SubjectAccessReviews() unversioned.SubjectAccessRevi return &FakeSubjectAccessReviews{c} } -// GetRESTClient returns a RESTClient that is used to communicate +// RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeAuthorization) GetRESTClient() *restclient.RESTClient { - return nil +func (c *FakeAuthorization) RESTClient() restclient.Interface { + var ret *restclient.RESTClient + return ret } diff --git a/pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned/localsubjectaccessreview.go b/pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned/localsubjectaccessreview.go index 4257a68a55e..66b24a8d062 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned/localsubjectaccessreview.go +++ b/pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned/localsubjectaccessreview.go @@ -16,6 +16,10 @@ limitations under the License. package unversioned +import ( + restclient "k8s.io/kubernetes/pkg/client/restclient" +) + // LocalSubjectAccessReviewsGetter has a method to return a LocalSubjectAccessReviewInterface. // A group's client should implement this interface. type LocalSubjectAccessReviewsGetter interface { @@ -29,14 +33,14 @@ type LocalSubjectAccessReviewInterface interface { // localSubjectAccessReviews implements LocalSubjectAccessReviewInterface type localSubjectAccessReviews struct { - client *AuthorizationClient + client restclient.Interface ns string } // newLocalSubjectAccessReviews returns a LocalSubjectAccessReviews func newLocalSubjectAccessReviews(c *AuthorizationClient, namespace string) *localSubjectAccessReviews { return &localSubjectAccessReviews{ - client: c, + client: c.RESTClient(), ns: namespace, } } diff --git a/pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned/selfsubjectaccessreview.go b/pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned/selfsubjectaccessreview.go index 258b9ff9517..ef118d6c9f4 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned/selfsubjectaccessreview.go +++ b/pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned/selfsubjectaccessreview.go @@ -16,6 +16,10 @@ limitations under the License. package unversioned +import ( + restclient "k8s.io/kubernetes/pkg/client/restclient" +) + // SelfSubjectAccessReviewsGetter has a method to return a SelfSubjectAccessReviewInterface. // A group's client should implement this interface. type SelfSubjectAccessReviewsGetter interface { @@ -29,12 +33,12 @@ type SelfSubjectAccessReviewInterface interface { // selfSubjectAccessReviews implements SelfSubjectAccessReviewInterface type selfSubjectAccessReviews struct { - client *AuthorizationClient + client restclient.Interface } // newSelfSubjectAccessReviews returns a SelfSubjectAccessReviews func newSelfSubjectAccessReviews(c *AuthorizationClient) *selfSubjectAccessReviews { return &selfSubjectAccessReviews{ - client: c, + client: c.RESTClient(), } } diff --git a/pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned/subjectaccessreview.go b/pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned/subjectaccessreview.go index cab6471b6a3..429692f176a 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned/subjectaccessreview.go +++ b/pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned/subjectaccessreview.go @@ -16,6 +16,10 @@ limitations under the License. package unversioned +import ( + restclient "k8s.io/kubernetes/pkg/client/restclient" +) + // SubjectAccessReviewsGetter has a method to return a SubjectAccessReviewInterface. // A group's client should implement this interface. type SubjectAccessReviewsGetter interface { @@ -29,12 +33,12 @@ type SubjectAccessReviewInterface interface { // subjectAccessReviews implements SubjectAccessReviewInterface type subjectAccessReviews struct { - client *AuthorizationClient + client restclient.Interface } // newSubjectAccessReviews returns a SubjectAccessReviews func newSubjectAccessReviews(c *AuthorizationClient) *subjectAccessReviews { return &subjectAccessReviews{ - client: c, + client: c.RESTClient(), } } diff --git a/pkg/client/clientset_generated/internalclientset/typed/autoscaling/unversioned/autoscaling_client.go b/pkg/client/clientset_generated/internalclientset/typed/autoscaling/unversioned/autoscaling_client.go index 114264c793f..53ef5f35452 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/autoscaling/unversioned/autoscaling_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/autoscaling/unversioned/autoscaling_client.go @@ -23,13 +23,13 @@ import ( ) type AutoscalingInterface interface { - GetRESTClient() *restclient.RESTClient + RESTClient() restclient.Interface HorizontalPodAutoscalersGetter } // AutoscalingClient is used to interact with features provided by the Autoscaling group. type AutoscalingClient struct { - *restclient.RESTClient + restClient restclient.Interface } func (c *AutoscalingClient) HorizontalPodAutoscalers(namespace string) HorizontalPodAutoscalerInterface { @@ -60,7 +60,7 @@ func NewForConfigOrDie(c *restclient.Config) *AutoscalingClient { } // New creates a new AutoscalingClient for the given RESTClient. -func New(c *restclient.RESTClient) *AutoscalingClient { +func New(c restclient.Interface) *AutoscalingClient { return &AutoscalingClient{c} } @@ -89,11 +89,11 @@ func setConfigDefaults(config *restclient.Config) error { return nil } -// GetRESTClient returns a RESTClient that is used to communicate +// RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *AutoscalingClient) GetRESTClient() *restclient.RESTClient { +func (c *AutoscalingClient) RESTClient() restclient.Interface { if c == nil { return nil } - return c.RESTClient + return c.restClient } diff --git a/pkg/client/clientset_generated/internalclientset/typed/autoscaling/unversioned/fake/fake_autoscaling_client.go b/pkg/client/clientset_generated/internalclientset/typed/autoscaling/unversioned/fake/fake_autoscaling_client.go index ab10c6bb0e0..c779831cdb9 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/autoscaling/unversioned/fake/fake_autoscaling_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/autoscaling/unversioned/fake/fake_autoscaling_client.go @@ -30,8 +30,9 @@ func (c *FakeAutoscaling) HorizontalPodAutoscalers(namespace string) unversioned return &FakeHorizontalPodAutoscalers{c, namespace} } -// GetRESTClient returns a RESTClient that is used to communicate +// RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeAutoscaling) GetRESTClient() *restclient.RESTClient { - return nil +func (c *FakeAutoscaling) RESTClient() restclient.Interface { + var ret *restclient.RESTClient + return ret } diff --git a/pkg/client/clientset_generated/internalclientset/typed/autoscaling/unversioned/horizontalpodautoscaler.go b/pkg/client/clientset_generated/internalclientset/typed/autoscaling/unversioned/horizontalpodautoscaler.go index 515be142ede..cd244d9a349 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/autoscaling/unversioned/horizontalpodautoscaler.go +++ b/pkg/client/clientset_generated/internalclientset/typed/autoscaling/unversioned/horizontalpodautoscaler.go @@ -19,6 +19,7 @@ package unversioned import ( api "k8s.io/kubernetes/pkg/api" autoscaling "k8s.io/kubernetes/pkg/apis/autoscaling" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -44,14 +45,14 @@ type HorizontalPodAutoscalerInterface interface { // horizontalPodAutoscalers implements HorizontalPodAutoscalerInterface type horizontalPodAutoscalers struct { - client *AutoscalingClient + client restclient.Interface ns string } // newHorizontalPodAutoscalers returns a HorizontalPodAutoscalers func newHorizontalPodAutoscalers(c *AutoscalingClient, namespace string) *horizontalPodAutoscalers { return &horizontalPodAutoscalers{ - client: c, + client: c.RESTClient(), ns: namespace, } } diff --git a/pkg/client/clientset_generated/internalclientset/typed/batch/unversioned/batch_client.go b/pkg/client/clientset_generated/internalclientset/typed/batch/unversioned/batch_client.go index f924797d5e4..3382c720a37 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/batch/unversioned/batch_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/batch/unversioned/batch_client.go @@ -23,14 +23,14 @@ import ( ) type BatchInterface interface { - GetRESTClient() *restclient.RESTClient + RESTClient() restclient.Interface JobsGetter ScheduledJobsGetter } // BatchClient is used to interact with features provided by the Batch group. type BatchClient struct { - *restclient.RESTClient + restClient restclient.Interface } func (c *BatchClient) Jobs(namespace string) JobInterface { @@ -65,7 +65,7 @@ func NewForConfigOrDie(c *restclient.Config) *BatchClient { } // New creates a new BatchClient for the given RESTClient. -func New(c *restclient.RESTClient) *BatchClient { +func New(c restclient.Interface) *BatchClient { return &BatchClient{c} } @@ -94,11 +94,11 @@ func setConfigDefaults(config *restclient.Config) error { return nil } -// GetRESTClient returns a RESTClient that is used to communicate +// RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *BatchClient) GetRESTClient() *restclient.RESTClient { +func (c *BatchClient) RESTClient() restclient.Interface { if c == nil { return nil } - return c.RESTClient + return c.restClient } diff --git a/pkg/client/clientset_generated/internalclientset/typed/batch/unversioned/fake/fake_batch_client.go b/pkg/client/clientset_generated/internalclientset/typed/batch/unversioned/fake/fake_batch_client.go index b21ca42a40e..47deee0bc13 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/batch/unversioned/fake/fake_batch_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/batch/unversioned/fake/fake_batch_client.go @@ -34,8 +34,9 @@ func (c *FakeBatch) ScheduledJobs(namespace string) unversioned.ScheduledJobInte return &FakeScheduledJobs{c, namespace} } -// GetRESTClient returns a RESTClient that is used to communicate +// RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeBatch) GetRESTClient() *restclient.RESTClient { - return nil +func (c *FakeBatch) RESTClient() restclient.Interface { + var ret *restclient.RESTClient + return ret } diff --git a/pkg/client/clientset_generated/internalclientset/typed/batch/unversioned/job.go b/pkg/client/clientset_generated/internalclientset/typed/batch/unversioned/job.go index 8d209fb8d6b..a2c4aa977e8 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/batch/unversioned/job.go +++ b/pkg/client/clientset_generated/internalclientset/typed/batch/unversioned/job.go @@ -19,6 +19,7 @@ package unversioned import ( api "k8s.io/kubernetes/pkg/api" batch "k8s.io/kubernetes/pkg/apis/batch" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -44,14 +45,14 @@ type JobInterface interface { // jobs implements JobInterface type jobs struct { - client *BatchClient + client restclient.Interface ns string } // newJobs returns a Jobs func newJobs(c *BatchClient, namespace string) *jobs { return &jobs{ - client: c, + client: c.RESTClient(), ns: namespace, } } diff --git a/pkg/client/clientset_generated/internalclientset/typed/batch/unversioned/scheduledjob.go b/pkg/client/clientset_generated/internalclientset/typed/batch/unversioned/scheduledjob.go index 3c3f32ef50f..863d6d90dd8 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/batch/unversioned/scheduledjob.go +++ b/pkg/client/clientset_generated/internalclientset/typed/batch/unversioned/scheduledjob.go @@ -19,6 +19,7 @@ package unversioned import ( api "k8s.io/kubernetes/pkg/api" batch "k8s.io/kubernetes/pkg/apis/batch" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -44,14 +45,14 @@ type ScheduledJobInterface interface { // scheduledJobs implements ScheduledJobInterface type scheduledJobs struct { - client *BatchClient + client restclient.Interface ns string } // newScheduledJobs returns a ScheduledJobs func newScheduledJobs(c *BatchClient, namespace string) *scheduledJobs { return &scheduledJobs{ - client: c, + client: c.RESTClient(), ns: namespace, } } diff --git a/pkg/client/clientset_generated/internalclientset/typed/certificates/unversioned/certificates_client.go b/pkg/client/clientset_generated/internalclientset/typed/certificates/unversioned/certificates_client.go index f0a3d82f26d..c3b7820938a 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/certificates/unversioned/certificates_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/certificates/unversioned/certificates_client.go @@ -23,13 +23,13 @@ import ( ) type CertificatesInterface interface { - GetRESTClient() *restclient.RESTClient + RESTClient() restclient.Interface CertificateSigningRequestsGetter } // CertificatesClient is used to interact with features provided by the Certificates group. type CertificatesClient struct { - *restclient.RESTClient + restClient restclient.Interface } func (c *CertificatesClient) CertificateSigningRequests() CertificateSigningRequestInterface { @@ -60,7 +60,7 @@ func NewForConfigOrDie(c *restclient.Config) *CertificatesClient { } // New creates a new CertificatesClient for the given RESTClient. -func New(c *restclient.RESTClient) *CertificatesClient { +func New(c restclient.Interface) *CertificatesClient { return &CertificatesClient{c} } @@ -89,11 +89,11 @@ func setConfigDefaults(config *restclient.Config) error { return nil } -// GetRESTClient returns a RESTClient that is used to communicate +// RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *CertificatesClient) GetRESTClient() *restclient.RESTClient { +func (c *CertificatesClient) RESTClient() restclient.Interface { if c == nil { return nil } - return c.RESTClient + return c.restClient } diff --git a/pkg/client/clientset_generated/internalclientset/typed/certificates/unversioned/certificatesigningrequest.go b/pkg/client/clientset_generated/internalclientset/typed/certificates/unversioned/certificatesigningrequest.go index e199acf2f66..682c0f32a00 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/certificates/unversioned/certificatesigningrequest.go +++ b/pkg/client/clientset_generated/internalclientset/typed/certificates/unversioned/certificatesigningrequest.go @@ -19,6 +19,7 @@ package unversioned import ( api "k8s.io/kubernetes/pkg/api" certificates "k8s.io/kubernetes/pkg/apis/certificates" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -44,13 +45,13 @@ type CertificateSigningRequestInterface interface { // certificateSigningRequests implements CertificateSigningRequestInterface type certificateSigningRequests struct { - client *CertificatesClient + client restclient.Interface } // newCertificateSigningRequests returns a CertificateSigningRequests func newCertificateSigningRequests(c *CertificatesClient) *certificateSigningRequests { return &certificateSigningRequests{ - client: c, + client: c.RESTClient(), } } diff --git a/pkg/client/clientset_generated/internalclientset/typed/certificates/unversioned/fake/fake_certificates_client.go b/pkg/client/clientset_generated/internalclientset/typed/certificates/unversioned/fake/fake_certificates_client.go index 940b63da7ee..92cf1449a10 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/certificates/unversioned/fake/fake_certificates_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/certificates/unversioned/fake/fake_certificates_client.go @@ -30,8 +30,9 @@ func (c *FakeCertificates) CertificateSigningRequests() unversioned.CertificateS return &FakeCertificateSigningRequests{c} } -// GetRESTClient returns a RESTClient that is used to communicate +// RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeCertificates) GetRESTClient() *restclient.RESTClient { - return nil +func (c *FakeCertificates) RESTClient() restclient.Interface { + var ret *restclient.RESTClient + return ret } diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/componentstatus.go b/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/componentstatus.go index ffdaeb49f04..0f49e4d3c2c 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/componentstatus.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/componentstatus.go @@ -18,6 +18,7 @@ package unversioned import ( api "k8s.io/kubernetes/pkg/api" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -42,13 +43,13 @@ type ComponentStatusInterface interface { // componentStatuses implements ComponentStatusInterface type componentStatuses struct { - client *CoreClient + client restclient.Interface } // newComponentStatuses returns a ComponentStatuses func newComponentStatuses(c *CoreClient) *componentStatuses { return &componentStatuses{ - client: c, + client: c.RESTClient(), } } diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/configmap.go b/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/configmap.go index c937328dcf4..0f8352b5c90 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/configmap.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/configmap.go @@ -18,6 +18,7 @@ package unversioned import ( api "k8s.io/kubernetes/pkg/api" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -42,14 +43,14 @@ type ConfigMapInterface interface { // configMaps implements ConfigMapInterface type configMaps struct { - client *CoreClient + client restclient.Interface ns string } // newConfigMaps returns a ConfigMaps func newConfigMaps(c *CoreClient, namespace string) *configMaps { return &configMaps{ - client: c, + client: c.RESTClient(), ns: namespace, } } diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/core_client.go b/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/core_client.go index e44eaf8bdee..6183e7e4ddd 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/core_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/core_client.go @@ -23,7 +23,7 @@ import ( ) type CoreInterface interface { - GetRESTClient() *restclient.RESTClient + RESTClient() restclient.Interface ComponentStatusesGetter ConfigMapsGetter EndpointsGetter @@ -44,7 +44,7 @@ type CoreInterface interface { // CoreClient is used to interact with features provided by the Core group. type CoreClient struct { - *restclient.RESTClient + restClient restclient.Interface } func (c *CoreClient) ComponentStatuses() ComponentStatusInterface { @@ -135,7 +135,7 @@ func NewForConfigOrDie(c *restclient.Config) *CoreClient { } // New creates a new CoreClient for the given RESTClient. -func New(c *restclient.RESTClient) *CoreClient { +func New(c restclient.Interface) *CoreClient { return &CoreClient{c} } @@ -164,11 +164,11 @@ func setConfigDefaults(config *restclient.Config) error { return nil } -// GetRESTClient returns a RESTClient that is used to communicate +// RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *CoreClient) GetRESTClient() *restclient.RESTClient { +func (c *CoreClient) RESTClient() restclient.Interface { if c == nil { return nil } - return c.RESTClient + return c.restClient } diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/endpoints.go b/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/endpoints.go index d5f383d1517..dbad5180819 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/endpoints.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/endpoints.go @@ -18,6 +18,7 @@ package unversioned import ( api "k8s.io/kubernetes/pkg/api" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -42,14 +43,14 @@ type EndpointsInterface interface { // endpoints implements EndpointsInterface type endpoints struct { - client *CoreClient + client restclient.Interface ns string } // newEndpoints returns a Endpoints func newEndpoints(c *CoreClient, namespace string) *endpoints { return &endpoints{ - client: c, + client: c.RESTClient(), ns: namespace, } } diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/event.go b/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/event.go index d4edcd37a81..dbf92eec99f 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/event.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/event.go @@ -18,6 +18,7 @@ package unversioned import ( api "k8s.io/kubernetes/pkg/api" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -42,14 +43,14 @@ type EventInterface interface { // events implements EventInterface type events struct { - client *CoreClient + client restclient.Interface ns string } // newEvents returns a Events func newEvents(c *CoreClient, namespace string) *events { return &events{ - client: c, + client: c.RESTClient(), ns: namespace, } } diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/fake/fake_core_client.go b/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/fake/fake_core_client.go index 71122d91f35..7dda351c3bb 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/fake/fake_core_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/fake/fake_core_client.go @@ -90,8 +90,9 @@ func (c *FakeCore) ServiceAccounts(namespace string) unversioned.ServiceAccountI return &FakeServiceAccounts{c, namespace} } -// GetRESTClient returns a RESTClient that is used to communicate +// RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeCore) GetRESTClient() *restclient.RESTClient { - return nil +func (c *FakeCore) RESTClient() restclient.Interface { + var ret *restclient.RESTClient + return ret } diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/limitrange.go b/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/limitrange.go index 70cd4fb3e2d..dfbf0a64678 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/limitrange.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/limitrange.go @@ -18,6 +18,7 @@ package unversioned import ( api "k8s.io/kubernetes/pkg/api" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -42,14 +43,14 @@ type LimitRangeInterface interface { // limitRanges implements LimitRangeInterface type limitRanges struct { - client *CoreClient + client restclient.Interface ns string } // newLimitRanges returns a LimitRanges func newLimitRanges(c *CoreClient, namespace string) *limitRanges { return &limitRanges{ - client: c, + client: c.RESTClient(), ns: namespace, } } diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/namespace.go b/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/namespace.go index 7b39f2b8648..fb75e5e7b2d 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/namespace.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/namespace.go @@ -18,6 +18,7 @@ package unversioned import ( api "k8s.io/kubernetes/pkg/api" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -43,13 +44,13 @@ type NamespaceInterface interface { // namespaces implements NamespaceInterface type namespaces struct { - client *CoreClient + client restclient.Interface } // newNamespaces returns a Namespaces func newNamespaces(c *CoreClient) *namespaces { return &namespaces{ - client: c, + client: c.RESTClient(), } } diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/node.go b/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/node.go index 8f4ffcd4813..b7929427fa9 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/node.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/node.go @@ -18,6 +18,7 @@ package unversioned import ( api "k8s.io/kubernetes/pkg/api" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -43,13 +44,13 @@ type NodeInterface interface { // nodes implements NodeInterface type nodes struct { - client *CoreClient + client restclient.Interface } // newNodes returns a Nodes func newNodes(c *CoreClient) *nodes { return &nodes{ - client: c, + client: c.RESTClient(), } } diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/persistentvolume.go b/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/persistentvolume.go index ecca7a375e6..ceea642bfc2 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/persistentvolume.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/persistentvolume.go @@ -18,6 +18,7 @@ package unversioned import ( api "k8s.io/kubernetes/pkg/api" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -43,13 +44,13 @@ type PersistentVolumeInterface interface { // persistentVolumes implements PersistentVolumeInterface type persistentVolumes struct { - client *CoreClient + client restclient.Interface } // newPersistentVolumes returns a PersistentVolumes func newPersistentVolumes(c *CoreClient) *persistentVolumes { return &persistentVolumes{ - client: c, + client: c.RESTClient(), } } diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/persistentvolumeclaim.go b/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/persistentvolumeclaim.go index 45d22eb43ff..589967b872e 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/persistentvolumeclaim.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/persistentvolumeclaim.go @@ -18,6 +18,7 @@ package unversioned import ( api "k8s.io/kubernetes/pkg/api" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -43,14 +44,14 @@ type PersistentVolumeClaimInterface interface { // persistentVolumeClaims implements PersistentVolumeClaimInterface type persistentVolumeClaims struct { - client *CoreClient + client restclient.Interface ns string } // newPersistentVolumeClaims returns a PersistentVolumeClaims func newPersistentVolumeClaims(c *CoreClient, namespace string) *persistentVolumeClaims { return &persistentVolumeClaims{ - client: c, + client: c.RESTClient(), ns: namespace, } } diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/pod.go b/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/pod.go index 595462a0c84..1ce3747d68e 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/pod.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/pod.go @@ -18,6 +18,7 @@ package unversioned import ( api "k8s.io/kubernetes/pkg/api" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -43,14 +44,14 @@ type PodInterface interface { // pods implements PodInterface type pods struct { - client *CoreClient + client restclient.Interface ns string } // newPods returns a Pods func newPods(c *CoreClient, namespace string) *pods { return &pods{ - client: c, + client: c.RESTClient(), ns: namespace, } } diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/podtemplate.go b/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/podtemplate.go index 4494bd34f5f..e5d6f7b4358 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/podtemplate.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/podtemplate.go @@ -18,6 +18,7 @@ package unversioned import ( api "k8s.io/kubernetes/pkg/api" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -42,14 +43,14 @@ type PodTemplateInterface interface { // podTemplates implements PodTemplateInterface type podTemplates struct { - client *CoreClient + client restclient.Interface ns string } // newPodTemplates returns a PodTemplates func newPodTemplates(c *CoreClient, namespace string) *podTemplates { return &podTemplates{ - client: c, + client: c.RESTClient(), ns: namespace, } } diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/replicationcontroller.go b/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/replicationcontroller.go index a1b17576653..dcaa7e02de9 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/replicationcontroller.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/replicationcontroller.go @@ -18,6 +18,7 @@ package unversioned import ( api "k8s.io/kubernetes/pkg/api" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -43,14 +44,14 @@ type ReplicationControllerInterface interface { // replicationControllers implements ReplicationControllerInterface type replicationControllers struct { - client *CoreClient + client restclient.Interface ns string } // newReplicationControllers returns a ReplicationControllers func newReplicationControllers(c *CoreClient, namespace string) *replicationControllers { return &replicationControllers{ - client: c, + client: c.RESTClient(), ns: namespace, } } diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/resourcequota.go b/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/resourcequota.go index 1aa175b926f..c1c8db9dfce 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/resourcequota.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/resourcequota.go @@ -18,6 +18,7 @@ package unversioned import ( api "k8s.io/kubernetes/pkg/api" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -43,14 +44,14 @@ type ResourceQuotaInterface interface { // resourceQuotas implements ResourceQuotaInterface type resourceQuotas struct { - client *CoreClient + client restclient.Interface ns string } // newResourceQuotas returns a ResourceQuotas func newResourceQuotas(c *CoreClient, namespace string) *resourceQuotas { return &resourceQuotas{ - client: c, + client: c.RESTClient(), ns: namespace, } } diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/secret.go b/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/secret.go index f87263cbbb7..a937f8f4b75 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/secret.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/secret.go @@ -18,6 +18,7 @@ package unversioned import ( api "k8s.io/kubernetes/pkg/api" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -42,14 +43,14 @@ type SecretInterface interface { // secrets implements SecretInterface type secrets struct { - client *CoreClient + client restclient.Interface ns string } // newSecrets returns a Secrets func newSecrets(c *CoreClient, namespace string) *secrets { return &secrets{ - client: c, + client: c.RESTClient(), ns: namespace, } } diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/service.go b/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/service.go index 86fa3b22962..97680b33202 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/service.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/service.go @@ -18,6 +18,7 @@ package unversioned import ( api "k8s.io/kubernetes/pkg/api" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -43,14 +44,14 @@ type ServiceInterface interface { // services implements ServiceInterface type services struct { - client *CoreClient + client restclient.Interface ns string } // newServices returns a Services func newServices(c *CoreClient, namespace string) *services { return &services{ - client: c, + client: c.RESTClient(), ns: namespace, } } diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/serviceaccount.go b/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/serviceaccount.go index 14c56b2f4a7..93995242825 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/serviceaccount.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/serviceaccount.go @@ -18,6 +18,7 @@ package unversioned import ( api "k8s.io/kubernetes/pkg/api" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -42,14 +43,14 @@ type ServiceAccountInterface interface { // serviceAccounts implements ServiceAccountInterface type serviceAccounts struct { - client *CoreClient + client restclient.Interface ns string } // newServiceAccounts returns a ServiceAccounts func newServiceAccounts(c *CoreClient, namespace string) *serviceAccounts { return &serviceAccounts{ - client: c, + client: c.RESTClient(), ns: namespace, } } diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/daemonset.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/daemonset.go index 827677d9d8b..75ba112abbe 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/daemonset.go +++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/daemonset.go @@ -19,6 +19,7 @@ package unversioned import ( api "k8s.io/kubernetes/pkg/api" extensions "k8s.io/kubernetes/pkg/apis/extensions" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -44,14 +45,14 @@ type DaemonSetInterface interface { // daemonSets implements DaemonSetInterface type daemonSets struct { - client *ExtensionsClient + client restclient.Interface ns string } // newDaemonSets returns a DaemonSets func newDaemonSets(c *ExtensionsClient, namespace string) *daemonSets { return &daemonSets{ - client: c, + client: c.RESTClient(), ns: namespace, } } diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/deployment.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/deployment.go index 894a7d397c3..f008b338011 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/deployment.go +++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/deployment.go @@ -19,6 +19,7 @@ package unversioned import ( api "k8s.io/kubernetes/pkg/api" extensions "k8s.io/kubernetes/pkg/apis/extensions" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -44,14 +45,14 @@ type DeploymentInterface interface { // deployments implements DeploymentInterface type deployments struct { - client *ExtensionsClient + client restclient.Interface ns string } // newDeployments returns a Deployments func newDeployments(c *ExtensionsClient, namespace string) *deployments { return &deployments{ - client: c, + client: c.RESTClient(), ns: namespace, } } diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/extensions_client.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/extensions_client.go index b1e281e099f..f081c8357ce 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/extensions_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/extensions_client.go @@ -23,7 +23,7 @@ import ( ) type ExtensionsInterface interface { - GetRESTClient() *restclient.RESTClient + RESTClient() restclient.Interface DaemonSetsGetter DeploymentsGetter IngressesGetter @@ -36,7 +36,7 @@ type ExtensionsInterface interface { // ExtensionsClient is used to interact with features provided by the Extensions group. type ExtensionsClient struct { - *restclient.RESTClient + restClient restclient.Interface } func (c *ExtensionsClient) DaemonSets(namespace string) DaemonSetInterface { @@ -95,7 +95,7 @@ func NewForConfigOrDie(c *restclient.Config) *ExtensionsClient { } // New creates a new ExtensionsClient for the given RESTClient. -func New(c *restclient.RESTClient) *ExtensionsClient { +func New(c restclient.Interface) *ExtensionsClient { return &ExtensionsClient{c} } @@ -124,11 +124,11 @@ func setConfigDefaults(config *restclient.Config) error { return nil } -// GetRESTClient returns a RESTClient that is used to communicate +// RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *ExtensionsClient) GetRESTClient() *restclient.RESTClient { +func (c *ExtensionsClient) RESTClient() restclient.Interface { if c == nil { return nil } - return c.RESTClient + return c.restClient } diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/fake/fake_extensions_client.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/fake/fake_extensions_client.go index 19278bed80a..3670a2960de 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/fake/fake_extensions_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/fake/fake_extensions_client.go @@ -58,8 +58,9 @@ func (c *FakeExtensions) ThirdPartyResources() unversioned.ThirdPartyResourceInt return &FakeThirdPartyResources{c} } -// GetRESTClient returns a RESTClient that is used to communicate +// RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeExtensions) GetRESTClient() *restclient.RESTClient { - return nil +func (c *FakeExtensions) RESTClient() restclient.Interface { + var ret *restclient.RESTClient + return ret } diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/ingress.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/ingress.go index 7d941ac8702..0fdfc118b8f 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/ingress.go +++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/ingress.go @@ -19,6 +19,7 @@ package unversioned import ( api "k8s.io/kubernetes/pkg/api" extensions "k8s.io/kubernetes/pkg/apis/extensions" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -44,14 +45,14 @@ type IngressInterface interface { // ingresses implements IngressInterface type ingresses struct { - client *ExtensionsClient + client restclient.Interface ns string } // newIngresses returns a Ingresses func newIngresses(c *ExtensionsClient, namespace string) *ingresses { return &ingresses{ - client: c, + client: c.RESTClient(), ns: namespace, } } diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/networkpolicy.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/networkpolicy.go index a46d3980e2a..91e737d91dd 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/networkpolicy.go +++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/networkpolicy.go @@ -19,6 +19,7 @@ package unversioned import ( api "k8s.io/kubernetes/pkg/api" extensions "k8s.io/kubernetes/pkg/apis/extensions" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -43,14 +44,14 @@ type NetworkPolicyInterface interface { // networkPolicies implements NetworkPolicyInterface type networkPolicies struct { - client *ExtensionsClient + client restclient.Interface ns string } // newNetworkPolicies returns a NetworkPolicies func newNetworkPolicies(c *ExtensionsClient, namespace string) *networkPolicies { return &networkPolicies{ - client: c, + client: c.RESTClient(), ns: namespace, } } diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/podsecuritypolicy.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/podsecuritypolicy.go index e59ba014bb0..a491802240a 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/podsecuritypolicy.go +++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/podsecuritypolicy.go @@ -19,6 +19,7 @@ package unversioned import ( api "k8s.io/kubernetes/pkg/api" extensions "k8s.io/kubernetes/pkg/apis/extensions" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -43,13 +44,13 @@ type PodSecurityPolicyInterface interface { // podSecurityPolicies implements PodSecurityPolicyInterface type podSecurityPolicies struct { - client *ExtensionsClient + client restclient.Interface } // newPodSecurityPolicies returns a PodSecurityPolicies func newPodSecurityPolicies(c *ExtensionsClient) *podSecurityPolicies { return &podSecurityPolicies{ - client: c, + client: c.RESTClient(), } } diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/replicaset.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/replicaset.go index fc6987b5ba0..804f2d7f2a2 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/replicaset.go +++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/replicaset.go @@ -19,6 +19,7 @@ package unversioned import ( api "k8s.io/kubernetes/pkg/api" extensions "k8s.io/kubernetes/pkg/apis/extensions" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -44,14 +45,14 @@ type ReplicaSetInterface interface { // replicaSets implements ReplicaSetInterface type replicaSets struct { - client *ExtensionsClient + client restclient.Interface ns string } // newReplicaSets returns a ReplicaSets func newReplicaSets(c *ExtensionsClient, namespace string) *replicaSets { return &replicaSets{ - client: c, + client: c.RESTClient(), ns: namespace, } } diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/scale.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/scale.go index 12455ca888a..94bafbdfaa9 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/scale.go +++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/scale.go @@ -16,6 +16,10 @@ limitations under the License. package unversioned +import ( + restclient "k8s.io/kubernetes/pkg/client/restclient" +) + // ScalesGetter has a method to return a ScaleInterface. // A group's client should implement this interface. type ScalesGetter interface { @@ -29,14 +33,14 @@ type ScaleInterface interface { // scales implements ScaleInterface type scales struct { - client *ExtensionsClient + client restclient.Interface ns string } // newScales returns a Scales func newScales(c *ExtensionsClient, namespace string) *scales { return &scales{ - client: c, + client: c.RESTClient(), ns: namespace, } } diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/thirdpartyresource.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/thirdpartyresource.go index 914ae240353..6f2e8d65061 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/thirdpartyresource.go +++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/thirdpartyresource.go @@ -19,6 +19,7 @@ package unversioned import ( api "k8s.io/kubernetes/pkg/api" extensions "k8s.io/kubernetes/pkg/apis/extensions" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -43,13 +44,13 @@ type ThirdPartyResourceInterface interface { // thirdPartyResources implements ThirdPartyResourceInterface type thirdPartyResources struct { - client *ExtensionsClient + client restclient.Interface } // newThirdPartyResources returns a ThirdPartyResources func newThirdPartyResources(c *ExtensionsClient) *thirdPartyResources { return &thirdPartyResources{ - client: c, + client: c.RESTClient(), } } diff --git a/pkg/client/clientset_generated/internalclientset/typed/policy/unversioned/fake/fake_policy_client.go b/pkg/client/clientset_generated/internalclientset/typed/policy/unversioned/fake/fake_policy_client.go index 017aa05a2c0..e019322b61b 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/policy/unversioned/fake/fake_policy_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/policy/unversioned/fake/fake_policy_client.go @@ -30,8 +30,9 @@ func (c *FakePolicy) PodDisruptionBudgets(namespace string) unversioned.PodDisru return &FakePodDisruptionBudgets{c, namespace} } -// GetRESTClient returns a RESTClient that is used to communicate +// RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakePolicy) GetRESTClient() *restclient.RESTClient { - return nil +func (c *FakePolicy) RESTClient() restclient.Interface { + var ret *restclient.RESTClient + return ret } diff --git a/pkg/client/clientset_generated/internalclientset/typed/policy/unversioned/poddisruptionbudget.go b/pkg/client/clientset_generated/internalclientset/typed/policy/unversioned/poddisruptionbudget.go index 05dc5ced71a..1c8c91ede1c 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/policy/unversioned/poddisruptionbudget.go +++ b/pkg/client/clientset_generated/internalclientset/typed/policy/unversioned/poddisruptionbudget.go @@ -19,6 +19,7 @@ package unversioned import ( api "k8s.io/kubernetes/pkg/api" policy "k8s.io/kubernetes/pkg/apis/policy" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -44,14 +45,14 @@ type PodDisruptionBudgetInterface interface { // podDisruptionBudgets implements PodDisruptionBudgetInterface type podDisruptionBudgets struct { - client *PolicyClient + client restclient.Interface ns string } // newPodDisruptionBudgets returns a PodDisruptionBudgets func newPodDisruptionBudgets(c *PolicyClient, namespace string) *podDisruptionBudgets { return &podDisruptionBudgets{ - client: c, + client: c.RESTClient(), ns: namespace, } } diff --git a/pkg/client/clientset_generated/internalclientset/typed/policy/unversioned/policy_client.go b/pkg/client/clientset_generated/internalclientset/typed/policy/unversioned/policy_client.go index 923db44453f..6a6aa06e508 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/policy/unversioned/policy_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/policy/unversioned/policy_client.go @@ -23,13 +23,13 @@ import ( ) type PolicyInterface interface { - GetRESTClient() *restclient.RESTClient + RESTClient() restclient.Interface PodDisruptionBudgetsGetter } // PolicyClient is used to interact with features provided by the Policy group. type PolicyClient struct { - *restclient.RESTClient + restClient restclient.Interface } func (c *PolicyClient) PodDisruptionBudgets(namespace string) PodDisruptionBudgetInterface { @@ -60,7 +60,7 @@ func NewForConfigOrDie(c *restclient.Config) *PolicyClient { } // New creates a new PolicyClient for the given RESTClient. -func New(c *restclient.RESTClient) *PolicyClient { +func New(c restclient.Interface) *PolicyClient { return &PolicyClient{c} } @@ -89,11 +89,11 @@ func setConfigDefaults(config *restclient.Config) error { return nil } -// GetRESTClient returns a RESTClient that is used to communicate +// RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *PolicyClient) GetRESTClient() *restclient.RESTClient { +func (c *PolicyClient) RESTClient() restclient.Interface { if c == nil { return nil } - return c.RESTClient + return c.restClient } diff --git a/pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned/clusterrole.go b/pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned/clusterrole.go index 2ad8d75c5e6..1037a6807e5 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned/clusterrole.go +++ b/pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned/clusterrole.go @@ -19,6 +19,7 @@ package unversioned import ( api "k8s.io/kubernetes/pkg/api" rbac "k8s.io/kubernetes/pkg/apis/rbac" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -43,13 +44,13 @@ type ClusterRoleInterface interface { // clusterRoles implements ClusterRoleInterface type clusterRoles struct { - client *RbacClient + client restclient.Interface } // newClusterRoles returns a ClusterRoles func newClusterRoles(c *RbacClient) *clusterRoles { return &clusterRoles{ - client: c, + client: c.RESTClient(), } } diff --git a/pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned/clusterrolebinding.go b/pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned/clusterrolebinding.go index 1f88d7edbc8..94ead7a98c4 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned/clusterrolebinding.go +++ b/pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned/clusterrolebinding.go @@ -19,6 +19,7 @@ package unversioned import ( api "k8s.io/kubernetes/pkg/api" rbac "k8s.io/kubernetes/pkg/apis/rbac" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -43,13 +44,13 @@ type ClusterRoleBindingInterface interface { // clusterRoleBindings implements ClusterRoleBindingInterface type clusterRoleBindings struct { - client *RbacClient + client restclient.Interface } // newClusterRoleBindings returns a ClusterRoleBindings func newClusterRoleBindings(c *RbacClient) *clusterRoleBindings { return &clusterRoleBindings{ - client: c, + client: c.RESTClient(), } } diff --git a/pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned/fake/fake_rbac_client.go b/pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned/fake/fake_rbac_client.go index 9e3a130db35..682a2b58370 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned/fake/fake_rbac_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned/fake/fake_rbac_client.go @@ -42,8 +42,9 @@ func (c *FakeRbac) RoleBindings(namespace string) unversioned.RoleBindingInterfa return &FakeRoleBindings{c, namespace} } -// GetRESTClient returns a RESTClient that is used to communicate +// RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeRbac) GetRESTClient() *restclient.RESTClient { - return nil +func (c *FakeRbac) RESTClient() restclient.Interface { + var ret *restclient.RESTClient + return ret } diff --git a/pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned/rbac_client.go b/pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned/rbac_client.go index b3a64991585..731768c35a7 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned/rbac_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned/rbac_client.go @@ -23,7 +23,7 @@ import ( ) type RbacInterface interface { - GetRESTClient() *restclient.RESTClient + RESTClient() restclient.Interface ClusterRolesGetter ClusterRoleBindingsGetter RolesGetter @@ -32,7 +32,7 @@ type RbacInterface interface { // RbacClient is used to interact with features provided by the Rbac group. type RbacClient struct { - *restclient.RESTClient + restClient restclient.Interface } func (c *RbacClient) ClusterRoles() ClusterRoleInterface { @@ -75,7 +75,7 @@ func NewForConfigOrDie(c *restclient.Config) *RbacClient { } // New creates a new RbacClient for the given RESTClient. -func New(c *restclient.RESTClient) *RbacClient { +func New(c restclient.Interface) *RbacClient { return &RbacClient{c} } @@ -104,11 +104,11 @@ func setConfigDefaults(config *restclient.Config) error { return nil } -// GetRESTClient returns a RESTClient that is used to communicate +// RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *RbacClient) GetRESTClient() *restclient.RESTClient { +func (c *RbacClient) RESTClient() restclient.Interface { if c == nil { return nil } - return c.RESTClient + return c.restClient } diff --git a/pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned/role.go b/pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned/role.go index 76dafee01e2..05140b23d91 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned/role.go +++ b/pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned/role.go @@ -19,6 +19,7 @@ package unversioned import ( api "k8s.io/kubernetes/pkg/api" rbac "k8s.io/kubernetes/pkg/apis/rbac" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -43,14 +44,14 @@ type RoleInterface interface { // roles implements RoleInterface type roles struct { - client *RbacClient + client restclient.Interface ns string } // newRoles returns a Roles func newRoles(c *RbacClient, namespace string) *roles { return &roles{ - client: c, + client: c.RESTClient(), ns: namespace, } } diff --git a/pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned/rolebinding.go b/pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned/rolebinding.go index e62fe2105cd..be6669f2e94 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned/rolebinding.go +++ b/pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned/rolebinding.go @@ -19,6 +19,7 @@ package unversioned import ( api "k8s.io/kubernetes/pkg/api" rbac "k8s.io/kubernetes/pkg/apis/rbac" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -43,14 +44,14 @@ type RoleBindingInterface interface { // roleBindings implements RoleBindingInterface type roleBindings struct { - client *RbacClient + client restclient.Interface ns string } // newRoleBindings returns a RoleBindings func newRoleBindings(c *RbacClient, namespace string) *roleBindings { return &roleBindings{ - client: c, + client: c.RESTClient(), ns: namespace, } } diff --git a/pkg/client/clientset_generated/internalclientset/typed/storage/unversioned/fake/fake_storage_client.go b/pkg/client/clientset_generated/internalclientset/typed/storage/unversioned/fake/fake_storage_client.go index 7b2c0762302..64ba35ac5b5 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/storage/unversioned/fake/fake_storage_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/storage/unversioned/fake/fake_storage_client.go @@ -30,8 +30,9 @@ func (c *FakeStorage) StorageClasses() unversioned.StorageClassInterface { return &FakeStorageClasses{c} } -// GetRESTClient returns a RESTClient that is used to communicate +// RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeStorage) GetRESTClient() *restclient.RESTClient { - return nil +func (c *FakeStorage) RESTClient() restclient.Interface { + var ret *restclient.RESTClient + return ret } diff --git a/pkg/client/clientset_generated/internalclientset/typed/storage/unversioned/storage_client.go b/pkg/client/clientset_generated/internalclientset/typed/storage/unversioned/storage_client.go index 3d95a3f86c8..f009cb0a4a2 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/storage/unversioned/storage_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/storage/unversioned/storage_client.go @@ -23,13 +23,13 @@ import ( ) type StorageInterface interface { - GetRESTClient() *restclient.RESTClient + RESTClient() restclient.Interface StorageClassesGetter } // StorageClient is used to interact with features provided by the Storage group. type StorageClient struct { - *restclient.RESTClient + restClient restclient.Interface } func (c *StorageClient) StorageClasses() StorageClassInterface { @@ -60,7 +60,7 @@ func NewForConfigOrDie(c *restclient.Config) *StorageClient { } // New creates a new StorageClient for the given RESTClient. -func New(c *restclient.RESTClient) *StorageClient { +func New(c restclient.Interface) *StorageClient { return &StorageClient{c} } @@ -89,11 +89,11 @@ func setConfigDefaults(config *restclient.Config) error { return nil } -// GetRESTClient returns a RESTClient that is used to communicate +// RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *StorageClient) GetRESTClient() *restclient.RESTClient { +func (c *StorageClient) RESTClient() restclient.Interface { if c == nil { return nil } - return c.RESTClient + return c.restClient } diff --git a/pkg/client/clientset_generated/internalclientset/typed/storage/unversioned/storageclass.go b/pkg/client/clientset_generated/internalclientset/typed/storage/unversioned/storageclass.go index 63795b6a25a..8b4321cae75 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/storage/unversioned/storageclass.go +++ b/pkg/client/clientset_generated/internalclientset/typed/storage/unversioned/storageclass.go @@ -19,6 +19,7 @@ package unversioned import ( api "k8s.io/kubernetes/pkg/api" storage "k8s.io/kubernetes/pkg/apis/storage" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -43,13 +44,13 @@ type StorageClassInterface interface { // storageClasses implements StorageClassInterface type storageClasses struct { - client *StorageClient + client restclient.Interface } // newStorageClasses returns a StorageClasses func newStorageClasses(c *StorageClient) *storageClasses { return &storageClasses{ - client: c, + client: c.RESTClient(), } } diff --git a/pkg/client/clientset_generated/release_1_5/clientset.go b/pkg/client/clientset_generated/release_1_5/clientset.go index 76f453bd24d..77045f0d217 100644 --- a/pkg/client/clientset_generated/release_1_5/clientset.go +++ b/pkg/client/clientset_generated/release_1_5/clientset.go @@ -242,7 +242,7 @@ func NewForConfigOrDie(c *restclient.Config) *Clientset { } // New creates a new Clientset for the given RESTClient. -func New(c *restclient.RESTClient) *Clientset { +func New(c restclient.Interface) *Clientset { var clientset Clientset clientset.CoreClient = v1core.New(c) clientset.AppsClient = v1alpha1apps.New(c) diff --git a/pkg/client/clientset_generated/release_1_5/typed/apps/v1alpha1/apps_client.go b/pkg/client/clientset_generated/release_1_5/typed/apps/v1alpha1/apps_client.go index 949599b3e7d..e6657bcb7f2 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/apps/v1alpha1/apps_client.go +++ b/pkg/client/clientset_generated/release_1_5/typed/apps/v1alpha1/apps_client.go @@ -24,13 +24,13 @@ import ( ) type AppsInterface interface { - GetRESTClient() *restclient.RESTClient + RESTClient() restclient.Interface PetSetsGetter } // AppsClient is used to interact with features provided by the Apps group. type AppsClient struct { - *restclient.RESTClient + restClient restclient.Interface } func (c *AppsClient) PetSets(namespace string) PetSetInterface { @@ -61,7 +61,7 @@ func NewForConfigOrDie(c *restclient.Config) *AppsClient { } // New creates a new AppsClient for the given RESTClient. -func New(c *restclient.RESTClient) *AppsClient { +func New(c restclient.Interface) *AppsClient { return &AppsClient{c} } @@ -86,11 +86,11 @@ func setConfigDefaults(config *restclient.Config) error { return nil } -// GetRESTClient returns a RESTClient that is used to communicate +// RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *AppsClient) GetRESTClient() *restclient.RESTClient { +func (c *AppsClient) RESTClient() restclient.Interface { if c == nil { return nil } - return c.RESTClient + return c.restClient } diff --git a/pkg/client/clientset_generated/release_1_5/typed/apps/v1alpha1/fake/fake_apps_client.go b/pkg/client/clientset_generated/release_1_5/typed/apps/v1alpha1/fake/fake_apps_client.go index 9578281e41a..2026ea4bf2c 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/apps/v1alpha1/fake/fake_apps_client.go +++ b/pkg/client/clientset_generated/release_1_5/typed/apps/v1alpha1/fake/fake_apps_client.go @@ -30,8 +30,9 @@ func (c *FakeApps) PetSets(namespace string) v1alpha1.PetSetInterface { return &FakePetSets{c, namespace} } -// GetRESTClient returns a RESTClient that is used to communicate +// RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeApps) GetRESTClient() *restclient.RESTClient { - return nil +func (c *FakeApps) RESTClient() restclient.Interface { + var ret *restclient.RESTClient + return ret } diff --git a/pkg/client/clientset_generated/release_1_5/typed/apps/v1alpha1/petset.go b/pkg/client/clientset_generated/release_1_5/typed/apps/v1alpha1/petset.go index c534e1908ae..2c231985ca6 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/apps/v1alpha1/petset.go +++ b/pkg/client/clientset_generated/release_1_5/typed/apps/v1alpha1/petset.go @@ -20,6 +20,7 @@ import ( api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" v1alpha1 "k8s.io/kubernetes/pkg/apis/apps/v1alpha1" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -45,14 +46,14 @@ type PetSetInterface interface { // petSets implements PetSetInterface type petSets struct { - client *AppsClient + client restclient.Interface ns string } // newPetSets returns a PetSets func newPetSets(c *AppsClient, namespace string) *petSets { return &petSets{ - client: c, + client: c.RESTClient(), ns: namespace, } } diff --git a/pkg/client/clientset_generated/release_1_5/typed/authentication/v1beta1/authentication_client.go b/pkg/client/clientset_generated/release_1_5/typed/authentication/v1beta1/authentication_client.go index a05a7c9226f..1898e7a1dfe 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/authentication/v1beta1/authentication_client.go +++ b/pkg/client/clientset_generated/release_1_5/typed/authentication/v1beta1/authentication_client.go @@ -24,13 +24,13 @@ import ( ) type AuthenticationInterface interface { - GetRESTClient() *restclient.RESTClient + RESTClient() restclient.Interface TokenReviewsGetter } // AuthenticationClient is used to interact with features provided by the Authentication group. type AuthenticationClient struct { - *restclient.RESTClient + restClient restclient.Interface } func (c *AuthenticationClient) TokenReviews() TokenReviewInterface { @@ -61,7 +61,7 @@ func NewForConfigOrDie(c *restclient.Config) *AuthenticationClient { } // New creates a new AuthenticationClient for the given RESTClient. -func New(c *restclient.RESTClient) *AuthenticationClient { +func New(c restclient.Interface) *AuthenticationClient { return &AuthenticationClient{c} } @@ -86,11 +86,11 @@ func setConfigDefaults(config *restclient.Config) error { return nil } -// GetRESTClient returns a RESTClient that is used to communicate +// RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *AuthenticationClient) GetRESTClient() *restclient.RESTClient { +func (c *AuthenticationClient) RESTClient() restclient.Interface { if c == nil { return nil } - return c.RESTClient + return c.restClient } diff --git a/pkg/client/clientset_generated/release_1_5/typed/authentication/v1beta1/fake/fake_authentication_client.go b/pkg/client/clientset_generated/release_1_5/typed/authentication/v1beta1/fake/fake_authentication_client.go index 96ba85d5a8d..64e8b350c59 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/authentication/v1beta1/fake/fake_authentication_client.go +++ b/pkg/client/clientset_generated/release_1_5/typed/authentication/v1beta1/fake/fake_authentication_client.go @@ -30,8 +30,9 @@ func (c *FakeAuthentication) TokenReviews() v1beta1.TokenReviewInterface { return &FakeTokenReviews{c} } -// GetRESTClient returns a RESTClient that is used to communicate +// RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeAuthentication) GetRESTClient() *restclient.RESTClient { - return nil +func (c *FakeAuthentication) RESTClient() restclient.Interface { + var ret *restclient.RESTClient + return ret } diff --git a/pkg/client/clientset_generated/release_1_5/typed/authentication/v1beta1/tokenreview.go b/pkg/client/clientset_generated/release_1_5/typed/authentication/v1beta1/tokenreview.go index dc9313bae3d..452c3073cf3 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/authentication/v1beta1/tokenreview.go +++ b/pkg/client/clientset_generated/release_1_5/typed/authentication/v1beta1/tokenreview.go @@ -16,6 +16,10 @@ limitations under the License. package v1beta1 +import ( + restclient "k8s.io/kubernetes/pkg/client/restclient" +) + // TokenReviewsGetter has a method to return a TokenReviewInterface. // A group's client should implement this interface. type TokenReviewsGetter interface { @@ -29,12 +33,12 @@ type TokenReviewInterface interface { // tokenReviews implements TokenReviewInterface type tokenReviews struct { - client *AuthenticationClient + client restclient.Interface } // newTokenReviews returns a TokenReviews func newTokenReviews(c *AuthenticationClient) *tokenReviews { return &tokenReviews{ - client: c, + client: c.RESTClient(), } } 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 index 7b55d185ae1..649c6273841 100644 --- 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 @@ -24,7 +24,7 @@ import ( ) type AuthorizationInterface interface { - GetRESTClient() *restclient.RESTClient + RESTClient() restclient.Interface LocalSubjectAccessReviewsGetter SelfSubjectAccessReviewsGetter SubjectAccessReviewsGetter @@ -32,7 +32,7 @@ type AuthorizationInterface interface { // AuthorizationClient is used to interact with features provided by the Authorization group. type AuthorizationClient struct { - *restclient.RESTClient + restClient restclient.Interface } func (c *AuthorizationClient) LocalSubjectAccessReviews(namespace string) LocalSubjectAccessReviewInterface { @@ -71,7 +71,7 @@ func NewForConfigOrDie(c *restclient.Config) *AuthorizationClient { } // New creates a new AuthorizationClient for the given RESTClient. -func New(c *restclient.RESTClient) *AuthorizationClient { +func New(c restclient.Interface) *AuthorizationClient { return &AuthorizationClient{c} } @@ -96,11 +96,11 @@ func setConfigDefaults(config *restclient.Config) error { return nil } -// GetRESTClient returns a RESTClient that is used to communicate +// RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *AuthorizationClient) GetRESTClient() *restclient.RESTClient { +func (c *AuthorizationClient) RESTClient() restclient.Interface { if c == nil { return nil } - return c.RESTClient + return c.restClient } 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 index 32c8afe9908..260476dcae6 100644 --- 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 @@ -38,8 +38,9 @@ func (c *FakeAuthorization) SubjectAccessReviews() v1beta1.SubjectAccessReviewIn return &FakeSubjectAccessReviews{c} } -// GetRESTClient returns a RESTClient that is used to communicate +// RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeAuthorization) GetRESTClient() *restclient.RESTClient { - return nil +func (c *FakeAuthorization) RESTClient() restclient.Interface { + var ret *restclient.RESTClient + return ret } diff --git a/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/localsubjectaccessreview.go b/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/localsubjectaccessreview.go index c605b8d04d2..0f14ad5278c 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/localsubjectaccessreview.go +++ b/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/localsubjectaccessreview.go @@ -16,6 +16,10 @@ limitations under the License. package v1beta1 +import ( + restclient "k8s.io/kubernetes/pkg/client/restclient" +) + // LocalSubjectAccessReviewsGetter has a method to return a LocalSubjectAccessReviewInterface. // A group's client should implement this interface. type LocalSubjectAccessReviewsGetter interface { @@ -29,14 +33,14 @@ type LocalSubjectAccessReviewInterface interface { // localSubjectAccessReviews implements LocalSubjectAccessReviewInterface type localSubjectAccessReviews struct { - client *AuthorizationClient + client restclient.Interface ns string } // newLocalSubjectAccessReviews returns a LocalSubjectAccessReviews func newLocalSubjectAccessReviews(c *AuthorizationClient, namespace string) *localSubjectAccessReviews { return &localSubjectAccessReviews{ - client: c, + client: c.RESTClient(), ns: namespace, } } diff --git a/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/selfsubjectaccessreview.go b/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/selfsubjectaccessreview.go index 7e0fd5fc260..bce0a107c6e 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/selfsubjectaccessreview.go +++ b/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/selfsubjectaccessreview.go @@ -16,6 +16,10 @@ limitations under the License. package v1beta1 +import ( + restclient "k8s.io/kubernetes/pkg/client/restclient" +) + // SelfSubjectAccessReviewsGetter has a method to return a SelfSubjectAccessReviewInterface. // A group's client should implement this interface. type SelfSubjectAccessReviewsGetter interface { @@ -29,12 +33,12 @@ type SelfSubjectAccessReviewInterface interface { // selfSubjectAccessReviews implements SelfSubjectAccessReviewInterface type selfSubjectAccessReviews struct { - client *AuthorizationClient + client restclient.Interface } // newSelfSubjectAccessReviews returns a SelfSubjectAccessReviews func newSelfSubjectAccessReviews(c *AuthorizationClient) *selfSubjectAccessReviews { return &selfSubjectAccessReviews{ - client: c, + client: c.RESTClient(), } } 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 index 1c936721852..ef62ced9d25 100644 --- 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 @@ -16,6 +16,10 @@ limitations under the License. package v1beta1 +import ( + restclient "k8s.io/kubernetes/pkg/client/restclient" +) + // SubjectAccessReviewsGetter has a method to return a SubjectAccessReviewInterface. // A group's client should implement this interface. type SubjectAccessReviewsGetter interface { @@ -29,12 +33,12 @@ type SubjectAccessReviewInterface interface { // subjectAccessReviews implements SubjectAccessReviewInterface type subjectAccessReviews struct { - client *AuthorizationClient + client restclient.Interface } // newSubjectAccessReviews returns a SubjectAccessReviews func newSubjectAccessReviews(c *AuthorizationClient) *subjectAccessReviews { return &subjectAccessReviews{ - client: c, + client: c.RESTClient(), } } 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 index 259aea047c3..320ba73d333 100644 --- 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 @@ -24,13 +24,13 @@ import ( ) type AutoscalingInterface interface { - GetRESTClient() *restclient.RESTClient + RESTClient() restclient.Interface HorizontalPodAutoscalersGetter } // AutoscalingClient is used to interact with features provided by the Autoscaling group. type AutoscalingClient struct { - *restclient.RESTClient + restClient restclient.Interface } func (c *AutoscalingClient) HorizontalPodAutoscalers(namespace string) HorizontalPodAutoscalerInterface { @@ -61,7 +61,7 @@ func NewForConfigOrDie(c *restclient.Config) *AutoscalingClient { } // New creates a new AutoscalingClient for the given RESTClient. -func New(c *restclient.RESTClient) *AutoscalingClient { +func New(c restclient.Interface) *AutoscalingClient { return &AutoscalingClient{c} } @@ -86,11 +86,11 @@ func setConfigDefaults(config *restclient.Config) error { return nil } -// GetRESTClient returns a RESTClient that is used to communicate +// RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *AutoscalingClient) GetRESTClient() *restclient.RESTClient { +func (c *AutoscalingClient) RESTClient() restclient.Interface { if c == nil { return nil } - return c.RESTClient + return c.restClient } 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 index 58753a4fa27..2243c08075d 100644 --- 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 @@ -30,8 +30,9 @@ func (c *FakeAutoscaling) HorizontalPodAutoscalers(namespace string) v1.Horizont return &FakeHorizontalPodAutoscalers{c, namespace} } -// GetRESTClient returns a RESTClient that is used to communicate +// RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeAutoscaling) GetRESTClient() *restclient.RESTClient { - return nil +func (c *FakeAutoscaling) RESTClient() restclient.Interface { + var ret *restclient.RESTClient + return ret } diff --git a/pkg/client/clientset_generated/release_1_5/typed/autoscaling/v1/horizontalpodautoscaler.go b/pkg/client/clientset_generated/release_1_5/typed/autoscaling/v1/horizontalpodautoscaler.go index 64653fdd230..d09bd4ead19 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/autoscaling/v1/horizontalpodautoscaler.go +++ b/pkg/client/clientset_generated/release_1_5/typed/autoscaling/v1/horizontalpodautoscaler.go @@ -20,6 +20,7 @@ import ( api "k8s.io/kubernetes/pkg/api" api_v1 "k8s.io/kubernetes/pkg/api/v1" v1 "k8s.io/kubernetes/pkg/apis/autoscaling/v1" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -45,14 +46,14 @@ type HorizontalPodAutoscalerInterface interface { // horizontalPodAutoscalers implements HorizontalPodAutoscalerInterface type horizontalPodAutoscalers struct { - client *AutoscalingClient + client restclient.Interface ns string } // newHorizontalPodAutoscalers returns a HorizontalPodAutoscalers func newHorizontalPodAutoscalers(c *AutoscalingClient, namespace string) *horizontalPodAutoscalers { return &horizontalPodAutoscalers{ - client: c, + client: c.RESTClient(), ns: namespace, } } 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 index 46e4d518f8e..84d73c4c97c 100644 --- 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 @@ -24,13 +24,13 @@ import ( ) type BatchInterface interface { - GetRESTClient() *restclient.RESTClient + RESTClient() restclient.Interface JobsGetter } // BatchClient is used to interact with features provided by the Batch group. type BatchClient struct { - *restclient.RESTClient + restClient restclient.Interface } func (c *BatchClient) Jobs(namespace string) JobInterface { @@ -61,7 +61,7 @@ func NewForConfigOrDie(c *restclient.Config) *BatchClient { } // New creates a new BatchClient for the given RESTClient. -func New(c *restclient.RESTClient) *BatchClient { +func New(c restclient.Interface) *BatchClient { return &BatchClient{c} } @@ -86,11 +86,11 @@ func setConfigDefaults(config *restclient.Config) error { return nil } -// GetRESTClient returns a RESTClient that is used to communicate +// RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *BatchClient) GetRESTClient() *restclient.RESTClient { +func (c *BatchClient) RESTClient() restclient.Interface { if c == nil { return nil } - return c.RESTClient + return c.restClient } 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 index 72aeb6df32f..4fd07c84d04 100644 --- 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 @@ -30,8 +30,9 @@ func (c *FakeBatch) Jobs(namespace string) v1.JobInterface { return &FakeJobs{c, namespace} } -// GetRESTClient returns a RESTClient that is used to communicate +// RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeBatch) GetRESTClient() *restclient.RESTClient { - return nil +func (c *FakeBatch) RESTClient() restclient.Interface { + var ret *restclient.RESTClient + return ret } 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 index b2d84c1642a..752256defba 100644 --- 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 @@ -20,6 +20,7 @@ import ( api "k8s.io/kubernetes/pkg/api" api_v1 "k8s.io/kubernetes/pkg/api/v1" v1 "k8s.io/kubernetes/pkg/apis/batch/v1" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -45,14 +46,14 @@ type JobInterface interface { // jobs implements JobInterface type jobs struct { - client *BatchClient + client restclient.Interface ns string } // newJobs returns a Jobs func newJobs(c *BatchClient, namespace string) *jobs { return &jobs{ - client: c, + client: c.RESTClient(), ns: namespace, } } diff --git a/pkg/client/clientset_generated/release_1_5/typed/certificates/v1alpha1/certificates_client.go b/pkg/client/clientset_generated/release_1_5/typed/certificates/v1alpha1/certificates_client.go index f93cbbb8c10..df8e4ef9fbb 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/certificates/v1alpha1/certificates_client.go +++ b/pkg/client/clientset_generated/release_1_5/typed/certificates/v1alpha1/certificates_client.go @@ -24,13 +24,13 @@ import ( ) type CertificatesInterface interface { - GetRESTClient() *restclient.RESTClient + RESTClient() restclient.Interface CertificateSigningRequestsGetter } // CertificatesClient is used to interact with features provided by the Certificates group. type CertificatesClient struct { - *restclient.RESTClient + restClient restclient.Interface } func (c *CertificatesClient) CertificateSigningRequests() CertificateSigningRequestInterface { @@ -61,7 +61,7 @@ func NewForConfigOrDie(c *restclient.Config) *CertificatesClient { } // New creates a new CertificatesClient for the given RESTClient. -func New(c *restclient.RESTClient) *CertificatesClient { +func New(c restclient.Interface) *CertificatesClient { return &CertificatesClient{c} } @@ -86,11 +86,11 @@ func setConfigDefaults(config *restclient.Config) error { return nil } -// GetRESTClient returns a RESTClient that is used to communicate +// RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *CertificatesClient) GetRESTClient() *restclient.RESTClient { +func (c *CertificatesClient) RESTClient() restclient.Interface { if c == nil { return nil } - return c.RESTClient + return c.restClient } diff --git a/pkg/client/clientset_generated/release_1_5/typed/certificates/v1alpha1/certificatesigningrequest.go b/pkg/client/clientset_generated/release_1_5/typed/certificates/v1alpha1/certificatesigningrequest.go index 219388e7a7f..d08fc5ab117 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/certificates/v1alpha1/certificatesigningrequest.go +++ b/pkg/client/clientset_generated/release_1_5/typed/certificates/v1alpha1/certificatesigningrequest.go @@ -20,6 +20,7 @@ import ( api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" v1alpha1 "k8s.io/kubernetes/pkg/apis/certificates/v1alpha1" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -45,13 +46,13 @@ type CertificateSigningRequestInterface interface { // certificateSigningRequests implements CertificateSigningRequestInterface type certificateSigningRequests struct { - client *CertificatesClient + client restclient.Interface } // newCertificateSigningRequests returns a CertificateSigningRequests func newCertificateSigningRequests(c *CertificatesClient) *certificateSigningRequests { return &certificateSigningRequests{ - client: c, + client: c.RESTClient(), } } diff --git a/pkg/client/clientset_generated/release_1_5/typed/certificates/v1alpha1/fake/fake_certificates_client.go b/pkg/client/clientset_generated/release_1_5/typed/certificates/v1alpha1/fake/fake_certificates_client.go index 7285311200a..7e215c7f808 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/certificates/v1alpha1/fake/fake_certificates_client.go +++ b/pkg/client/clientset_generated/release_1_5/typed/certificates/v1alpha1/fake/fake_certificates_client.go @@ -30,8 +30,9 @@ func (c *FakeCertificates) CertificateSigningRequests() v1alpha1.CertificateSign return &FakeCertificateSigningRequests{c} } -// GetRESTClient returns a RESTClient that is used to communicate +// RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeCertificates) GetRESTClient() *restclient.RESTClient { - return nil +func (c *FakeCertificates) RESTClient() restclient.Interface { + var ret *restclient.RESTClient + return ret } diff --git a/pkg/client/clientset_generated/release_1_5/typed/core/v1/componentstatus.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/componentstatus.go index 5c5d795dea1..bc0d6e457f7 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/core/v1/componentstatus.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/componentstatus.go @@ -19,6 +19,7 @@ package v1 import ( api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -43,13 +44,13 @@ type ComponentStatusInterface interface { // componentStatuses implements ComponentStatusInterface type componentStatuses struct { - client *CoreClient + client restclient.Interface } // newComponentStatuses returns a ComponentStatuses func newComponentStatuses(c *CoreClient) *componentStatuses { return &componentStatuses{ - client: c, + client: c.RESTClient(), } } diff --git a/pkg/client/clientset_generated/release_1_5/typed/core/v1/configmap.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/configmap.go index 8ded33fb0bd..74831c42f99 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/core/v1/configmap.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/configmap.go @@ -19,6 +19,7 @@ package v1 import ( api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -43,14 +44,14 @@ type ConfigMapInterface interface { // configMaps implements ConfigMapInterface type configMaps struct { - client *CoreClient + client restclient.Interface ns string } // newConfigMaps returns a ConfigMaps func newConfigMaps(c *CoreClient, namespace string) *configMaps { return &configMaps{ - client: c, + client: c.RESTClient(), ns: namespace, } } diff --git a/pkg/client/clientset_generated/release_1_5/typed/core/v1/core_client.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/core_client.go index a36e2b1d535..2c9d7c712c2 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/core/v1/core_client.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/core_client.go @@ -24,7 +24,7 @@ import ( ) type CoreInterface interface { - GetRESTClient() *restclient.RESTClient + RESTClient() restclient.Interface ComponentStatusesGetter ConfigMapsGetter EndpointsGetter @@ -45,7 +45,7 @@ type CoreInterface interface { // CoreClient is used to interact with features provided by the Core group. type CoreClient struct { - *restclient.RESTClient + restClient restclient.Interface } func (c *CoreClient) ComponentStatuses() ComponentStatusInterface { @@ -136,7 +136,7 @@ func NewForConfigOrDie(c *restclient.Config) *CoreClient { } // New creates a new CoreClient for the given RESTClient. -func New(c *restclient.RESTClient) *CoreClient { +func New(c restclient.Interface) *CoreClient { return &CoreClient{c} } @@ -161,11 +161,11 @@ func setConfigDefaults(config *restclient.Config) error { return nil } -// GetRESTClient returns a RESTClient that is used to communicate +// RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *CoreClient) GetRESTClient() *restclient.RESTClient { +func (c *CoreClient) RESTClient() restclient.Interface { if c == nil { return nil } - return c.RESTClient + return c.restClient } diff --git a/pkg/client/clientset_generated/release_1_5/typed/core/v1/endpoints.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/endpoints.go index 1120ab21a97..2ba9c091b7d 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/core/v1/endpoints.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/endpoints.go @@ -19,6 +19,7 @@ package v1 import ( api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -43,14 +44,14 @@ type EndpointsInterface interface { // endpoints implements EndpointsInterface type endpoints struct { - client *CoreClient + client restclient.Interface ns string } // newEndpoints returns a Endpoints func newEndpoints(c *CoreClient, namespace string) *endpoints { return &endpoints{ - client: c, + client: c.RESTClient(), ns: namespace, } } 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 index b0502c650c5..fc9287bc318 100644 --- 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 @@ -19,6 +19,7 @@ package v1 import ( api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -43,14 +44,14 @@ type EventInterface interface { // events implements EventInterface type events struct { - client *CoreClient + client restclient.Interface ns string } // newEvents returns a Events func newEvents(c *CoreClient, namespace string) *events { return &events{ - client: c, + client: c.RESTClient(), ns: namespace, } } diff --git a/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_core_client.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_core_client.go index 109d2a04a9e..7d5fef05ee9 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_core_client.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_core_client.go @@ -90,8 +90,9 @@ func (c *FakeCore) ServiceAccounts(namespace string) v1.ServiceAccountInterface return &FakeServiceAccounts{c, namespace} } -// GetRESTClient returns a RESTClient that is used to communicate +// RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeCore) GetRESTClient() *restclient.RESTClient { - return nil +func (c *FakeCore) RESTClient() restclient.Interface { + var ret *restclient.RESTClient + return ret } diff --git a/pkg/client/clientset_generated/release_1_5/typed/core/v1/limitrange.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/limitrange.go index 8d873b645c7..a81582b0bf4 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/core/v1/limitrange.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/limitrange.go @@ -19,6 +19,7 @@ package v1 import ( api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -43,14 +44,14 @@ type LimitRangeInterface interface { // limitRanges implements LimitRangeInterface type limitRanges struct { - client *CoreClient + client restclient.Interface ns string } // newLimitRanges returns a LimitRanges func newLimitRanges(c *CoreClient, namespace string) *limitRanges { return &limitRanges{ - client: c, + client: c.RESTClient(), ns: namespace, } } 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 index 59b73631593..287a0367191 100644 --- 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 @@ -19,6 +19,7 @@ package v1 import ( api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -44,13 +45,13 @@ type NamespaceInterface interface { // namespaces implements NamespaceInterface type namespaces struct { - client *CoreClient + client restclient.Interface } // newNamespaces returns a Namespaces func newNamespaces(c *CoreClient) *namespaces { return &namespaces{ - client: c, + client: c.RESTClient(), } } diff --git a/pkg/client/clientset_generated/release_1_5/typed/core/v1/node.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/node.go index 8d6d99adc99..19823861401 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/core/v1/node.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/node.go @@ -19,6 +19,7 @@ package v1 import ( api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -44,13 +45,13 @@ type NodeInterface interface { // nodes implements NodeInterface type nodes struct { - client *CoreClient + client restclient.Interface } // newNodes returns a Nodes func newNodes(c *CoreClient) *nodes { return &nodes{ - client: c, + client: c.RESTClient(), } } diff --git a/pkg/client/clientset_generated/release_1_5/typed/core/v1/persistentvolume.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/persistentvolume.go index a82ba8d2cfe..d551fe0786c 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/core/v1/persistentvolume.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/persistentvolume.go @@ -19,6 +19,7 @@ package v1 import ( api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -44,13 +45,13 @@ type PersistentVolumeInterface interface { // persistentVolumes implements PersistentVolumeInterface type persistentVolumes struct { - client *CoreClient + client restclient.Interface } // newPersistentVolumes returns a PersistentVolumes func newPersistentVolumes(c *CoreClient) *persistentVolumes { return &persistentVolumes{ - client: c, + client: c.RESTClient(), } } 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 index 6e56f1298a4..85d262c475b 100644 --- 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 @@ -19,6 +19,7 @@ package v1 import ( api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -44,14 +45,14 @@ type PersistentVolumeClaimInterface interface { // persistentVolumeClaims implements PersistentVolumeClaimInterface type persistentVolumeClaims struct { - client *CoreClient + client restclient.Interface ns string } // newPersistentVolumeClaims returns a PersistentVolumeClaims func newPersistentVolumeClaims(c *CoreClient, namespace string) *persistentVolumeClaims { return &persistentVolumeClaims{ - client: c, + client: c.RESTClient(), ns: namespace, } } diff --git a/pkg/client/clientset_generated/release_1_5/typed/core/v1/pod.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/pod.go index 524c8a423f0..584df2968ad 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/core/v1/pod.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/pod.go @@ -19,6 +19,7 @@ package v1 import ( api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -44,14 +45,14 @@ type PodInterface interface { // pods implements PodInterface type pods struct { - client *CoreClient + client restclient.Interface ns string } // newPods returns a Pods func newPods(c *CoreClient, namespace string) *pods { return &pods{ - client: c, + client: c.RESTClient(), ns: namespace, } } diff --git a/pkg/client/clientset_generated/release_1_5/typed/core/v1/podtemplate.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/podtemplate.go index 89df1f74a70..a68f2649be1 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/core/v1/podtemplate.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/podtemplate.go @@ -19,6 +19,7 @@ package v1 import ( api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -43,14 +44,14 @@ type PodTemplateInterface interface { // podTemplates implements PodTemplateInterface type podTemplates struct { - client *CoreClient + client restclient.Interface ns string } // newPodTemplates returns a PodTemplates func newPodTemplates(c *CoreClient, namespace string) *podTemplates { return &podTemplates{ - client: c, + client: c.RESTClient(), ns: namespace, } } diff --git a/pkg/client/clientset_generated/release_1_5/typed/core/v1/replicationcontroller.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/replicationcontroller.go index 150922c3c83..4538db0a0b9 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/core/v1/replicationcontroller.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/replicationcontroller.go @@ -19,6 +19,7 @@ package v1 import ( api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -44,14 +45,14 @@ type ReplicationControllerInterface interface { // replicationControllers implements ReplicationControllerInterface type replicationControllers struct { - client *CoreClient + client restclient.Interface ns string } // newReplicationControllers returns a ReplicationControllers func newReplicationControllers(c *CoreClient, namespace string) *replicationControllers { return &replicationControllers{ - client: c, + client: c.RESTClient(), ns: namespace, } } diff --git a/pkg/client/clientset_generated/release_1_5/typed/core/v1/resourcequota.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/resourcequota.go index a25f1054486..4e3469bdb9f 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/core/v1/resourcequota.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/resourcequota.go @@ -19,6 +19,7 @@ package v1 import ( api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -44,14 +45,14 @@ type ResourceQuotaInterface interface { // resourceQuotas implements ResourceQuotaInterface type resourceQuotas struct { - client *CoreClient + client restclient.Interface ns string } // newResourceQuotas returns a ResourceQuotas func newResourceQuotas(c *CoreClient, namespace string) *resourceQuotas { return &resourceQuotas{ - client: c, + client: c.RESTClient(), ns: namespace, } } 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 index 394c08cc408..c0f7095e01b 100644 --- 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 @@ -19,6 +19,7 @@ package v1 import ( api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -43,14 +44,14 @@ type SecretInterface interface { // secrets implements SecretInterface type secrets struct { - client *CoreClient + client restclient.Interface ns string } // newSecrets returns a Secrets func newSecrets(c *CoreClient, namespace string) *secrets { return &secrets{ - client: c, + client: c.RESTClient(), ns: namespace, } } 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 index 493795ff8a3..4b2fd5bcf68 100644 --- 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 @@ -19,6 +19,7 @@ package v1 import ( api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -44,14 +45,14 @@ type ServiceInterface interface { // services implements ServiceInterface type services struct { - client *CoreClient + client restclient.Interface ns string } // newServices returns a Services func newServices(c *CoreClient, namespace string) *services { return &services{ - client: c, + client: c.RESTClient(), ns: namespace, } } diff --git a/pkg/client/clientset_generated/release_1_5/typed/core/v1/serviceaccount.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/serviceaccount.go index dd38e5a71f3..1cabffb903f 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/core/v1/serviceaccount.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/serviceaccount.go @@ -19,6 +19,7 @@ package v1 import ( api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -43,14 +44,14 @@ type ServiceAccountInterface interface { // serviceAccounts implements ServiceAccountInterface type serviceAccounts struct { - client *CoreClient + client restclient.Interface ns string } // newServiceAccounts returns a ServiceAccounts func newServiceAccounts(c *CoreClient, namespace string) *serviceAccounts { return &serviceAccounts{ - client: c, + client: c.RESTClient(), ns: namespace, } } diff --git a/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/daemonset.go b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/daemonset.go index e474283543f..071e9825349 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/daemonset.go +++ b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/daemonset.go @@ -20,6 +20,7 @@ import ( api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -45,14 +46,14 @@ type DaemonSetInterface interface { // daemonSets implements DaemonSetInterface type daemonSets struct { - client *ExtensionsClient + client restclient.Interface ns string } // newDaemonSets returns a DaemonSets func newDaemonSets(c *ExtensionsClient, namespace string) *daemonSets { return &daemonSets{ - client: c, + client: c.RESTClient(), ns: namespace, } } diff --git a/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/deployment.go b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/deployment.go index ec06e754f99..d77fa7931e4 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/deployment.go +++ b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/deployment.go @@ -20,6 +20,7 @@ import ( api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -45,14 +46,14 @@ type DeploymentInterface interface { // deployments implements DeploymentInterface type deployments struct { - client *ExtensionsClient + client restclient.Interface ns string } // newDeployments returns a Deployments func newDeployments(c *ExtensionsClient, namespace string) *deployments { return &deployments{ - client: c, + client: c.RESTClient(), ns: namespace, } } diff --git a/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/extensions_client.go b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/extensions_client.go index 9f796cbb7ea..69a19557f2d 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/extensions_client.go +++ b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/extensions_client.go @@ -24,7 +24,7 @@ import ( ) type ExtensionsInterface interface { - GetRESTClient() *restclient.RESTClient + RESTClient() restclient.Interface DaemonSetsGetter DeploymentsGetter IngressesGetter @@ -37,7 +37,7 @@ type ExtensionsInterface interface { // ExtensionsClient is used to interact with features provided by the Extensions group. type ExtensionsClient struct { - *restclient.RESTClient + restClient restclient.Interface } func (c *ExtensionsClient) DaemonSets(namespace string) DaemonSetInterface { @@ -96,7 +96,7 @@ func NewForConfigOrDie(c *restclient.Config) *ExtensionsClient { } // New creates a new ExtensionsClient for the given RESTClient. -func New(c *restclient.RESTClient) *ExtensionsClient { +func New(c restclient.Interface) *ExtensionsClient { return &ExtensionsClient{c} } @@ -121,11 +121,11 @@ func setConfigDefaults(config *restclient.Config) error { return nil } -// GetRESTClient returns a RESTClient that is used to communicate +// RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *ExtensionsClient) GetRESTClient() *restclient.RESTClient { +func (c *ExtensionsClient) RESTClient() restclient.Interface { if c == nil { return nil } - return c.RESTClient + return c.restClient } diff --git a/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/fake_extensions_client.go b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/fake_extensions_client.go index 0108289274f..6095ff2c65f 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/fake_extensions_client.go +++ b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/fake_extensions_client.go @@ -58,8 +58,9 @@ func (c *FakeExtensions) ThirdPartyResources() v1beta1.ThirdPartyResourceInterfa return &FakeThirdPartyResources{c} } -// GetRESTClient returns a RESTClient that is used to communicate +// RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeExtensions) GetRESTClient() *restclient.RESTClient { - return nil +func (c *FakeExtensions) RESTClient() restclient.Interface { + var ret *restclient.RESTClient + return ret } 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 index f383279836f..287fbba9493 100644 --- 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 @@ -20,6 +20,7 @@ import ( api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -45,14 +46,14 @@ type IngressInterface interface { // ingresses implements IngressInterface type ingresses struct { - client *ExtensionsClient + client restclient.Interface ns string } // newIngresses returns a Ingresses func newIngresses(c *ExtensionsClient, namespace string) *ingresses { return &ingresses{ - client: c, + client: c.RESTClient(), ns: namespace, } } diff --git a/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/job.go b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/job.go index 3238c9a027b..513850f38be 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/job.go +++ b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/job.go @@ -20,6 +20,7 @@ import ( api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -45,14 +46,14 @@ type JobInterface interface { // jobs implements JobInterface type jobs struct { - client *ExtensionsClient + client restclient.Interface ns string } // newJobs returns a Jobs func newJobs(c *ExtensionsClient, namespace string) *jobs { return &jobs{ - client: c, + client: c.RESTClient(), ns: namespace, } } 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 index dcbf98a52cf..9b38e8c2781 100644 --- 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 @@ -20,6 +20,7 @@ import ( api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -44,13 +45,13 @@ type PodSecurityPolicyInterface interface { // podSecurityPolicies implements PodSecurityPolicyInterface type podSecurityPolicies struct { - client *ExtensionsClient + client restclient.Interface } // newPodSecurityPolicies returns a PodSecurityPolicies func newPodSecurityPolicies(c *ExtensionsClient) *podSecurityPolicies { return &podSecurityPolicies{ - client: c, + client: c.RESTClient(), } } 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 index e30b4552f96..c3de95de5f5 100644 --- 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 @@ -20,6 +20,7 @@ import ( api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -45,14 +46,14 @@ type ReplicaSetInterface interface { // replicaSets implements ReplicaSetInterface type replicaSets struct { - client *ExtensionsClient + client restclient.Interface ns string } // newReplicaSets returns a ReplicaSets func newReplicaSets(c *ExtensionsClient, namespace string) *replicaSets { return &replicaSets{ - client: c, + client: c.RESTClient(), ns: namespace, } } diff --git a/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/scale.go b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/scale.go index 3a7be158a62..8ba905c6424 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/scale.go +++ b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/scale.go @@ -16,6 +16,10 @@ limitations under the License. package v1beta1 +import ( + restclient "k8s.io/kubernetes/pkg/client/restclient" +) + // ScalesGetter has a method to return a ScaleInterface. // A group's client should implement this interface. type ScalesGetter interface { @@ -29,14 +33,14 @@ type ScaleInterface interface { // scales implements ScaleInterface type scales struct { - client *ExtensionsClient + client restclient.Interface ns string } // newScales returns a Scales func newScales(c *ExtensionsClient, namespace string) *scales { return &scales{ - client: c, + client: c.RESTClient(), ns: namespace, } } diff --git a/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/thirdpartyresource.go b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/thirdpartyresource.go index 66a2807cd6e..924967c6655 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/thirdpartyresource.go +++ b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/thirdpartyresource.go @@ -20,6 +20,7 @@ import ( api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -44,13 +45,13 @@ type ThirdPartyResourceInterface interface { // thirdPartyResources implements ThirdPartyResourceInterface type thirdPartyResources struct { - client *ExtensionsClient + client restclient.Interface } // newThirdPartyResources returns a ThirdPartyResources func newThirdPartyResources(c *ExtensionsClient) *thirdPartyResources { return &thirdPartyResources{ - client: c, + client: c.RESTClient(), } } 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 index bc8eba9b185..993f2873b3b 100644 --- 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 @@ -30,8 +30,9 @@ func (c *FakePolicy) PodDisruptionBudgets(namespace string) v1alpha1.PodDisrupti return &FakePodDisruptionBudgets{c, namespace} } -// GetRESTClient returns a RESTClient that is used to communicate +// RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakePolicy) GetRESTClient() *restclient.RESTClient { - return nil +func (c *FakePolicy) RESTClient() restclient.Interface { + var ret *restclient.RESTClient + return ret } 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 index 6e549713bd0..3e348ced90f 100644 --- 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 @@ -20,6 +20,7 @@ import ( api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" v1alpha1 "k8s.io/kubernetes/pkg/apis/policy/v1alpha1" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -45,14 +46,14 @@ type PodDisruptionBudgetInterface interface { // podDisruptionBudgets implements PodDisruptionBudgetInterface type podDisruptionBudgets struct { - client *PolicyClient + client restclient.Interface ns string } // newPodDisruptionBudgets returns a PodDisruptionBudgets func newPodDisruptionBudgets(c *PolicyClient, namespace string) *podDisruptionBudgets { return &podDisruptionBudgets{ - client: c, + client: c.RESTClient(), ns: namespace, } } 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 index f8841b962b4..aa2f41005a2 100644 --- 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 @@ -24,13 +24,13 @@ import ( ) type PolicyInterface interface { - GetRESTClient() *restclient.RESTClient + RESTClient() restclient.Interface PodDisruptionBudgetsGetter } // PolicyClient is used to interact with features provided by the Policy group. type PolicyClient struct { - *restclient.RESTClient + restClient restclient.Interface } func (c *PolicyClient) PodDisruptionBudgets(namespace string) PodDisruptionBudgetInterface { @@ -61,7 +61,7 @@ func NewForConfigOrDie(c *restclient.Config) *PolicyClient { } // New creates a new PolicyClient for the given RESTClient. -func New(c *restclient.RESTClient) *PolicyClient { +func New(c restclient.Interface) *PolicyClient { return &PolicyClient{c} } @@ -86,11 +86,11 @@ func setConfigDefaults(config *restclient.Config) error { return nil } -// GetRESTClient returns a RESTClient that is used to communicate +// RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *PolicyClient) GetRESTClient() *restclient.RESTClient { +func (c *PolicyClient) RESTClient() restclient.Interface { if c == nil { return nil } - return c.RESTClient + return c.restClient } diff --git a/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/clusterrole.go b/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/clusterrole.go index b87f05bf3c5..2e5604bcd31 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/clusterrole.go +++ b/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/clusterrole.go @@ -20,6 +20,7 @@ import ( api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" v1alpha1 "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -44,13 +45,13 @@ type ClusterRoleInterface interface { // clusterRoles implements ClusterRoleInterface type clusterRoles struct { - client *RbacClient + client restclient.Interface } // newClusterRoles returns a ClusterRoles func newClusterRoles(c *RbacClient) *clusterRoles { return &clusterRoles{ - client: c, + client: c.RESTClient(), } } diff --git a/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/clusterrolebinding.go b/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/clusterrolebinding.go index 98723ef1685..ebe7a967212 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/clusterrolebinding.go +++ b/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/clusterrolebinding.go @@ -20,6 +20,7 @@ import ( api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" v1alpha1 "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -44,13 +45,13 @@ type ClusterRoleBindingInterface interface { // clusterRoleBindings implements ClusterRoleBindingInterface type clusterRoleBindings struct { - client *RbacClient + client restclient.Interface } // newClusterRoleBindings returns a ClusterRoleBindings func newClusterRoleBindings(c *RbacClient) *clusterRoleBindings { return &clusterRoleBindings{ - client: c, + client: c.RESTClient(), } } diff --git a/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/fake/fake_rbac_client.go b/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/fake/fake_rbac_client.go index 586660b50b1..f132a415f1b 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/fake/fake_rbac_client.go +++ b/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/fake/fake_rbac_client.go @@ -42,8 +42,9 @@ func (c *FakeRbac) RoleBindings(namespace string) v1alpha1.RoleBindingInterface return &FakeRoleBindings{c, namespace} } -// GetRESTClient returns a RESTClient that is used to communicate +// RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeRbac) GetRESTClient() *restclient.RESTClient { - return nil +func (c *FakeRbac) RESTClient() restclient.Interface { + var ret *restclient.RESTClient + return ret } diff --git a/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/rbac_client.go b/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/rbac_client.go index 86323956e9d..c702d93f640 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/rbac_client.go +++ b/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/rbac_client.go @@ -24,7 +24,7 @@ import ( ) type RbacInterface interface { - GetRESTClient() *restclient.RESTClient + RESTClient() restclient.Interface ClusterRolesGetter ClusterRoleBindingsGetter RolesGetter @@ -33,7 +33,7 @@ type RbacInterface interface { // RbacClient is used to interact with features provided by the Rbac group. type RbacClient struct { - *restclient.RESTClient + restClient restclient.Interface } func (c *RbacClient) ClusterRoles() ClusterRoleInterface { @@ -76,7 +76,7 @@ func NewForConfigOrDie(c *restclient.Config) *RbacClient { } // New creates a new RbacClient for the given RESTClient. -func New(c *restclient.RESTClient) *RbacClient { +func New(c restclient.Interface) *RbacClient { return &RbacClient{c} } @@ -101,11 +101,11 @@ func setConfigDefaults(config *restclient.Config) error { return nil } -// GetRESTClient returns a RESTClient that is used to communicate +// RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *RbacClient) GetRESTClient() *restclient.RESTClient { +func (c *RbacClient) RESTClient() restclient.Interface { if c == nil { return nil } - return c.RESTClient + return c.restClient } diff --git a/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/role.go b/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/role.go index 83debf19b2d..ae1600d0edd 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/role.go +++ b/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/role.go @@ -20,6 +20,7 @@ import ( api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" v1alpha1 "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -44,14 +45,14 @@ type RoleInterface interface { // roles implements RoleInterface type roles struct { - client *RbacClient + client restclient.Interface ns string } // newRoles returns a Roles func newRoles(c *RbacClient, namespace string) *roles { return &roles{ - client: c, + client: c.RESTClient(), ns: namespace, } } diff --git a/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/rolebinding.go b/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/rolebinding.go index d937e8b4d6d..a83c1f9008c 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/rolebinding.go +++ b/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/rolebinding.go @@ -20,6 +20,7 @@ import ( api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" v1alpha1 "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -44,14 +45,14 @@ type RoleBindingInterface interface { // roleBindings implements RoleBindingInterface type roleBindings struct { - client *RbacClient + client restclient.Interface ns string } // newRoleBindings returns a RoleBindings func newRoleBindings(c *RbacClient, namespace string) *roleBindings { return &roleBindings{ - client: c, + client: c.RESTClient(), ns: namespace, } } diff --git a/pkg/client/clientset_generated/release_1_5/typed/storage/v1beta1/fake/fake_storage_client.go b/pkg/client/clientset_generated/release_1_5/typed/storage/v1beta1/fake/fake_storage_client.go index 703f7436c68..b145ba06cdc 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/storage/v1beta1/fake/fake_storage_client.go +++ b/pkg/client/clientset_generated/release_1_5/typed/storage/v1beta1/fake/fake_storage_client.go @@ -30,8 +30,9 @@ func (c *FakeStorage) StorageClasses() v1beta1.StorageClassInterface { return &FakeStorageClasses{c} } -// GetRESTClient returns a RESTClient that is used to communicate +// RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeStorage) GetRESTClient() *restclient.RESTClient { - return nil +func (c *FakeStorage) RESTClient() restclient.Interface { + var ret *restclient.RESTClient + return ret } diff --git a/pkg/client/clientset_generated/release_1_5/typed/storage/v1beta1/storage_client.go b/pkg/client/clientset_generated/release_1_5/typed/storage/v1beta1/storage_client.go index 285ea0e9000..75addfddbb4 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/storage/v1beta1/storage_client.go +++ b/pkg/client/clientset_generated/release_1_5/typed/storage/v1beta1/storage_client.go @@ -24,13 +24,13 @@ import ( ) type StorageInterface interface { - GetRESTClient() *restclient.RESTClient + RESTClient() restclient.Interface StorageClassesGetter } // StorageClient is used to interact with features provided by the Storage group. type StorageClient struct { - *restclient.RESTClient + restClient restclient.Interface } func (c *StorageClient) StorageClasses() StorageClassInterface { @@ -61,7 +61,7 @@ func NewForConfigOrDie(c *restclient.Config) *StorageClient { } // New creates a new StorageClient for the given RESTClient. -func New(c *restclient.RESTClient) *StorageClient { +func New(c restclient.Interface) *StorageClient { return &StorageClient{c} } @@ -86,11 +86,11 @@ func setConfigDefaults(config *restclient.Config) error { return nil } -// GetRESTClient returns a RESTClient that is used to communicate +// RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *StorageClient) GetRESTClient() *restclient.RESTClient { +func (c *StorageClient) RESTClient() restclient.Interface { if c == nil { return nil } - return c.RESTClient + return c.restClient } diff --git a/pkg/client/clientset_generated/release_1_5/typed/storage/v1beta1/storageclass.go b/pkg/client/clientset_generated/release_1_5/typed/storage/v1beta1/storageclass.go index a438b81c89d..f85b0f5f996 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/storage/v1beta1/storageclass.go +++ b/pkg/client/clientset_generated/release_1_5/typed/storage/v1beta1/storageclass.go @@ -20,6 +20,7 @@ import ( api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" v1beta1 "k8s.io/kubernetes/pkg/apis/storage/v1beta1" + restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" ) @@ -44,13 +45,13 @@ type StorageClassInterface interface { // storageClasses implements StorageClassInterface type storageClasses struct { - client *StorageClient + client restclient.Interface } // newStorageClasses returns a StorageClasses func newStorageClasses(c *StorageClient) *storageClasses { return &storageClasses{ - client: c, + client: c.RESTClient(), } } diff --git a/pkg/client/restclient/client.go b/pkg/client/restclient/client.go index 1ebd3d95055..9a22ddc139b 100644 --- a/pkg/client/restclient/client.go +++ b/pkg/client/restclient/client.go @@ -38,6 +38,18 @@ const ( envBackoffDuration = "KUBE_CLIENT_BACKOFF_DURATION" ) +// Interface captures the set of operations for generically interacting with Kubernetes REST apis. +type Interface interface { + GetRateLimiter() flowcontrol.RateLimiter + Verb(verb string) *Request + Post() *Request + Put() *Request + Patch(pt api.PatchType) *Request + Get() *Request + Delete() *Request + APIVersion() unversioned.GroupVersion +} + // RESTClient imposes common Kubernetes API conventions on a set of resource paths. // The baseURL is expected to point to an HTTP or HTTPS path that is the parent // of one or more resources. The server should return a decodable API resource diff --git a/pkg/client/typed/discovery/discovery_client.go b/pkg/client/typed/discovery/discovery_client.go index 5e08cee7790..0cb7da4f42e 100644 --- a/pkg/client/typed/discovery/discovery_client.go +++ b/pkg/client/typed/discovery/discovery_client.go @@ -38,6 +38,7 @@ import ( // DiscoveryInterface holds the methods that discover server-supported API groups, // versions and resources. type DiscoveryInterface interface { + RESTClient() restclient.Interface ServerGroupsInterface ServerResourcesInterface ServerVersionInterface @@ -80,7 +81,7 @@ type SwaggerSchemaInterface interface { // DiscoveryClient implements the functions that discover server-supported API groups, // versions and resources. type DiscoveryClient struct { - *restclient.RESTClient + restClient restclient.Interface LegacyPrefix string } @@ -107,7 +108,7 @@ func apiVersionsToAPIGroup(apiVersions *unversioned.APIVersions) (apiGroup unver func (d *DiscoveryClient) ServerGroups() (apiGroupList *unversioned.APIGroupList, err error) { // Get the groupVersions exposed at /api v := &unversioned.APIVersions{} - err = d.Get().AbsPath(d.LegacyPrefix).Do().Into(v) + err = d.restClient.Get().AbsPath(d.LegacyPrefix).Do().Into(v) apiGroup := unversioned.APIGroup{} if err == nil { apiGroup = apiVersionsToAPIGroup(v) @@ -118,7 +119,7 @@ func (d *DiscoveryClient) ServerGroups() (apiGroupList *unversioned.APIGroupList // Get the groupVersions exposed at /apis apiGroupList = &unversioned.APIGroupList{} - err = d.Get().AbsPath("/apis").Do().Into(apiGroupList) + err = d.restClient.Get().AbsPath("/apis").Do().Into(apiGroupList) if err != nil && !errors.IsNotFound(err) && !errors.IsForbidden(err) { return nil, err } @@ -144,7 +145,7 @@ func (d *DiscoveryClient) ServerResourcesForGroupVersion(groupVersion string) (r url.Path = "/apis/" + groupVersion } resources = &unversioned.APIResourceList{} - err = d.Get().AbsPath(url.String()).Do().Into(resources) + err = d.restClient.Get().AbsPath(url.String()).Do().Into(resources) if err != nil { // ignore 403 or 404 error to be compatible with an v1.0 server. if groupVersion == "v1" && (errors.IsNotFound(err) || errors.IsForbidden(err)) { @@ -255,7 +256,7 @@ func (d *DiscoveryClient) ServerPreferredNamespacedResources() ([]unversioned.Gr // ServerVersion retrieves and parses the server's version (git version). func (d *DiscoveryClient) ServerVersion() (*version.Info, error) { - body, err := d.Get().AbsPath("/version").Do().Raw() + body, err := d.restClient.Get().AbsPath("/version").Do().Raw() if err != nil { return nil, err } @@ -289,7 +290,7 @@ func (d *DiscoveryClient) SwaggerSchema(version unversioned.GroupVersion) (*swag path = "/swaggerapi/apis/" + version.Group + "/" + version.Version } - body, err := d.Get().AbsPath(path).Do().Raw() + body, err := d.restClient.Get().AbsPath(path).Do().Raw() if err != nil { return nil, err } @@ -323,7 +324,7 @@ func NewDiscoveryClientForConfig(c *restclient.Config) (*DiscoveryClient, error) return nil, err } client, err := restclient.UnversionedRESTClientFor(&config) - return &DiscoveryClient{RESTClient: client, LegacyPrefix: "/api"}, err + return &DiscoveryClient{restClient: client, LegacyPrefix: "/api"}, err } // NewDiscoveryClientForConfig creates a new DiscoveryClient for the given config. If @@ -338,8 +339,8 @@ func NewDiscoveryClientForConfigOrDie(c *restclient.Config) *DiscoveryClient { } // New creates a new DiscoveryClient for the given RESTClient. -func NewDiscoveryClient(c *restclient.RESTClient) *DiscoveryClient { - return &DiscoveryClient{RESTClient: c, LegacyPrefix: "/api"} +func NewDiscoveryClient(c restclient.Interface) *DiscoveryClient { + return &DiscoveryClient{restClient: c, LegacyPrefix: "/api"} } func stringDoesntExistIn(str string, slice []string) bool { @@ -350,3 +351,12 @@ func stringDoesntExistIn(str string, slice []string) bool { } return true } + +// RESTClient returns a RESTClient that is used to communicate +// with API server by this client implementation. +func (c *DiscoveryClient) RESTClient() restclient.Interface { + if c == nil { + return nil + } + return c.restClient +} diff --git a/pkg/client/typed/discovery/fake/discovery.go b/pkg/client/typed/discovery/fake/discovery.go index 25b48c076a5..596a51aac50 100644 --- a/pkg/client/typed/discovery/fake/discovery.go +++ b/pkg/client/typed/discovery/fake/discovery.go @@ -20,6 +20,7 @@ import ( "github.com/emicklei/go-restful/swagger" "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/api/v1" + "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/client/testing/core" "k8s.io/kubernetes/pkg/version" ) @@ -80,3 +81,7 @@ func (c *FakeDiscovery) SwaggerSchema(version unversioned.GroupVersion) (*swagge c.Invokes(action, nil) return &swagger.ApiDeclaration{}, nil } + +func (c *FakeDiscovery) RESTClient() restclient.Interface { + return nil +} diff --git a/pkg/client/unversioned/fake/fake.go b/pkg/client/unversioned/fake/fake.go index 902ac30588d..9a96b57aea3 100644 --- a/pkg/client/unversioned/fake/fake.go +++ b/pkg/client/unversioned/fake/fake.go @@ -23,10 +23,12 @@ import ( "net/url" "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util/flowcontrol" ) func CreateHTTPClient(roundTripper func(*http.Request) (*http.Response, error)) *http.Client { @@ -71,6 +73,18 @@ func (c *RESTClient) Delete() *restclient.Request { return c.request("DELETE") } +func (c *RESTClient) Verb(verb string) *restclient.Request { + return c.request(verb) +} + +func (c *RESTClient) APIVersion() unversioned.GroupVersion { + return *(testapi.Default.GroupVersion()) +} + +func (c *RESTClient) GetRateLimiter() flowcontrol.RateLimiter { + return nil +} + func (c *RESTClient) request(verb string) *restclient.Request { config := restclient.ContentConfig{ ContentType: runtime.ContentTypeJSON, diff --git a/pkg/client/unversioned/helper_blackbox_test.go b/pkg/client/unversioned/helper_blackbox_test.go index f1599e8fc2a..297e41c614f 100644 --- a/pkg/client/unversioned/helper_blackbox_test.go +++ b/pkg/client/unversioned/helper_blackbox_test.go @@ -140,7 +140,7 @@ func TestNegotiateVersion(t *testing.T) { }), } c := unversioned.NewOrDie(test.config) - c.DiscoveryClient.Client = fakeClient.Client + c.DiscoveryClient.RESTClient().(*restclient.RESTClient).Client = fakeClient.Client response, err := unversioned.NegotiateVersion(c, test.config, test.version, test.clientVersions) if err == nil && test.expectErr != nil { t.Errorf("expected error, got nil for [%s].", test.name) diff --git a/pkg/client/unversioned/testclient/testclient.go b/pkg/client/unversioned/testclient/testclient.go index 02b483118ce..fb3195ebc3b 100644 --- a/pkg/client/unversioned/testclient/testclient.go +++ b/pkg/client/unversioned/testclient/testclient.go @@ -527,3 +527,7 @@ func (c *FakeDiscovery) ServerVersion() (*version.Info, error) { versionInfo := version.Get() return &versionInfo, nil } + +func (c *FakeDiscovery) RESTClient() restclient.Interface { + return nil +} diff --git a/pkg/controller/daemon/daemoncontroller.go b/pkg/controller/daemon/daemoncontroller.go index f0fd00777e4..47bf7ab9b9a 100644 --- a/pkg/controller/daemon/daemoncontroller.go +++ b/pkg/controller/daemon/daemoncontroller.go @@ -97,8 +97,8 @@ func NewDaemonSetsController(daemonSetInformer informers.DaemonSetInformer, podI // TODO: remove the wrapper when every clients have moved to use the clientset. eventBroadcaster.StartRecordingToSink(&unversionedcore.EventSinkImpl{Interface: kubeClient.Core().Events("")}) - if kubeClient != nil && kubeClient.Core().GetRESTClient().GetRateLimiter() != nil { - metrics.RegisterMetricAndTrackRateLimiterUsage("daemon_controller", kubeClient.Core().GetRESTClient().GetRateLimiter()) + if kubeClient != nil && kubeClient.Core().RESTClient().GetRateLimiter() != nil { + metrics.RegisterMetricAndTrackRateLimiterUsage("daemon_controller", kubeClient.Core().RESTClient().GetRateLimiter()) } dsc := &DaemonSetsController{ kubeClient: kubeClient, diff --git a/pkg/controller/deployment/deployment_controller.go b/pkg/controller/deployment/deployment_controller.go index 66226677ea9..f04c872ed2f 100644 --- a/pkg/controller/deployment/deployment_controller.go +++ b/pkg/controller/deployment/deployment_controller.go @@ -93,8 +93,8 @@ func NewDeploymentController(dInformer informers.DeploymentInformer, rsInformer // TODO: remove the wrapper when every clients have moved to use the clientset. eventBroadcaster.StartRecordingToSink(&unversionedcore.EventSinkImpl{Interface: client.Core().Events("")}) - if client != nil && client.Core().GetRESTClient().GetRateLimiter() != nil { - metrics.RegisterMetricAndTrackRateLimiterUsage("deployment_controller", client.Core().GetRESTClient().GetRateLimiter()) + if client != nil && client.Core().RESTClient().GetRateLimiter() != nil { + metrics.RegisterMetricAndTrackRateLimiterUsage("deployment_controller", client.Core().RESTClient().GetRateLimiter()) } dc := &DeploymentController{ client: client, diff --git a/pkg/controller/endpoint/endpoints_controller.go b/pkg/controller/endpoint/endpoints_controller.go index 20c5358c359..bb228105461 100644 --- a/pkg/controller/endpoint/endpoints_controller.go +++ b/pkg/controller/endpoint/endpoints_controller.go @@ -70,8 +70,8 @@ var ( // NewEndpointController returns a new *EndpointController. func NewEndpointController(podInformer cache.SharedIndexInformer, client clientset.Interface) *EndpointController { - if client != nil && client.Core().GetRESTClient().GetRateLimiter() != nil { - metrics.RegisterMetricAndTrackRateLimiterUsage("endpoint_controller", client.Core().GetRESTClient().GetRateLimiter()) + if client != nil && client.Core().RESTClient().GetRateLimiter() != nil { + metrics.RegisterMetricAndTrackRateLimiterUsage("endpoint_controller", client.Core().RESTClient().GetRateLimiter()) } e := &EndpointController{ client: client, diff --git a/pkg/controller/job/jobcontroller.go b/pkg/controller/job/jobcontroller.go index 68c43b1611b..6fac1ffb9df 100644 --- a/pkg/controller/job/jobcontroller.go +++ b/pkg/controller/job/jobcontroller.go @@ -84,8 +84,8 @@ func NewJobController(podInformer cache.SharedIndexInformer, kubeClient clientse // TODO: remove the wrapper when every clients have moved to use the clientset. eventBroadcaster.StartRecordingToSink(&unversionedcore.EventSinkImpl{Interface: kubeClient.Core().Events("")}) - if kubeClient != nil && kubeClient.Core().GetRESTClient().GetRateLimiter() != nil { - metrics.RegisterMetricAndTrackRateLimiterUsage("job_controller", kubeClient.Core().GetRESTClient().GetRateLimiter()) + if kubeClient != nil && kubeClient.Core().RESTClient().GetRateLimiter() != nil { + metrics.RegisterMetricAndTrackRateLimiterUsage("job_controller", kubeClient.Core().RESTClient().GetRateLimiter()) } jm := &JobController{ diff --git a/pkg/controller/namespace/namespace_controller.go b/pkg/controller/namespace/namespace_controller.go index 9d1d84fdb9a..f1fe663add1 100644 --- a/pkg/controller/namespace/namespace_controller.go +++ b/pkg/controller/namespace/namespace_controller.go @@ -89,8 +89,8 @@ func NewNamespaceController( finalizerToken: finalizerToken, } - if kubeClient != nil && kubeClient.Core().GetRESTClient().GetRateLimiter() != nil { - metrics.RegisterMetricAndTrackRateLimiterUsage("namespace_controller", kubeClient.Core().GetRESTClient().GetRateLimiter()) + if kubeClient != nil && kubeClient.Core().RESTClient().GetRateLimiter() != nil { + metrics.RegisterMetricAndTrackRateLimiterUsage("namespace_controller", kubeClient.Core().RESTClient().GetRateLimiter()) } // configure the backing store/controller diff --git a/pkg/controller/node/nodecontroller.go b/pkg/controller/node/nodecontroller.go index 2f52fb568d8..7c914fd06cf 100644 --- a/pkg/controller/node/nodecontroller.go +++ b/pkg/controller/node/nodecontroller.go @@ -193,8 +193,8 @@ func NewNodeController( glog.V(0).Infof("No api server defined - no events will be sent to API server.") } - if kubeClient != nil && kubeClient.Core().GetRESTClient().GetRateLimiter() != nil { - metrics.RegisterMetricAndTrackRateLimiterUsage("node_controller", kubeClient.Core().GetRESTClient().GetRateLimiter()) + if kubeClient != nil && kubeClient.Core().RESTClient().GetRateLimiter() != nil { + metrics.RegisterMetricAndTrackRateLimiterUsage("node_controller", kubeClient.Core().RESTClient().GetRateLimiter()) } if allocateNodeCIDRs { diff --git a/pkg/controller/podgc/gc_controller.go b/pkg/controller/podgc/gc_controller.go index b5aa442793f..f640e1d856a 100644 --- a/pkg/controller/podgc/gc_controller.go +++ b/pkg/controller/podgc/gc_controller.go @@ -61,8 +61,8 @@ type PodGCController struct { } func NewPodGC(kubeClient clientset.Interface, podInformer cache.SharedIndexInformer, terminatedPodThreshold int) *PodGCController { - if kubeClient != nil && kubeClient.Core().GetRESTClient().GetRateLimiter() != nil { - metrics.RegisterMetricAndTrackRateLimiterUsage("gc_controller", kubeClient.Core().GetRESTClient().GetRateLimiter()) + if kubeClient != nil && kubeClient.Core().RESTClient().GetRateLimiter() != nil { + metrics.RegisterMetricAndTrackRateLimiterUsage("gc_controller", kubeClient.Core().RESTClient().GetRateLimiter()) } gcc := &PodGCController{ kubeClient: kubeClient, diff --git a/pkg/controller/replicaset/replica_set.go b/pkg/controller/replicaset/replica_set.go index 4ad5b6314ef..bb359a14acc 100644 --- a/pkg/controller/replicaset/replica_set.go +++ b/pkg/controller/replicaset/replica_set.go @@ -102,8 +102,8 @@ type ReplicaSetController struct { // NewReplicaSetController configures a replica set controller with the specified event recorder func NewReplicaSetController(rsInformer informers.ReplicaSetInformer, podInformer informers.PodInformer, kubeClient clientset.Interface, burstReplicas int, lookupCacheSize int, garbageCollectorEnabled bool) *ReplicaSetController { - if kubeClient != nil && kubeClient.Core().GetRESTClient().GetRateLimiter() != nil { - metrics.RegisterMetricAndTrackRateLimiterUsage("replicaset_controller", kubeClient.Core().GetRESTClient().GetRateLimiter()) + if kubeClient != nil && kubeClient.Core().RESTClient().GetRateLimiter() != nil { + metrics.RegisterMetricAndTrackRateLimiterUsage("replicaset_controller", kubeClient.Core().RESTClient().GetRateLimiter()) } eventBroadcaster := record.NewBroadcaster() eventBroadcaster.StartLogging(glog.Infof) diff --git a/pkg/controller/replication/replication_controller.go b/pkg/controller/replication/replication_controller.go index c66525cfd8a..8b857d6695e 100644 --- a/pkg/controller/replication/replication_controller.go +++ b/pkg/controller/replication/replication_controller.go @@ -130,8 +130,8 @@ func NewReplicationManager(podInformer cache.SharedIndexInformer, kubeClient cli // newReplicationManager configures a replication manager with the specified event recorder func newReplicationManager(eventRecorder record.EventRecorder, podInformer cache.SharedIndexInformer, kubeClient clientset.Interface, resyncPeriod controller.ResyncPeriodFunc, burstReplicas int, lookupCacheSize int, garbageCollectorEnabled bool) *ReplicationManager { - if kubeClient != nil && kubeClient.Core().GetRESTClient().GetRateLimiter() != nil { - metrics.RegisterMetricAndTrackRateLimiterUsage("replication_controller", kubeClient.Core().GetRESTClient().GetRateLimiter()) + if kubeClient != nil && kubeClient.Core().RESTClient().GetRateLimiter() != nil { + metrics.RegisterMetricAndTrackRateLimiterUsage("replication_controller", kubeClient.Core().RESTClient().GetRateLimiter()) } rm := &ReplicationManager{ diff --git a/pkg/controller/resourcequota/replenishment_controller.go b/pkg/controller/resourcequota/replenishment_controller.go index 8dd7e526d09..1e99588866a 100644 --- a/pkg/controller/resourcequota/replenishment_controller.go +++ b/pkg/controller/resourcequota/replenishment_controller.go @@ -113,8 +113,8 @@ func NewReplenishmentControllerFactoryFromClient(kubeClient clientset.Interface) func (r *replenishmentControllerFactory) NewController(options *ReplenishmentControllerOptions) (cache.ControllerInterface, error) { var result cache.ControllerInterface - if r.kubeClient != nil && r.kubeClient.Core().GetRESTClient().GetRateLimiter() != nil { - metrics.RegisterMetricAndTrackRateLimiterUsage("replenishment_controller", r.kubeClient.Core().GetRESTClient().GetRateLimiter()) + if r.kubeClient != nil && r.kubeClient.Core().RESTClient().GetRateLimiter() != nil { + metrics.RegisterMetricAndTrackRateLimiterUsage("replenishment_controller", r.kubeClient.Core().RESTClient().GetRateLimiter()) } switch options.GroupKind { diff --git a/pkg/controller/resourcequota/resource_quota_controller.go b/pkg/controller/resourcequota/resource_quota_controller.go index 8476bb2e6c6..d28857a811e 100644 --- a/pkg/controller/resourcequota/resource_quota_controller.go +++ b/pkg/controller/resourcequota/resource_quota_controller.go @@ -84,8 +84,8 @@ func NewResourceQuotaController(options *ResourceQuotaControllerOptions) *Resour registry: options.Registry, replenishmentControllers: []cache.ControllerInterface{}, } - if options.KubeClient != nil && options.KubeClient.Core().GetRESTClient().GetRateLimiter() != nil { - metrics.RegisterMetricAndTrackRateLimiterUsage("resource_quota_controller", options.KubeClient.Core().GetRESTClient().GetRateLimiter()) + if options.KubeClient != nil && options.KubeClient.Core().RESTClient().GetRateLimiter() != nil { + metrics.RegisterMetricAndTrackRateLimiterUsage("resource_quota_controller", options.KubeClient.Core().RESTClient().GetRateLimiter()) } // set the synchronization handler rq.syncHandler = rq.syncResourceQuotaFromKey diff --git a/pkg/controller/route/routecontroller.go b/pkg/controller/route/routecontroller.go index 0805072e1c7..db8074e7c59 100644 --- a/pkg/controller/route/routecontroller.go +++ b/pkg/controller/route/routecontroller.go @@ -59,8 +59,8 @@ type RouteController struct { } func New(routes cloudprovider.Routes, kubeClient clientset.Interface, clusterName string, clusterCIDR *net.IPNet) *RouteController { - if kubeClient != nil && kubeClient.Core().GetRESTClient().GetRateLimiter() != nil { - metrics.RegisterMetricAndTrackRateLimiterUsage("route_controller", kubeClient.Core().GetRESTClient().GetRateLimiter()) + if kubeClient != nil && kubeClient.Core().RESTClient().GetRateLimiter() != nil { + metrics.RegisterMetricAndTrackRateLimiterUsage("route_controller", kubeClient.Core().RESTClient().GetRateLimiter()) } rc := &RouteController{ routes: routes, diff --git a/pkg/controller/scheduledjob/controller.go b/pkg/controller/scheduledjob/controller.go index 27f711c6c53..ba7e744cf21 100644 --- a/pkg/controller/scheduledjob/controller.go +++ b/pkg/controller/scheduledjob/controller.go @@ -65,8 +65,8 @@ func NewScheduledJobController(kubeClient clientset.Interface) *ScheduledJobCont // TODO: remove the wrapper when every clients have moved to use the clientset. eventBroadcaster.StartRecordingToSink(&unversionedcore.EventSinkImpl{Interface: kubeClient.Core().Events("")}) - if kubeClient != nil && kubeClient.Core().GetRESTClient().GetRateLimiter() != nil { - metrics.RegisterMetricAndTrackRateLimiterUsage("scheduledjob_controller", kubeClient.Core().GetRESTClient().GetRateLimiter()) + if kubeClient != nil && kubeClient.Core().RESTClient().GetRateLimiter() != nil { + metrics.RegisterMetricAndTrackRateLimiterUsage("scheduledjob_controller", kubeClient.Core().RESTClient().GetRateLimiter()) } jm := &ScheduledJobController{ diff --git a/pkg/controller/service/servicecontroller.go b/pkg/controller/service/servicecontroller.go index f4010107a92..4ab3a925a4b 100644 --- a/pkg/controller/service/servicecontroller.go +++ b/pkg/controller/service/servicecontroller.go @@ -102,8 +102,8 @@ func New(cloud cloudprovider.Interface, kubeClient clientset.Interface, clusterN broadcaster.StartRecordingToSink(&unversioned_core.EventSinkImpl{Interface: kubeClient.Core().Events("")}) recorder := broadcaster.NewRecorder(api.EventSource{Component: "service-controller"}) - if kubeClient != nil && kubeClient.Core().GetRESTClient().GetRateLimiter() != nil { - metrics.RegisterMetricAndTrackRateLimiterUsage("service_controller", kubeClient.Core().GetRESTClient().GetRateLimiter()) + if kubeClient != nil && kubeClient.Core().RESTClient().GetRateLimiter() != nil { + metrics.RegisterMetricAndTrackRateLimiterUsage("service_controller", kubeClient.Core().RESTClient().GetRateLimiter()) } s := &ServiceController{ @@ -175,7 +175,7 @@ func (s *ServiceController) Run(workers int) { for i := 0; i < workers; i++ { go wait.Until(s.worker, time.Second, wait.NeverStop) } - nodeLW := cache.NewListWatchFromClient(s.kubeClient.(*clientset.Clientset).CoreClient, "nodes", api.NamespaceAll, fields.Everything()) + nodeLW := cache.NewListWatchFromClient(s.kubeClient.Core().RESTClient(), "nodes", api.NamespaceAll, fields.Everything()) cache.NewReflector(nodeLW, &api.Node{}, s.nodeLister.Store, 0).Run() go wait.Until(s.nodeSyncLoop, nodeSyncPeriod, wait.NeverStop) } diff --git a/pkg/controller/serviceaccount/serviceaccounts_controller.go b/pkg/controller/serviceaccount/serviceaccounts_controller.go index 4a1b434d86a..b54b04dbc33 100644 --- a/pkg/controller/serviceaccount/serviceaccounts_controller.go +++ b/pkg/controller/serviceaccount/serviceaccounts_controller.go @@ -71,8 +71,8 @@ func NewServiceAccountsController(cl clientset.Interface, options ServiceAccount client: cl, serviceAccountsToEnsure: options.ServiceAccounts, } - if cl != nil && cl.Core().GetRESTClient().GetRateLimiter() != nil { - metrics.RegisterMetricAndTrackRateLimiterUsage("serviceaccount_controller", cl.Core().GetRESTClient().GetRateLimiter()) + if cl != nil && cl.Core().RESTClient().GetRateLimiter() != nil { + metrics.RegisterMetricAndTrackRateLimiterUsage("serviceaccount_controller", cl.Core().RESTClient().GetRateLimiter()) } accountSelector := fields.Everything() if len(options.ServiceAccounts) == 1 { diff --git a/pkg/controller/serviceaccount/tokens_controller.go b/pkg/controller/serviceaccount/tokens_controller.go index 15b52803e44..a7c783bc10a 100644 --- a/pkg/controller/serviceaccount/tokens_controller.go +++ b/pkg/controller/serviceaccount/tokens_controller.go @@ -85,8 +85,8 @@ func NewTokensController(cl clientset.Interface, options TokensControllerOptions maxRetries: maxRetries, } - if cl != nil && cl.Core().GetRESTClient().GetRateLimiter() != nil { - metrics.RegisterMetricAndTrackRateLimiterUsage("serviceaccount_controller", cl.Core().GetRESTClient().GetRateLimiter()) + if cl != nil && cl.Core().RESTClient().GetRateLimiter() != nil { + metrics.RegisterMetricAndTrackRateLimiterUsage("serviceaccount_controller", cl.Core().RESTClient().GetRateLimiter()) } e.serviceAccounts, e.serviceAccountController = cache.NewInformer( diff --git a/pkg/kubectl/cmd/rollingupdate.go b/pkg/kubectl/cmd/rollingupdate.go index 0b817925d6d..7f7a0e58821 100644 --- a/pkg/kubectl/cmd/rollingupdate.go +++ b/pkg/kubectl/cmd/rollingupdate.go @@ -243,7 +243,7 @@ func RunRollingUpdate(f cmdutil.Factory, out io.Writer, cmd *cobra.Command, args // than the old rc. This selector is the hash of the rc, with a suffix to provide uniqueness for // same-image updates. if len(image) != 0 { - codec := api.Codecs.LegacyCodec(clientset.CoreClient.APIVersion()) + codec := api.Codecs.LegacyCodec(clientset.CoreClient.RESTClient().APIVersion()) keepOldName = len(args) == 1 newName := findNewName(args, oldRc) if newRc, err = kubectl.LoadExistingNextReplicationController(coreClient, cmdNamespace, newName); err != nil { diff --git a/pkg/kubectl/cmd/util/clientcache.go b/pkg/kubectl/cmd/util/clientcache.go index 8ae66177811..7ce30a94b24 100644 --- a/pkg/kubectl/cmd/util/clientcache.go +++ b/pkg/kubectl/cmd/util/clientcache.go @@ -165,5 +165,5 @@ func (c *ClientCache) FederationClientForVersion(version *unversioned.GroupVersi if err != nil { return nil, err } - return fedClientSet.(*fed_clientset.Clientset).FederationClient.RESTClient, nil + return fedClientSet.Federation().RESTClient().(*restclient.RESTClient), nil } diff --git a/pkg/kubelet/config/apiserver.go b/pkg/kubelet/config/apiserver.go index 37b8eeffc57..4061d9c7330 100644 --- a/pkg/kubelet/config/apiserver.go +++ b/pkg/kubelet/config/apiserver.go @@ -28,7 +28,7 @@ import ( // NewSourceApiserver creates a config source that watches and pulls from the apiserver. func NewSourceApiserver(c *clientset.Clientset, nodeName types.NodeName, updates chan<- interface{}) { - lw := cache.NewListWatchFromClient(c.CoreClient, "pods", api.NamespaceAll, fields.OneTermEqualSelector(api.PodHostField, string(nodeName))) + lw := cache.NewListWatchFromClient(c.Core().RESTClient(), "pods", api.NamespaceAll, fields.OneTermEqualSelector(api.PodHostField, string(nodeName))) newSourceApiserverFromLW(lw, updates) } diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go index fc39c303f80..e6269f04c42 100644 --- a/pkg/kubelet/kubelet.go +++ b/pkg/kubelet/kubelet.go @@ -357,7 +357,7 @@ func NewMainKubelet(kubeCfg *componentconfig.KubeletConfiguration, kubeDeps *Kub serviceStore := cache.NewIndexer(cache.MetaNamespaceKeyFunc, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}) if kubeClient != nil { - serviceLW := cache.NewListWatchFromClient(kubeClient.(*clientset.Clientset).CoreClient, "services", api.NamespaceAll, fields.Everything()) + serviceLW := cache.NewListWatchFromClient(kubeClient.Core().RESTClient(), "services", api.NamespaceAll, fields.Everything()) cache.NewReflector(serviceLW, &api.Service{}, serviceStore, 0).Run() } serviceLister := &cache.StoreToServiceLister{Indexer: serviceStore} @@ -365,7 +365,7 @@ func NewMainKubelet(kubeCfg *componentconfig.KubeletConfiguration, kubeDeps *Kub nodeStore := cache.NewStore(cache.MetaNamespaceKeyFunc) if kubeClient != nil { fieldSelector := fields.Set{api.ObjectNameField: string(nodeName)}.AsSelector() - nodeLW := cache.NewListWatchFromClient(kubeClient.(*clientset.Clientset).CoreClient, "nodes", api.NamespaceAll, fieldSelector) + nodeLW := cache.NewListWatchFromClient(kubeClient.Core().RESTClient(), "nodes", api.NamespaceAll, fieldSelector) cache.NewReflector(nodeLW, &api.Node{}, nodeStore, 0).Run() } nodeLister := &cache.StoreToNodeLister{Store: nodeStore} diff --git a/plugin/pkg/scheduler/factory/factory.go b/plugin/pkg/scheduler/factory/factory.go index 3cc793a054e..35f90207298 100644 --- a/plugin/pkg/scheduler/factory/factory.go +++ b/plugin/pkg/scheduler/factory/factory.go @@ -516,7 +516,7 @@ func getNodeConditionPredicate() cache.NodeConditionPredicate { // scheduled. func (factory *ConfigFactory) createUnassignedNonTerminatedPodLW() *cache.ListWatch { selector := fields.ParseSelectorOrDie("spec.nodeName==" + "" + ",status.phase!=" + string(api.PodSucceeded) + ",status.phase!=" + string(api.PodFailed)) - return cache.NewListWatchFromClient(factory.Client.Core().GetRESTClient(), "pods", api.NamespaceAll, selector) + return cache.NewListWatchFromClient(factory.Client.Core().RESTClient(), "pods", api.NamespaceAll, selector) } // Returns a cache.ListWatch that finds all pods that are @@ -524,7 +524,7 @@ func (factory *ConfigFactory) createUnassignedNonTerminatedPodLW() *cache.ListWa // TODO: return a ListerWatcher interface instead? func (factory *ConfigFactory) createAssignedNonTerminatedPodLW() *cache.ListWatch { selector := fields.ParseSelectorOrDie("spec.nodeName!=" + "" + ",status.phase!=" + string(api.PodSucceeded) + ",status.phase!=" + string(api.PodFailed)) - return cache.NewListWatchFromClient(factory.Client.Core().GetRESTClient(), "pods", api.NamespaceAll, selector) + return cache.NewListWatchFromClient(factory.Client.Core().RESTClient(), "pods", api.NamespaceAll, selector) } // createNodeLW returns a cache.ListWatch that gets all changes to nodes. @@ -532,32 +532,32 @@ func (factory *ConfigFactory) createNodeLW() *cache.ListWatch { // all nodes are considered to ensure that the scheduler cache has access to all nodes for lookups // the NodeCondition is used to filter out the nodes that are not ready or unschedulable // the filtered list is used as the super set of nodes to consider for scheduling - return cache.NewListWatchFromClient(factory.Client.Core().GetRESTClient(), "nodes", api.NamespaceAll, fields.ParseSelectorOrDie("")) + return cache.NewListWatchFromClient(factory.Client.Core().RESTClient(), "nodes", api.NamespaceAll, fields.ParseSelectorOrDie("")) } // createPersistentVolumeLW returns a cache.ListWatch that gets all changes to persistentVolumes. func (factory *ConfigFactory) createPersistentVolumeLW() *cache.ListWatch { - return cache.NewListWatchFromClient(factory.Client.Core().GetRESTClient(), "persistentVolumes", api.NamespaceAll, fields.ParseSelectorOrDie("")) + return cache.NewListWatchFromClient(factory.Client.Core().RESTClient(), "persistentVolumes", api.NamespaceAll, fields.ParseSelectorOrDie("")) } // createPersistentVolumeClaimLW returns a cache.ListWatch that gets all changes to persistentVolumeClaims. func (factory *ConfigFactory) createPersistentVolumeClaimLW() *cache.ListWatch { - return cache.NewListWatchFromClient(factory.Client.Core().GetRESTClient(), "persistentVolumeClaims", api.NamespaceAll, fields.ParseSelectorOrDie("")) + return cache.NewListWatchFromClient(factory.Client.Core().RESTClient(), "persistentVolumeClaims", api.NamespaceAll, fields.ParseSelectorOrDie("")) } // Returns a cache.ListWatch that gets all changes to services. func (factory *ConfigFactory) createServiceLW() *cache.ListWatch { - return cache.NewListWatchFromClient(factory.Client.Core().GetRESTClient(), "services", api.NamespaceAll, fields.ParseSelectorOrDie("")) + return cache.NewListWatchFromClient(factory.Client.Core().RESTClient(), "services", api.NamespaceAll, fields.ParseSelectorOrDie("")) } // Returns a cache.ListWatch that gets all changes to controllers. func (factory *ConfigFactory) createControllerLW() *cache.ListWatch { - return cache.NewListWatchFromClient(factory.Client.Core().GetRESTClient(), "replicationControllers", api.NamespaceAll, fields.ParseSelectorOrDie("")) + return cache.NewListWatchFromClient(factory.Client.Core().RESTClient(), "replicationControllers", api.NamespaceAll, fields.ParseSelectorOrDie("")) } // Returns a cache.ListWatch that gets all changes to replicasets. func (factory *ConfigFactory) createReplicaSetLW() *cache.ListWatch { - return cache.NewListWatchFromClient(factory.Client.Extensions().GetRESTClient(), "replicasets", api.NamespaceAll, fields.ParseSelectorOrDie("")) + return cache.NewListWatchFromClient(factory.Client.Extensions().RESTClient(), "replicasets", api.NamespaceAll, fields.ParseSelectorOrDie("")) } func (factory *ConfigFactory) makeDefaultErrorFunc(backoff *podBackoff, podQueue *cache.FIFO) func(pod *api.Pod, err error) { @@ -632,7 +632,7 @@ type binder struct { func (b *binder) Bind(binding *api.Binding) error { glog.V(3).Infof("Attempting to bind %v to %v", binding.Name, binding.Target.Name) ctx := api.WithNamespace(api.NewContext(), binding.Namespace) - return b.Client.Core().GetRESTClient().Post().Namespace(api.NamespaceValue(ctx)).Resource("bindings").Body(binding).Do().Error() + return b.Client.Core().RESTClient().Post().Namespace(api.NamespaceValue(ctx)).Resource("bindings").Body(binding).Do().Error() // TODO: use Pods interface for binding once clusters are upgraded // return b.Pods(binding.Namespace).Bind(binding) }