From c587b8a21eb5000795b48ce16315e627e95bf094 Mon Sep 17 00:00:00 2001 From: deads2k Date: Thu, 19 Jan 2017 13:24:01 -0500 Subject: [PATCH] re-run client-gen --- cmd/cloud-controller-manager/app/BUILD | 1 - cmd/kube-aggregator/pkg/apiserver/BUILD | 1 - .../clientset_generated/clientset/BUILD | 2 +- .../clientset/clientset.go | 8 ++-- .../typed/apiregistration/v1alpha1/BUILD | 2 +- .../v1alpha1/apiregistration_client.go | 20 ++++----- .../apiregistration/v1alpha1/apiservice.go | 4 +- .../typed/apiregistration/v1alpha1/fake/BUILD | 2 +- .../fake/fake_apiregistration_client.go | 6 +-- .../internalclientset/BUILD | 2 +- .../internalclientset/clientset.go | 8 ++-- .../apiregistration/internalversion/BUILD | 2 +- .../internalversion/apiregistration_client.go | 20 ++++----- .../internalversion/apiservice.go | 4 +- .../internalversion/fake/BUILD | 2 +- .../fake/fake_apiregistration_client.go | 6 +-- cmd/kube-aggregator/pkg/cmd/server/BUILD | 1 - cmd/kube-controller-manager/app/BUILD | 1 - cmd/kubeadm/app/node/BUILD | 1 - cmd/kubelet/app/BUILD | 2 - cmd/kubemark/BUILD | 1 - .../test_internalclientset/BUILD | 7 +-- .../test_internalclientset/clientset.go | 8 ++-- .../typed/testgroup/internalversion/BUILD | 2 +- .../testgroup/internalversion/fake/BUILD | 2 +- .../fake/fake_testgroup_client.go | 6 +-- .../internalversion/testgroup_client.go | 20 ++++----- .../testgroup/internalversion/testtype.go | 4 +- .../federation_clientset/BUILD | 2 +- .../federation_clientset/clientset.go | 8 ++-- .../federation_clientset/typed/batch/v1/BUILD | 2 +- .../typed/batch/v1/batch_client.go | 20 ++++----- .../typed/batch/v1/fake/BUILD | 2 +- .../typed/batch/v1/fake/fake_batch_client.go | 6 +-- .../typed/batch/v1/job.go | 4 +- .../federation_clientset/typed/core/v1/BUILD | 2 +- .../typed/core/v1/configmap.go | 4 +- .../typed/core/v1/core_client.go | 20 ++++----- .../typed/core/v1/event.go | 4 +- .../typed/core/v1/fake/BUILD | 2 +- .../typed/core/v1/fake/fake_core_client.go | 6 +-- .../typed/core/v1/namespace.go | 4 +- .../typed/core/v1/secret.go | 4 +- .../typed/core/v1/service.go | 4 +- .../typed/extensions/v1beta1/BUILD | 2 +- .../typed/extensions/v1beta1/daemonset.go | 4 +- .../typed/extensions/v1beta1/deployment.go | 4 +- .../extensions/v1beta1/extensions_client.go | 20 ++++----- .../typed/extensions/v1beta1/fake/BUILD | 2 +- .../v1beta1/fake/fake_extensions_client.go | 6 +-- .../typed/extensions/v1beta1/ingress.go | 4 +- .../typed/extensions/v1beta1/replicaset.go | 4 +- .../typed/federation/v1beta1/BUILD | 2 +- .../typed/federation/v1beta1/cluster.go | 4 +- .../typed/federation/v1beta1/fake/BUILD | 2 +- .../v1beta1/fake/fake_federation_client.go | 6 +-- .../federation/v1beta1/federation_client.go | 20 ++++----- .../federation_internalclientset/BUILD | 2 +- .../federation_internalclientset/clientset.go | 8 ++-- .../typed/batch/internalversion/BUILD | 2 +- .../batch/internalversion/batch_client.go | 20 ++++----- .../typed/batch/internalversion/fake/BUILD | 2 +- .../internalversion/fake/fake_batch_client.go | 6 +-- .../typed/batch/internalversion/job.go | 4 +- .../typed/core/internalversion/BUILD | 2 +- .../typed/core/internalversion/configmap.go | 4 +- .../typed/core/internalversion/core_client.go | 20 ++++----- .../typed/core/internalversion/event.go | 4 +- .../typed/core/internalversion/fake/BUILD | 2 +- .../internalversion/fake/fake_core_client.go | 6 +-- .../typed/core/internalversion/namespace.go | 4 +- .../typed/core/internalversion/secret.go | 4 +- .../typed/core/internalversion/service.go | 4 +- .../typed/extensions/internalversion/BUILD | 2 +- .../extensions/internalversion/daemonset.go | 4 +- .../extensions/internalversion/deployment.go | 4 +- .../internalversion/extensions_client.go | 20 ++++----- .../extensions/internalversion/fake/BUILD | 2 +- .../fake/fake_extensions_client.go | 6 +-- .../extensions/internalversion/ingress.go | 4 +- .../extensions/internalversion/replicaset.go | 4 +- .../typed/federation/internalversion/BUILD | 2 +- .../federation/internalversion/cluster.go | 4 +- .../federation/internalversion/fake/BUILD | 2 +- .../fake/fake_federation_client.go | 6 +-- .../internalversion/federation_client.go | 20 ++++----- .../federation-controller-manager/app/BUILD | 1 - .../pkg/federation-controller/cluster/BUILD | 2 - .../pkg/federation-controller/service/BUILD | 1 - .../pkg/federation-controller/util/BUILD | 1 - federation/pkg/kubefed/testing/BUILD | 1 - pkg/BUILD | 2 +- pkg/client/cache/BUILD | 2 - .../clientset_generated/clientset/BUILD | 2 +- .../clientset/clientset.go | 8 ++-- .../clientset/typed/apps/v1beta1/BUILD | 2 +- .../typed/apps/v1beta1/apps_client.go | 20 ++++----- .../clientset/typed/apps/v1beta1/fake/BUILD | 2 +- .../apps/v1beta1/fake/fake_apps_client.go | 6 +-- .../typed/apps/v1beta1/statefulset.go | 4 +- .../typed/authentication/v1beta1/BUILD | 2 +- .../v1beta1/authentication_client.go | 20 ++++----- .../typed/authentication/v1beta1/fake/BUILD | 2 +- .../fake/fake_authentication_client.go | 6 +-- .../authentication/v1beta1/tokenreview.go | 4 +- .../typed/authorization/v1beta1/BUILD | 2 +- .../v1beta1/authorization_client.go | 20 ++++----- .../typed/authorization/v1beta1/fake/BUILD | 2 +- .../v1beta1/fake/fake_authorization_client.go | 6 +-- .../v1beta1/localsubjectaccessreview.go | 4 +- .../v1beta1/selfsubjectaccessreview.go | 4 +- .../v1beta1/subjectaccessreview.go | 4 +- .../clientset/typed/autoscaling/v1/BUILD | 2 +- .../autoscaling/v1/autoscaling_client.go | 20 ++++----- .../clientset/typed/autoscaling/v1/fake/BUILD | 2 +- .../v1/fake/fake_autoscaling_client.go | 6 +-- .../autoscaling/v1/horizontalpodautoscaler.go | 4 +- .../clientset/typed/batch/v1/BUILD | 2 +- .../clientset/typed/batch/v1/batch_client.go | 20 ++++----- .../clientset/typed/batch/v1/fake/BUILD | 2 +- .../typed/batch/v1/fake/fake_batch_client.go | 6 +-- .../clientset/typed/batch/v1/job.go | 4 +- .../clientset/typed/batch/v2alpha1/BUILD | 2 +- .../typed/batch/v2alpha1/batch_client.go | 20 ++++----- .../clientset/typed/batch/v2alpha1/cronjob.go | 4 +- .../clientset/typed/batch/v2alpha1/fake/BUILD | 2 +- .../batch/v2alpha1/fake/fake_batch_client.go | 6 +-- .../clientset/typed/batch/v2alpha1/job.go | 4 +- .../v1beta1/certificates_client.go | 20 ++++----- .../v1beta1/certificatesigningrequest.go | 4 +- .../v1beta1/fake/fake_certificates_client.go | 6 +-- .../clientset/typed/core/v1/BUILD | 2 +- .../typed/core/v1/componentstatus.go | 4 +- .../clientset/typed/core/v1/configmap.go | 4 +- .../clientset/typed/core/v1/core_client.go | 20 ++++----- .../clientset/typed/core/v1/endpoints.go | 4 +- .../clientset/typed/core/v1/event.go | 4 +- .../clientset/typed/core/v1/fake/BUILD | 2 +- .../typed/core/v1/fake/fake_core_client.go | 6 +-- .../clientset/typed/core/v1/limitrange.go | 4 +- .../clientset/typed/core/v1/namespace.go | 4 +- .../clientset/typed/core/v1/node.go | 4 +- .../typed/core/v1/persistentvolume.go | 4 +- .../typed/core/v1/persistentvolumeclaim.go | 4 +- .../clientset/typed/core/v1/pod.go | 4 +- .../clientset/typed/core/v1/podtemplate.go | 4 +- .../typed/core/v1/replicationcontroller.go | 4 +- .../clientset/typed/core/v1/resourcequota.go | 4 +- .../clientset/typed/core/v1/secret.go | 4 +- .../clientset/typed/core/v1/service.go | 4 +- .../clientset/typed/core/v1/serviceaccount.go | 4 +- .../clientset/typed/extensions/v1beta1/BUILD | 2 +- .../typed/extensions/v1beta1/daemonset.go | 4 +- .../typed/extensions/v1beta1/deployment.go | 4 +- .../extensions/v1beta1/extensions_client.go | 20 ++++----- .../typed/extensions/v1beta1/fake/BUILD | 2 +- .../v1beta1/fake/fake_extensions_client.go | 6 +-- .../typed/extensions/v1beta1/ingress.go | 4 +- .../extensions/v1beta1/podsecuritypolicy.go | 4 +- .../typed/extensions/v1beta1/replicaset.go | 4 +- .../typed/extensions/v1beta1/scale.go | 4 +- .../extensions/v1beta1/thirdpartyresource.go | 4 +- .../clientset/typed/policy/v1alpha1/BUILD | 1 - .../typed/policy/v1alpha1/fake/BUILD | 1 - .../clientset/typed/policy/v1beta1/BUILD | 2 +- .../typed/policy/v1beta1/eviction.go | 4 +- .../clientset/typed/policy/v1beta1/fake/BUILD | 2 +- .../policy/v1beta1/fake/fake_policy_client.go | 6 +-- .../policy/v1beta1/poddisruptionbudget.go | 4 +- .../typed/policy/v1beta1/policy_client.go | 20 ++++----- .../clientset/typed/rbac/v1alpha1/BUILD | 2 +- .../typed/rbac/v1alpha1/clusterrole.go | 4 +- .../typed/rbac/v1alpha1/clusterrolebinding.go | 4 +- .../clientset/typed/rbac/v1alpha1/fake/BUILD | 2 +- .../rbac/v1alpha1/fake/fake_rbac_client.go | 6 +-- .../typed/rbac/v1alpha1/rbac_client.go | 20 ++++----- .../clientset/typed/rbac/v1alpha1/role.go | 4 +- .../typed/rbac/v1alpha1/rolebinding.go | 4 +- .../clientset/typed/rbac/v1beta1/BUILD | 2 +- .../typed/rbac/v1beta1/clusterrole.go | 4 +- .../typed/rbac/v1beta1/clusterrolebinding.go | 4 +- .../clientset/typed/rbac/v1beta1/fake/BUILD | 2 +- .../rbac/v1beta1/fake/fake_rbac_client.go | 6 +-- .../typed/rbac/v1beta1/rbac_client.go | 20 ++++----- .../clientset/typed/rbac/v1beta1/role.go | 4 +- .../typed/rbac/v1beta1/rolebinding.go | 4 +- .../clientset/typed/storage/v1beta1/BUILD | 2 +- .../typed/storage/v1beta1/fake/BUILD | 2 +- .../v1beta1/fake/fake_storage_client.go | 6 +-- .../typed/storage/v1beta1/storage_client.go | 20 ++++----- .../typed/storage/v1beta1/storageclass.go | 4 +- .../internalclientset/BUILD | 2 +- .../internalclientset/clientset.go | 8 ++-- .../typed/apps/internalversion/BUILD | 2 +- .../typed/apps/internalversion/apps_client.go | 20 ++++----- .../typed/apps/internalversion/fake/BUILD | 2 +- .../internalversion/fake/fake_apps_client.go | 6 +-- .../typed/apps/internalversion/statefulset.go | 4 +- .../authentication/internalversion/BUILD | 2 +- .../internalversion/authentication_client.go | 20 ++++----- .../authentication/internalversion/fake/BUILD | 2 +- .../fake/fake_authentication_client.go | 6 +-- .../internalversion/tokenreview.go | 4 +- .../typed/authorization/internalversion/BUILD | 2 +- .../internalversion/authorization_client.go | 20 ++++----- .../authorization/internalversion/fake/BUILD | 2 +- .../fake/fake_authorization_client.go | 6 +-- .../localsubjectaccessreview.go | 4 +- .../selfsubjectaccessreview.go | 4 +- .../internalversion/subjectaccessreview.go | 4 +- .../typed/autoscaling/internalversion/BUILD | 2 +- .../internalversion/autoscaling_client.go | 20 ++++----- .../autoscaling/internalversion/fake/BUILD | 2 +- .../fake/fake_autoscaling_client.go | 6 +-- .../horizontalpodautoscaler.go | 4 +- .../typed/batch/internalversion/BUILD | 2 +- .../batch/internalversion/batch_client.go | 20 ++++----- .../typed/batch/internalversion/cronjob.go | 4 +- .../typed/batch/internalversion/fake/BUILD | 2 +- .../internalversion/fake/fake_batch_client.go | 6 +-- .../typed/batch/internalversion/job.go | 4 +- .../typed/certificates/internalversion/BUILD | 2 +- .../internalversion/certificates_client.go | 20 ++++----- .../certificatesigningrequest.go | 4 +- .../certificates/internalversion/fake/BUILD | 2 +- .../fake/fake_certificates_client.go | 6 +-- .../typed/core/internalversion/BUILD | 2 +- .../core/internalversion/componentstatus.go | 4 +- .../typed/core/internalversion/configmap.go | 4 +- .../typed/core/internalversion/core_client.go | 20 ++++----- .../typed/core/internalversion/endpoints.go | 4 +- .../typed/core/internalversion/event.go | 4 +- .../typed/core/internalversion/fake/BUILD | 2 +- .../internalversion/fake/fake_core_client.go | 6 +-- .../typed/core/internalversion/limitrange.go | 4 +- .../typed/core/internalversion/namespace.go | 4 +- .../typed/core/internalversion/node.go | 4 +- .../core/internalversion/persistentvolume.go | 4 +- .../internalversion/persistentvolumeclaim.go | 4 +- .../typed/core/internalversion/pod.go | 4 +- .../typed/core/internalversion/podtemplate.go | 4 +- .../internalversion/replicationcontroller.go | 4 +- .../core/internalversion/resourcequota.go | 4 +- .../typed/core/internalversion/secret.go | 4 +- .../typed/core/internalversion/service.go | 4 +- .../core/internalversion/serviceaccount.go | 4 +- .../typed/extensions/internalversion/BUILD | 2 +- .../extensions/internalversion/daemonset.go | 4 +- .../extensions/internalversion/deployment.go | 4 +- .../internalversion/extensions_client.go | 20 ++++----- .../extensions/internalversion/fake/BUILD | 2 +- .../fake/fake_extensions_client.go | 6 +-- .../extensions/internalversion/ingress.go | 4 +- .../internalversion/networkpolicy.go | 4 +- .../internalversion/podsecuritypolicy.go | 4 +- .../extensions/internalversion/replicaset.go | 4 +- .../typed/extensions/internalversion/scale.go | 4 +- .../internalversion/thirdpartyresource.go | 4 +- .../typed/policy/internalversion/BUILD | 2 +- .../typed/policy/internalversion/eviction.go | 4 +- .../typed/policy/internalversion/fake/BUILD | 2 +- .../fake/fake_policy_client.go | 6 +-- .../internalversion/poddisruptionbudget.go | 4 +- .../policy/internalversion/policy_client.go | 20 ++++----- .../typed/rbac/internalversion/BUILD | 2 +- .../typed/rbac/internalversion/clusterrole.go | 4 +- .../internalversion/clusterrolebinding.go | 4 +- .../typed/rbac/internalversion/fake/BUILD | 2 +- .../internalversion/fake/fake_rbac_client.go | 6 +-- .../typed/rbac/internalversion/rbac_client.go | 20 ++++----- .../typed/rbac/internalversion/role.go | 4 +- .../typed/rbac/internalversion/rolebinding.go | 4 +- .../typed/storage/internalversion/BUILD | 2 +- .../typed/storage/internalversion/fake/BUILD | 2 +- .../fake/fake_storage_client.go | 6 +-- .../storage/internalversion/storage_client.go | 20 ++++----- .../storage/internalversion/storageclass.go | 4 +- pkg/client/record/BUILD | 2 - pkg/client/restclient/fake/BUILD | 1 - pkg/client/testing/core/BUILD | 1 - pkg/client/typed/discovery/BUILD | 3 -- pkg/client/typed/discovery/fake/BUILD | 1 - pkg/client/typed/dynamic/BUILD | 2 - pkg/client/unversioned/BUILD | 2 - pkg/client/unversioned/auth/BUILD | 1 - pkg/client/unversioned/clientcmd/BUILD | 2 - pkg/client/unversioned/portforward/BUILD | 1 - pkg/client/unversioned/remotecommand/BUILD | 2 - .../unversioned/testclient/simple/BUILD | 1 - pkg/controller/BUILD | 2 - pkg/controller/endpoint/BUILD | 1 - pkg/controller/garbagecollector/BUILD | 1 - pkg/controller/job/BUILD | 1 - pkg/controller/namespace/BUILD | 1 - pkg/controller/podautoscaler/BUILD | 1 - pkg/controller/podautoscaler/metrics/BUILD | 1 - pkg/controller/replicaset/BUILD | 1 - pkg/controller/replication/BUILD | 1 - pkg/controller/statefulset/BUILD | 1 - pkg/genericapiserver/server/BUILD | 1 - pkg/kubectl/BUILD | 2 - pkg/kubectl/cmd/BUILD | 2 - pkg/kubectl/cmd/set/BUILD | 1 - pkg/kubectl/cmd/testing/BUILD | 1 - pkg/kubectl/cmd/util/BUILD | 2 - pkg/kubectl/resource/BUILD | 1 - pkg/kubelet/client/BUILD | 6 +-- pkg/kubelet/server/streaming/BUILD | 1 - pkg/master/BUILD | 1 - pkg/registry/core/rest/BUILD | 1 - plugin/cmd/kube-scheduler/app/BUILD | 1 - plugin/pkg/admission/initialresources/BUILD | 1 - plugin/pkg/client/auth/gcp/BUILD | 1 - plugin/pkg/client/auth/oidc/BUILD | 1 - plugin/pkg/scheduler/BUILD | 1 - .../algorithmprovider/defaults/BUILD | 1 - plugin/pkg/scheduler/api/BUILD | 1 - plugin/pkg/scheduler/api/v1/BUILD | 1 - plugin/pkg/scheduler/factory/BUILD | 1 - test/e2e/BUILD | 1 - test/e2e/framework/BUILD | 1 - test/e2e_federation/BUILD | 1 - test/e2e_federation/framework/BUILD | 1 - test/e2e_node/services/BUILD | 1 - test/images/clusterapi-tester/BUILD | 1 - test/images/network-tester/BUILD | 1 - test/integration/framework/BUILD | 1 - test/integration/objectmeta/BUILD | 1 - test/integration/scheduler_perf/BUILD | 1 - test/soak/cauldron/BUILD | 1 - test/soak/serve_hostnames/BUILD | 1 - vendor/BUILD | 43 ++++++++++--------- 332 files changed, 802 insertions(+), 888 deletions(-) diff --git a/cmd/cloud-controller-manager/app/BUILD b/cmd/cloud-controller-manager/app/BUILD index a85501cf25..144f9b6a48 100644 --- a/cmd/cloud-controller-manager/app/BUILD +++ b/cmd/cloud-controller-manager/app/BUILD @@ -19,7 +19,6 @@ go_library( "//pkg/client/leaderelection:go_default_library", "//pkg/client/leaderelection/resourcelock:go_default_library", "//pkg/client/record:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/unversioned/clientcmd:go_default_library", "//pkg/cloudprovider:go_default_library", "//pkg/controller:go_default_library", diff --git a/cmd/kube-aggregator/pkg/apiserver/BUILD b/cmd/kube-aggregator/pkg/apiserver/BUILD index 60cf011a64..251fc8d30c 100644 --- a/cmd/kube-aggregator/pkg/apiserver/BUILD +++ b/cmd/kube-aggregator/pkg/apiserver/BUILD @@ -55,7 +55,6 @@ go_library( "//pkg/client/clientset_generated/clientset:go_default_library", "//pkg/client/informers/informers_generated:go_default_library", "//pkg/client/listers/core/v1:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/controller:go_default_library", "//pkg/genericapiserver/endpoints/filters:go_default_library", "//pkg/genericapiserver/endpoints/handlers/responsewriters:go_default_library", diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/BUILD b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/BUILD index 548c6c62d4..6363bcdbb2 100644 --- a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/BUILD +++ b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/BUILD @@ -16,11 +16,11 @@ go_library( tags = ["automanaged"], deps = [ "//cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/typed/discovery:go_default_library", "//plugin/pkg/client/auth:go_default_library", "//vendor:github.com/golang/glog", "//vendor:k8s.io/client-go/pkg/util/flowcontrol", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/clientset.go b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/clientset.go index bf9bf30fff..a5780014f2 100644 --- a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/clientset.go +++ b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/clientset.go @@ -19,8 +19,8 @@ package clientset import ( "github.com/golang/glog" "k8s.io/client-go/pkg/util/flowcontrol" + rest "k8s.io/client-go/rest" v1alpha1apiregistration "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1" - restclient "k8s.io/kubernetes/pkg/client/restclient" discovery "k8s.io/kubernetes/pkg/client/typed/discovery" _ "k8s.io/kubernetes/plugin/pkg/client/auth" ) @@ -65,7 +65,7 @@ func (c *Clientset) Discovery() discovery.DiscoveryInterface { } // NewForConfig creates a new Clientset for the given config. -func NewForConfig(c *restclient.Config) (*Clientset, error) { +func NewForConfig(c *rest.Config) (*Clientset, error) { configShallowCopy := *c if configShallowCopy.RateLimiter == nil && configShallowCopy.QPS > 0 { configShallowCopy.RateLimiter = flowcontrol.NewTokenBucketRateLimiter(configShallowCopy.QPS, configShallowCopy.Burst) @@ -87,7 +87,7 @@ func NewForConfig(c *restclient.Config) (*Clientset, error) { // NewForConfigOrDie creates a new Clientset for the given config and // panics if there is an error in the config. -func NewForConfigOrDie(c *restclient.Config) *Clientset { +func NewForConfigOrDie(c *rest.Config) *Clientset { var cs Clientset cs.ApiregistrationV1alpha1Client = v1alpha1apiregistration.NewForConfigOrDie(c) @@ -96,7 +96,7 @@ func NewForConfigOrDie(c *restclient.Config) *Clientset { } // New creates a new Clientset for the given RESTClient. -func New(c restclient.Interface) *Clientset { +func New(c rest.Interface) *Clientset { var cs Clientset cs.ApiregistrationV1alpha1Client = v1alpha1apiregistration.New(c) diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/BUILD b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/BUILD index 791d15f961..407f8b4b1e 100644 --- a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/BUILD +++ b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/BUILD @@ -20,12 +20,12 @@ go_library( "//cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1:go_default_library", "//pkg/api:go_default_library", "//pkg/api/v1:go_default_library", - "//pkg/client/restclient:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/apiregistration_client.go b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/apiregistration_client.go index b4b98713fd..743e260393 100644 --- a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/apiregistration_client.go +++ b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/apiregistration_client.go @@ -20,18 +20,18 @@ import ( fmt "fmt" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) type ApiregistrationV1alpha1Interface interface { - RESTClient() restclient.Interface + RESTClient() rest.Interface APIServicesGetter } // ApiregistrationV1alpha1Client is used to interact with features provided by the apiregistration.k8s.io group. type ApiregistrationV1alpha1Client struct { - restClient restclient.Interface + restClient rest.Interface } func (c *ApiregistrationV1alpha1Client) APIServices() APIServiceInterface { @@ -39,12 +39,12 @@ func (c *ApiregistrationV1alpha1Client) APIServices() APIServiceInterface { } // NewForConfig creates a new ApiregistrationV1alpha1Client for the given config. -func NewForConfig(c *restclient.Config) (*ApiregistrationV1alpha1Client, error) { +func NewForConfig(c *rest.Config) (*ApiregistrationV1alpha1Client, error) { config := *c if err := setConfigDefaults(&config); err != nil { return nil, err } - client, err := restclient.RESTClientFor(&config) + client, err := rest.RESTClientFor(&config) if err != nil { return nil, err } @@ -53,7 +53,7 @@ func NewForConfig(c *restclient.Config) (*ApiregistrationV1alpha1Client, error) // NewForConfigOrDie creates a new ApiregistrationV1alpha1Client for the given config and // panics if there is an error in the config. -func NewForConfigOrDie(c *restclient.Config) *ApiregistrationV1alpha1Client { +func NewForConfigOrDie(c *rest.Config) *ApiregistrationV1alpha1Client { client, err := NewForConfig(c) if err != nil { panic(err) @@ -62,11 +62,11 @@ func NewForConfigOrDie(c *restclient.Config) *ApiregistrationV1alpha1Client { } // New creates a new ApiregistrationV1alpha1Client for the given RESTClient. -func New(c restclient.Interface) *ApiregistrationV1alpha1Client { +func New(c rest.Interface) *ApiregistrationV1alpha1Client { return &ApiregistrationV1alpha1Client{c} } -func setConfigDefaults(config *restclient.Config) error { +func setConfigDefaults(config *rest.Config) error { gv, err := schema.ParseGroupVersion("apiregistration.k8s.io/v1alpha1") if err != nil { return err @@ -77,7 +77,7 @@ func setConfigDefaults(config *restclient.Config) error { } config.APIPath = "/apis" if config.UserAgent == "" { - config.UserAgent = restclient.DefaultKubernetesUserAgent() + config.UserAgent = rest.DefaultKubernetesUserAgent() } copyGroupVersion := gv config.GroupVersion = ©GroupVersion @@ -89,7 +89,7 @@ func setConfigDefaults(config *restclient.Config) error { // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *ApiregistrationV1alpha1Client) RESTClient() restclient.Interface { +func (c *ApiregistrationV1alpha1Client) RESTClient() rest.Interface { if c == nil { return nil } diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/apiservice.go b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/apiservice.go index 9adb99eacb..b45e93ebc1 100644 --- a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/apiservice.go +++ b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/apiservice.go @@ -20,10 +20,10 @@ import ( meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" v1alpha1 "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1" api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // APIServicesGetter has a method to return a APIServiceInterface. @@ -48,7 +48,7 @@ type APIServiceInterface interface { // aPIServices implements APIServiceInterface type aPIServices struct { - client restclient.Interface + client rest.Interface } // newAPIServices returns a APIServices diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/BUILD b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/BUILD index 3d020fdeea..db6c47e82a 100644 --- a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/BUILD +++ b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/BUILD @@ -19,13 +19,13 @@ go_library( "//cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1:go_default_library", "//cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1:go_default_library", "//pkg/api/v1:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/fake_apiregistration_client.go b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/fake_apiregistration_client.go index d4a242fbf9..48040a273d 100644 --- a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/fake_apiregistration_client.go +++ b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/fake_apiregistration_client.go @@ -17,8 +17,8 @@ limitations under the License. package fake import ( + rest "k8s.io/client-go/rest" v1alpha1 "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1" - restclient "k8s.io/kubernetes/pkg/client/restclient" core "k8s.io/kubernetes/pkg/client/testing/core" ) @@ -32,7 +32,7 @@ func (c *FakeApiregistrationV1alpha1) APIServices() v1alpha1.APIServiceInterface // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeApiregistrationV1alpha1) RESTClient() restclient.Interface { - var ret *restclient.RESTClient +func (c *FakeApiregistrationV1alpha1) RESTClient() rest.Interface { + var ret *rest.RESTClient return ret } diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/BUILD b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/BUILD index 9fa54a7080..abeea15fcd 100644 --- a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/BUILD +++ b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/BUILD @@ -16,11 +16,11 @@ go_library( tags = ["automanaged"], deps = [ "//cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/typed/discovery:go_default_library", "//plugin/pkg/client/auth:go_default_library", "//vendor:github.com/golang/glog", "//vendor:k8s.io/client-go/pkg/util/flowcontrol", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/clientset.go b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/clientset.go index b4eaefcd50..93c3c1e06c 100644 --- a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/clientset.go +++ b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/clientset.go @@ -19,8 +19,8 @@ package internalclientset import ( "github.com/golang/glog" "k8s.io/client-go/pkg/util/flowcontrol" + rest "k8s.io/client-go/rest" internalversionapiregistration "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion" - restclient "k8s.io/kubernetes/pkg/client/restclient" discovery "k8s.io/kubernetes/pkg/client/typed/discovery" _ "k8s.io/kubernetes/plugin/pkg/client/auth" ) @@ -54,7 +54,7 @@ func (c *Clientset) Discovery() discovery.DiscoveryInterface { } // NewForConfig creates a new Clientset for the given config. -func NewForConfig(c *restclient.Config) (*Clientset, error) { +func NewForConfig(c *rest.Config) (*Clientset, error) { configShallowCopy := *c if configShallowCopy.RateLimiter == nil && configShallowCopy.QPS > 0 { configShallowCopy.RateLimiter = flowcontrol.NewTokenBucketRateLimiter(configShallowCopy.QPS, configShallowCopy.Burst) @@ -76,7 +76,7 @@ func NewForConfig(c *restclient.Config) (*Clientset, error) { // NewForConfigOrDie creates a new Clientset for the given config and // panics if there is an error in the config. -func NewForConfigOrDie(c *restclient.Config) *Clientset { +func NewForConfigOrDie(c *rest.Config) *Clientset { var cs Clientset cs.ApiregistrationClient = internalversionapiregistration.NewForConfigOrDie(c) @@ -85,7 +85,7 @@ func NewForConfigOrDie(c *restclient.Config) *Clientset { } // New creates a new Clientset for the given RESTClient. -func New(c restclient.Interface) *Clientset { +func New(c rest.Interface) *Clientset { var cs Clientset cs.ApiregistrationClient = internalversionapiregistration.New(c) diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/BUILD b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/BUILD index 4ecd93ba77..76b6bd3112 100644 --- a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/BUILD +++ b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/BUILD @@ -19,10 +19,10 @@ go_library( deps = [ "//cmd/kube-aggregator/pkg/apis/apiregistration:go_default_library", "//pkg/api:go_default_library", - "//pkg/client/restclient:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/apiregistration_client.go b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/apiregistration_client.go index c936c16c03..f4a65d36fa 100644 --- a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/apiregistration_client.go +++ b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/apiregistration_client.go @@ -17,18 +17,18 @@ limitations under the License. package internalversion import ( + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) type ApiregistrationInterface interface { - RESTClient() restclient.Interface + RESTClient() rest.Interface APIServicesGetter } // ApiregistrationClient is used to interact with features provided by the apiregistration.k8s.io group. type ApiregistrationClient struct { - restClient restclient.Interface + restClient rest.Interface } func (c *ApiregistrationClient) APIServices() APIServiceInterface { @@ -36,12 +36,12 @@ func (c *ApiregistrationClient) APIServices() APIServiceInterface { } // NewForConfig creates a new ApiregistrationClient for the given config. -func NewForConfig(c *restclient.Config) (*ApiregistrationClient, error) { +func NewForConfig(c *rest.Config) (*ApiregistrationClient, error) { config := *c if err := setConfigDefaults(&config); err != nil { return nil, err } - client, err := restclient.RESTClientFor(&config) + client, err := rest.RESTClientFor(&config) if err != nil { return nil, err } @@ -50,7 +50,7 @@ func NewForConfig(c *restclient.Config) (*ApiregistrationClient, error) { // NewForConfigOrDie creates a new ApiregistrationClient for the given config and // panics if there is an error in the config. -func NewForConfigOrDie(c *restclient.Config) *ApiregistrationClient { +func NewForConfigOrDie(c *rest.Config) *ApiregistrationClient { client, err := NewForConfig(c) if err != nil { panic(err) @@ -59,11 +59,11 @@ func NewForConfigOrDie(c *restclient.Config) *ApiregistrationClient { } // New creates a new ApiregistrationClient for the given RESTClient. -func New(c restclient.Interface) *ApiregistrationClient { +func New(c rest.Interface) *ApiregistrationClient { return &ApiregistrationClient{c} } -func setConfigDefaults(config *restclient.Config) error { +func setConfigDefaults(config *rest.Config) error { // if apiregistration group is not registered, return an error g, err := api.Registry.Group("apiregistration.k8s.io") if err != nil { @@ -71,7 +71,7 @@ func setConfigDefaults(config *restclient.Config) error { } config.APIPath = "/apis" if config.UserAgent == "" { - config.UserAgent = restclient.DefaultKubernetesUserAgent() + config.UserAgent = rest.DefaultKubernetesUserAgent() } if config.GroupVersion == nil || config.GroupVersion.Group != g.GroupVersion.Group { copyGroupVersion := g.GroupVersion @@ -90,7 +90,7 @@ func setConfigDefaults(config *restclient.Config) error { // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *ApiregistrationClient) RESTClient() restclient.Interface { +func (c *ApiregistrationClient) RESTClient() rest.Interface { if c == nil { return nil } diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/apiservice.go b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/apiservice.go index 8e985c7c77..db4417e8f5 100644 --- a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/apiservice.go +++ b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/apiservice.go @@ -20,9 +20,9 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" apiregistration "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration" api "k8s.io/kubernetes/pkg/api" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // APIServicesGetter has a method to return a APIServiceInterface. @@ -47,7 +47,7 @@ type APIServiceInterface interface { // aPIServices implements APIServiceInterface type aPIServices struct { - client restclient.Interface + client rest.Interface } // newAPIServices returns a APIServices diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/BUILD b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/BUILD index e13d64bb86..dba4c18da7 100644 --- a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/BUILD +++ b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/BUILD @@ -19,13 +19,13 @@ go_library( "//cmd/kube-aggregator/pkg/apis/apiregistration:go_default_library", "//cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion:go_default_library", "//pkg/api:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/fake_apiregistration_client.go b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/fake_apiregistration_client.go index 887fb550a9..4d9020e8be 100644 --- a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/fake_apiregistration_client.go +++ b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/fake_apiregistration_client.go @@ -17,8 +17,8 @@ limitations under the License. package fake import ( + rest "k8s.io/client-go/rest" internalversion "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion" - restclient "k8s.io/kubernetes/pkg/client/restclient" core "k8s.io/kubernetes/pkg/client/testing/core" ) @@ -32,7 +32,7 @@ func (c *FakeApiregistration) APIServices() internalversion.APIServiceInterface // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeApiregistration) RESTClient() restclient.Interface { - var ret *restclient.RESTClient +func (c *FakeApiregistration) RESTClient() rest.Interface { + var ret *rest.RESTClient return ret } diff --git a/cmd/kube-aggregator/pkg/cmd/server/BUILD b/cmd/kube-aggregator/pkg/cmd/server/BUILD index 46738be82b..cc2b9c027d 100644 --- a/cmd/kube-aggregator/pkg/cmd/server/BUILD +++ b/cmd/kube-aggregator/pkg/cmd/server/BUILD @@ -17,7 +17,6 @@ go_library( "//cmd/kube-aggregator/pkg/legacy:go_default_library", "//pkg/api:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/genericapiserver/registry/generic:go_default_library", "//pkg/genericapiserver/registry/generic/registry:go_default_library", "//pkg/genericapiserver/server:go_default_library", diff --git a/cmd/kube-controller-manager/app/BUILD b/cmd/kube-controller-manager/app/BUILD index c1827500f2..fc00043bbb 100644 --- a/cmd/kube-controller-manager/app/BUILD +++ b/cmd/kube-controller-manager/app/BUILD @@ -34,7 +34,6 @@ go_library( "//pkg/client/leaderelection:go_default_library", "//pkg/client/leaderelection/resourcelock:go_default_library", "//pkg/client/record:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/typed/discovery:go_default_library", "//pkg/client/typed/dynamic:go_default_library", "//pkg/client/unversioned/clientcmd:go_default_library", diff --git a/cmd/kubeadm/app/node/BUILD b/cmd/kubeadm/app/node/BUILD index 667aacbd85..53ccb872b4 100644 --- a/cmd/kubeadm/app/node/BUILD +++ b/cmd/kubeadm/app/node/BUILD @@ -45,7 +45,6 @@ go_test( deps = [ "//cmd/kubeadm/app/apis/kubeadm:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/typed/discovery:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/version", diff --git a/cmd/kubelet/app/BUILD b/cmd/kubelet/app/BUILD index 42064fc22f..e038171f0a 100644 --- a/cmd/kubelet/app/BUILD +++ b/cmd/kubelet/app/BUILD @@ -17,7 +17,6 @@ go_test( library = ":go_default_library", tags = ["automanaged"], deps = [ - "//pkg/client/restclient:go_default_library", "//pkg/kubelet:go_default_library", "//pkg/util/config:go_default_library", "//vendor:k8s.io/apimachinery/pkg/util/diff", @@ -47,7 +46,6 @@ go_library( "//pkg/client/clientset_generated/clientset/typed/certificates/v1beta1:go_default_library", "//pkg/client/clientset_generated/clientset/typed/core/v1:go_default_library", "//pkg/client/record:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/unversioned/auth:go_default_library", "//pkg/client/unversioned/clientcmd:go_default_library", "//pkg/cloudprovider:go_default_library", diff --git a/cmd/kubemark/BUILD b/cmd/kubemark/BUILD index 287d3d7047..74069eef20 100644 --- a/cmd/kubemark/BUILD +++ b/cmd/kubemark/BUILD @@ -24,7 +24,6 @@ go_library( "//pkg/client/clientset_generated/internalclientset:go_default_library", "//pkg/client/metrics/prometheus:go_default_library", "//pkg/client/record:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/unversioned/clientcmd:go_default_library", "//pkg/kubelet/cadvisor/testing:go_default_library", "//pkg/kubelet/cm:go_default_library", diff --git a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/BUILD b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/BUILD index f9b085a23c..532392b91e 100644 --- a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/BUILD +++ b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/BUILD @@ -17,11 +17,11 @@ go_library( tags = ["automanaged"], deps = [ "//cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/typed/discovery:go_default_library", "//plugin/pkg/client/auth:go_default_library", "//vendor:github.com/golang/glog", "//vendor:k8s.io/client-go/pkg/util/flowcontrol", + "//vendor:k8s.io/client-go/rest", ], ) @@ -30,10 +30,7 @@ go_test( srcs = ["clientset_test.go"], library = ":go_default_library", tags = ["automanaged"], - deps = [ - "//pkg/client/restclient:go_default_library", - "//vendor:k8s.io/client-go/pkg/util/flowcontrol", - ], + deps = ["//vendor:k8s.io/client-go/pkg/util/flowcontrol"], ) filegroup( 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 8486aa869a..a5fffeda58 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 @@ -19,8 +19,8 @@ package test_internalclientset import ( "github.com/golang/glog" "k8s.io/client-go/pkg/util/flowcontrol" + rest "k8s.io/client-go/rest" internalversiontestgroup "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion" - restclient "k8s.io/kubernetes/pkg/client/restclient" discovery "k8s.io/kubernetes/pkg/client/typed/discovery" _ "k8s.io/kubernetes/plugin/pkg/client/auth" ) @@ -54,7 +54,7 @@ func (c *Clientset) Discovery() discovery.DiscoveryInterface { } // NewForConfig creates a new Clientset for the given config. -func NewForConfig(c *restclient.Config) (*Clientset, error) { +func NewForConfig(c *rest.Config) (*Clientset, error) { configShallowCopy := *c if configShallowCopy.RateLimiter == nil && configShallowCopy.QPS > 0 { configShallowCopy.RateLimiter = flowcontrol.NewTokenBucketRateLimiter(configShallowCopy.QPS, configShallowCopy.Burst) @@ -76,7 +76,7 @@ func NewForConfig(c *restclient.Config) (*Clientset, error) { // NewForConfigOrDie creates a new Clientset for the given config and // panics if there is an error in the config. -func NewForConfigOrDie(c *restclient.Config) *Clientset { +func NewForConfigOrDie(c *rest.Config) *Clientset { var cs Clientset cs.TestgroupClient = internalversiontestgroup.NewForConfigOrDie(c) @@ -85,7 +85,7 @@ func NewForConfigOrDie(c *restclient.Config) *Clientset { } // New creates a new Clientset for the given RESTClient. -func New(c restclient.Interface) *Clientset { +func New(c rest.Interface) *Clientset { var cs Clientset cs.TestgroupClient = internalversiontestgroup.New(c) diff --git a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/BUILD b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/BUILD index 532b5270fc..7c883a1850 100644 --- a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/BUILD +++ b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/BUILD @@ -19,10 +19,10 @@ go_library( deps = [ "//cmd/libs/go2idl/client-gen/test_apis/testgroup:go_default_library", "//pkg/api:go_default_library", - "//pkg/client/restclient:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake/BUILD b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake/BUILD index 96128169dc..9db0cfdde8 100644 --- a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake/BUILD +++ b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake/BUILD @@ -19,13 +19,13 @@ go_library( "//cmd/libs/go2idl/client-gen/test_apis/testgroup:go_default_library", "//cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion:go_default_library", "//pkg/api:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake/fake_testgroup_client.go b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake/fake_testgroup_client.go index 7dbd02423b..63669d98d3 100644 --- a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake/fake_testgroup_client.go +++ b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake/fake_testgroup_client.go @@ -17,8 +17,8 @@ limitations under the License. package fake import ( + rest "k8s.io/client-go/rest" internalversion "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion" - restclient "k8s.io/kubernetes/pkg/client/restclient" core "k8s.io/kubernetes/pkg/client/testing/core" ) @@ -32,7 +32,7 @@ func (c *FakeTestgroup) TestTypes(namespace string) internalversion.TestTypeInte // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeTestgroup) RESTClient() restclient.Interface { - var ret *restclient.RESTClient +func (c *FakeTestgroup) RESTClient() rest.Interface { + var ret *rest.RESTClient return ret } diff --git a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/testgroup_client.go b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/testgroup_client.go index 730ae66c48..bb2855b51c 100644 --- a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/testgroup_client.go +++ b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/testgroup_client.go @@ -17,18 +17,18 @@ limitations under the License. package internalversion import ( + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) type TestgroupInterface interface { - RESTClient() restclient.Interface + RESTClient() rest.Interface TestTypesGetter } // TestgroupClient is used to interact with features provided by the testgroup.k8s.io group. type TestgroupClient struct { - restClient restclient.Interface + restClient rest.Interface } func (c *TestgroupClient) TestTypes(namespace string) TestTypeInterface { @@ -36,12 +36,12 @@ func (c *TestgroupClient) TestTypes(namespace string) TestTypeInterface { } // NewForConfig creates a new TestgroupClient for the given config. -func NewForConfig(c *restclient.Config) (*TestgroupClient, error) { +func NewForConfig(c *rest.Config) (*TestgroupClient, error) { config := *c if err := setConfigDefaults(&config); err != nil { return nil, err } - client, err := restclient.RESTClientFor(&config) + client, err := rest.RESTClientFor(&config) if err != nil { return nil, err } @@ -50,7 +50,7 @@ func NewForConfig(c *restclient.Config) (*TestgroupClient, error) { // NewForConfigOrDie creates a new TestgroupClient for the given config and // panics if there is an error in the config. -func NewForConfigOrDie(c *restclient.Config) *TestgroupClient { +func NewForConfigOrDie(c *rest.Config) *TestgroupClient { client, err := NewForConfig(c) if err != nil { panic(err) @@ -59,11 +59,11 @@ func NewForConfigOrDie(c *restclient.Config) *TestgroupClient { } // New creates a new TestgroupClient for the given RESTClient. -func New(c restclient.Interface) *TestgroupClient { +func New(c rest.Interface) *TestgroupClient { return &TestgroupClient{c} } -func setConfigDefaults(config *restclient.Config) error { +func setConfigDefaults(config *rest.Config) error { // if testgroup group is not registered, return an error g, err := api.Registry.Group("testgroup.k8s.io") if err != nil { @@ -71,7 +71,7 @@ func setConfigDefaults(config *restclient.Config) error { } config.APIPath = "/apis" if config.UserAgent == "" { - config.UserAgent = restclient.DefaultKubernetesUserAgent() + config.UserAgent = rest.DefaultKubernetesUserAgent() } if config.GroupVersion == nil || config.GroupVersion.Group != g.GroupVersion.Group { copyGroupVersion := g.GroupVersion @@ -90,7 +90,7 @@ func setConfigDefaults(config *restclient.Config) error { // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *TestgroupClient) RESTClient() restclient.Interface { +func (c *TestgroupClient) RESTClient() rest.Interface { if c == nil { return nil } diff --git a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/testtype.go b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/testtype.go index f2258bbcb0..519e165ba7 100644 --- a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/testtype.go +++ b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/testtype.go @@ -20,9 +20,9 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" testgroup "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup" api "k8s.io/kubernetes/pkg/api" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // TestTypesGetter has a method to return a TestTypeInterface. @@ -47,7 +47,7 @@ type TestTypeInterface interface { // testTypes implements TestTypeInterface type testTypes struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/federation/client/clientset_generated/federation_clientset/BUILD b/federation/client/clientset_generated/federation_clientset/BUILD index a9cb8d00a8..1b9427befd 100644 --- a/federation/client/clientset_generated/federation_clientset/BUILD +++ b/federation/client/clientset_generated/federation_clientset/BUILD @@ -21,11 +21,11 @@ go_library( "//federation/client/clientset_generated/federation_clientset/typed/core/v1:go_default_library", "//federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1:go_default_library", "//federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/typed/discovery:go_default_library", "//plugin/pkg/client/auth:go_default_library", "//vendor:github.com/golang/glog", "//vendor:k8s.io/client-go/pkg/util/flowcontrol", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/federation/client/clientset_generated/federation_clientset/clientset.go b/federation/client/clientset_generated/federation_clientset/clientset.go index 569efda9f0..8b39641654 100644 --- a/federation/client/clientset_generated/federation_clientset/clientset.go +++ b/federation/client/clientset_generated/federation_clientset/clientset.go @@ -19,11 +19,11 @@ package federation_clientset import ( "github.com/golang/glog" "k8s.io/client-go/pkg/util/flowcontrol" + rest "k8s.io/client-go/rest" v1batch "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/typed/batch/v1" v1core "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/typed/core/v1" v1beta1extensions "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1" v1beta1federation "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1" - restclient "k8s.io/kubernetes/pkg/client/restclient" discovery "k8s.io/kubernetes/pkg/client/typed/discovery" _ "k8s.io/kubernetes/plugin/pkg/client/auth" ) @@ -131,7 +131,7 @@ func (c *Clientset) Discovery() discovery.DiscoveryInterface { } // NewForConfig creates a new Clientset for the given config. -func NewForConfig(c *restclient.Config) (*Clientset, error) { +func NewForConfig(c *rest.Config) (*Clientset, error) { configShallowCopy := *c if configShallowCopy.RateLimiter == nil && configShallowCopy.QPS > 0 { configShallowCopy.RateLimiter = flowcontrol.NewTokenBucketRateLimiter(configShallowCopy.QPS, configShallowCopy.Burst) @@ -165,7 +165,7 @@ func NewForConfig(c *restclient.Config) (*Clientset, error) { // NewForConfigOrDie creates a new Clientset for the given config and // panics if there is an error in the config. -func NewForConfigOrDie(c *restclient.Config) *Clientset { +func NewForConfigOrDie(c *rest.Config) *Clientset { var cs Clientset cs.CoreV1Client = v1core.NewForConfigOrDie(c) cs.BatchV1Client = v1batch.NewForConfigOrDie(c) @@ -177,7 +177,7 @@ func NewForConfigOrDie(c *restclient.Config) *Clientset { } // New creates a new Clientset for the given RESTClient. -func New(c restclient.Interface) *Clientset { +func New(c rest.Interface) *Clientset { var cs Clientset cs.CoreV1Client = v1core.New(c) cs.BatchV1Client = v1batch.New(c) diff --git a/federation/client/clientset_generated/federation_clientset/typed/batch/v1/BUILD b/federation/client/clientset_generated/federation_clientset/typed/batch/v1/BUILD index a2b1b7189b..282bc89931 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/batch/v1/BUILD +++ b/federation/client/clientset_generated/federation_clientset/typed/batch/v1/BUILD @@ -20,12 +20,12 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apis/batch/v1:go_default_library", - "//pkg/client/restclient:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/federation/client/clientset_generated/federation_clientset/typed/batch/v1/batch_client.go b/federation/client/clientset_generated/federation_clientset/typed/batch/v1/batch_client.go index def6f1e39a..2c1dba1658 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/batch/v1/batch_client.go +++ b/federation/client/clientset_generated/federation_clientset/typed/batch/v1/batch_client.go @@ -20,18 +20,18 @@ import ( fmt "fmt" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) type BatchV1Interface interface { - RESTClient() restclient.Interface + RESTClient() rest.Interface JobsGetter } // BatchV1Client is used to interact with features provided by the batch group. type BatchV1Client struct { - restClient restclient.Interface + restClient rest.Interface } func (c *BatchV1Client) Jobs(namespace string) JobInterface { @@ -39,12 +39,12 @@ func (c *BatchV1Client) Jobs(namespace string) JobInterface { } // NewForConfig creates a new BatchV1Client for the given config. -func NewForConfig(c *restclient.Config) (*BatchV1Client, error) { +func NewForConfig(c *rest.Config) (*BatchV1Client, error) { config := *c if err := setConfigDefaults(&config); err != nil { return nil, err } - client, err := restclient.RESTClientFor(&config) + client, err := rest.RESTClientFor(&config) if err != nil { return nil, err } @@ -53,7 +53,7 @@ func NewForConfig(c *restclient.Config) (*BatchV1Client, error) { // NewForConfigOrDie creates a new BatchV1Client for the given config and // panics if there is an error in the config. -func NewForConfigOrDie(c *restclient.Config) *BatchV1Client { +func NewForConfigOrDie(c *rest.Config) *BatchV1Client { client, err := NewForConfig(c) if err != nil { panic(err) @@ -62,11 +62,11 @@ func NewForConfigOrDie(c *restclient.Config) *BatchV1Client { } // New creates a new BatchV1Client for the given RESTClient. -func New(c restclient.Interface) *BatchV1Client { +func New(c rest.Interface) *BatchV1Client { return &BatchV1Client{c} } -func setConfigDefaults(config *restclient.Config) error { +func setConfigDefaults(config *rest.Config) error { gv, err := schema.ParseGroupVersion("batch/v1") if err != nil { return err @@ -77,7 +77,7 @@ func setConfigDefaults(config *restclient.Config) error { } config.APIPath = "/apis" if config.UserAgent == "" { - config.UserAgent = restclient.DefaultKubernetesUserAgent() + config.UserAgent = rest.DefaultKubernetesUserAgent() } copyGroupVersion := gv config.GroupVersion = ©GroupVersion @@ -89,7 +89,7 @@ func setConfigDefaults(config *restclient.Config) error { // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *BatchV1Client) RESTClient() restclient.Interface { +func (c *BatchV1Client) RESTClient() rest.Interface { if c == nil { return nil } diff --git a/federation/client/clientset_generated/federation_clientset/typed/batch/v1/fake/BUILD b/federation/client/clientset_generated/federation_clientset/typed/batch/v1/fake/BUILD index c31e6de088..62ba2c18f1 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/batch/v1/fake/BUILD +++ b/federation/client/clientset_generated/federation_clientset/typed/batch/v1/fake/BUILD @@ -19,13 +19,13 @@ go_library( "//federation/client/clientset_generated/federation_clientset/typed/batch/v1:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apis/batch/v1:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/federation/client/clientset_generated/federation_clientset/typed/batch/v1/fake/fake_batch_client.go b/federation/client/clientset_generated/federation_clientset/typed/batch/v1/fake/fake_batch_client.go index 0e3ac228d8..6cdcb989e4 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/batch/v1/fake/fake_batch_client.go +++ b/federation/client/clientset_generated/federation_clientset/typed/batch/v1/fake/fake_batch_client.go @@ -17,8 +17,8 @@ limitations under the License. package fake import ( + rest "k8s.io/client-go/rest" v1 "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/typed/batch/v1" - restclient "k8s.io/kubernetes/pkg/client/restclient" core "k8s.io/kubernetes/pkg/client/testing/core" ) @@ -32,7 +32,7 @@ func (c *FakeBatchV1) Jobs(namespace string) v1.JobInterface { // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeBatchV1) RESTClient() restclient.Interface { - var ret *restclient.RESTClient +func (c *FakeBatchV1) RESTClient() rest.Interface { + var ret *rest.RESTClient return ret } diff --git a/federation/client/clientset_generated/federation_clientset/typed/batch/v1/job.go b/federation/client/clientset_generated/federation_clientset/typed/batch/v1/job.go index 2d1e34259c..67ff9f03e0 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/batch/v1/job.go +++ b/federation/client/clientset_generated/federation_clientset/typed/batch/v1/job.go @@ -20,10 +20,10 @@ import ( meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" 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" ) // JobsGetter has a method to return a JobInterface. @@ -48,7 +48,7 @@ type JobInterface interface { // jobs implements JobInterface type jobs struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/federation/client/clientset_generated/federation_clientset/typed/core/v1/BUILD b/federation/client/clientset_generated/federation_clientset/typed/core/v1/BUILD index f507f27978..65a5de4c82 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/core/v1/BUILD +++ b/federation/client/clientset_generated/federation_clientset/typed/core/v1/BUILD @@ -24,12 +24,12 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/v1:go_default_library", - "//pkg/client/restclient:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/federation/client/clientset_generated/federation_clientset/typed/core/v1/configmap.go b/federation/client/clientset_generated/federation_clientset/typed/core/v1/configmap.go index b4f846eca1..01de98954e 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/core/v1/configmap.go +++ b/federation/client/clientset_generated/federation_clientset/typed/core/v1/configmap.go @@ -20,9 +20,9 @@ import ( meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // ConfigMapsGetter has a method to return a ConfigMapInterface. @@ -46,7 +46,7 @@ type ConfigMapInterface interface { // configMaps implements ConfigMapInterface type configMaps struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/federation/client/clientset_generated/federation_clientset/typed/core/v1/core_client.go b/federation/client/clientset_generated/federation_clientset/typed/core/v1/core_client.go index 93245f8bdd..ad08c466c6 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/core/v1/core_client.go +++ b/federation/client/clientset_generated/federation_clientset/typed/core/v1/core_client.go @@ -20,12 +20,12 @@ import ( fmt "fmt" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) type CoreV1Interface interface { - RESTClient() restclient.Interface + RESTClient() rest.Interface ConfigMapsGetter EventsGetter NamespacesGetter @@ -35,7 +35,7 @@ type CoreV1Interface interface { // CoreV1Client is used to interact with features provided by the group. type CoreV1Client struct { - restClient restclient.Interface + restClient rest.Interface } func (c *CoreV1Client) ConfigMaps(namespace string) ConfigMapInterface { @@ -59,12 +59,12 @@ func (c *CoreV1Client) Services(namespace string) ServiceInterface { } // NewForConfig creates a new CoreV1Client for the given config. -func NewForConfig(c *restclient.Config) (*CoreV1Client, error) { +func NewForConfig(c *rest.Config) (*CoreV1Client, error) { config := *c if err := setConfigDefaults(&config); err != nil { return nil, err } - client, err := restclient.RESTClientFor(&config) + client, err := rest.RESTClientFor(&config) if err != nil { return nil, err } @@ -73,7 +73,7 @@ func NewForConfig(c *restclient.Config) (*CoreV1Client, error) { // NewForConfigOrDie creates a new CoreV1Client for the given config and // panics if there is an error in the config. -func NewForConfigOrDie(c *restclient.Config) *CoreV1Client { +func NewForConfigOrDie(c *rest.Config) *CoreV1Client { client, err := NewForConfig(c) if err != nil { panic(err) @@ -82,11 +82,11 @@ func NewForConfigOrDie(c *restclient.Config) *CoreV1Client { } // New creates a new CoreV1Client for the given RESTClient. -func New(c restclient.Interface) *CoreV1Client { +func New(c rest.Interface) *CoreV1Client { return &CoreV1Client{c} } -func setConfigDefaults(config *restclient.Config) error { +func setConfigDefaults(config *rest.Config) error { gv, err := schema.ParseGroupVersion("/v1") if err != nil { return err @@ -97,7 +97,7 @@ func setConfigDefaults(config *restclient.Config) error { } config.APIPath = "/api" if config.UserAgent == "" { - config.UserAgent = restclient.DefaultKubernetesUserAgent() + config.UserAgent = rest.DefaultKubernetesUserAgent() } copyGroupVersion := gv config.GroupVersion = ©GroupVersion @@ -109,7 +109,7 @@ func setConfigDefaults(config *restclient.Config) error { // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *CoreV1Client) RESTClient() restclient.Interface { +func (c *CoreV1Client) RESTClient() rest.Interface { if c == nil { return nil } diff --git a/federation/client/clientset_generated/federation_clientset/typed/core/v1/event.go b/federation/client/clientset_generated/federation_clientset/typed/core/v1/event.go index 040e1b68d0..7ee9a35f17 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/core/v1/event.go +++ b/federation/client/clientset_generated/federation_clientset/typed/core/v1/event.go @@ -20,9 +20,9 @@ import ( meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // EventsGetter has a method to return a EventInterface. @@ -46,7 +46,7 @@ type EventInterface interface { // events implements EventInterface type events struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/BUILD b/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/BUILD index 7e3a80e087..5b30c92006 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/BUILD +++ b/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/BUILD @@ -23,13 +23,13 @@ go_library( deps = [ "//federation/client/clientset_generated/federation_clientset/typed/core/v1:go_default_library", "//pkg/api/v1:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_core_client.go b/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_core_client.go index 3fcd8b5901..a95b91b69d 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_core_client.go +++ b/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_core_client.go @@ -17,8 +17,8 @@ limitations under the License. package fake import ( + rest "k8s.io/client-go/rest" v1 "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/typed/core/v1" - restclient "k8s.io/kubernetes/pkg/client/restclient" core "k8s.io/kubernetes/pkg/client/testing/core" ) @@ -48,7 +48,7 @@ func (c *FakeCoreV1) Services(namespace string) v1.ServiceInterface { // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeCoreV1) RESTClient() restclient.Interface { - var ret *restclient.RESTClient +func (c *FakeCoreV1) RESTClient() rest.Interface { + var ret *rest.RESTClient return ret } diff --git a/federation/client/clientset_generated/federation_clientset/typed/core/v1/namespace.go b/federation/client/clientset_generated/federation_clientset/typed/core/v1/namespace.go index 0a01c78f2c..6fc64ff4e7 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/core/v1/namespace.go +++ b/federation/client/clientset_generated/federation_clientset/typed/core/v1/namespace.go @@ -20,9 +20,9 @@ import ( meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // NamespacesGetter has a method to return a NamespaceInterface. @@ -47,7 +47,7 @@ type NamespaceInterface interface { // namespaces implements NamespaceInterface type namespaces struct { - client restclient.Interface + client rest.Interface } // newNamespaces returns a Namespaces diff --git a/federation/client/clientset_generated/federation_clientset/typed/core/v1/secret.go b/federation/client/clientset_generated/federation_clientset/typed/core/v1/secret.go index 298ca343e0..0ba9ba8bfb 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/core/v1/secret.go +++ b/federation/client/clientset_generated/federation_clientset/typed/core/v1/secret.go @@ -20,9 +20,9 @@ import ( meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // SecretsGetter has a method to return a SecretInterface. @@ -46,7 +46,7 @@ type SecretInterface interface { // secrets implements SecretInterface type secrets struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/federation/client/clientset_generated/federation_clientset/typed/core/v1/service.go b/federation/client/clientset_generated/federation_clientset/typed/core/v1/service.go index 660d1a632c..99c6d3f7a7 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/core/v1/service.go +++ b/federation/client/clientset_generated/federation_clientset/typed/core/v1/service.go @@ -20,9 +20,9 @@ import ( meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // ServicesGetter has a method to return a ServiceInterface. @@ -47,7 +47,7 @@ type ServiceInterface interface { // services implements ServiceInterface type services struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/BUILD b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/BUILD index 7683fbc144..a5eb4d1359 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/BUILD +++ b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/BUILD @@ -24,12 +24,12 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", - "//pkg/client/restclient:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/daemonset.go b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/daemonset.go index aaebd1e968..cdc71b8b55 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/daemonset.go +++ b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/daemonset.go @@ -20,10 +20,10 @@ import ( meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" 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" ) // DaemonSetsGetter has a method to return a DaemonSetInterface. @@ -48,7 +48,7 @@ type DaemonSetInterface interface { // daemonSets implements DaemonSetInterface type daemonSets struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/deployment.go b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/deployment.go index 2987c87651..1060d60eca 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/deployment.go +++ b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/deployment.go @@ -20,10 +20,10 @@ import ( meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" 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" ) // DeploymentsGetter has a method to return a DeploymentInterface. @@ -48,7 +48,7 @@ type DeploymentInterface interface { // deployments implements DeploymentInterface type deployments struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/extensions_client.go b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/extensions_client.go index 5994f8bf6f..893c8d2a7f 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/extensions_client.go +++ b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/extensions_client.go @@ -20,12 +20,12 @@ import ( fmt "fmt" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) type ExtensionsV1beta1Interface interface { - RESTClient() restclient.Interface + RESTClient() rest.Interface DaemonSetsGetter DeploymentsGetter IngressesGetter @@ -34,7 +34,7 @@ type ExtensionsV1beta1Interface interface { // ExtensionsV1beta1Client is used to interact with features provided by the extensions group. type ExtensionsV1beta1Client struct { - restClient restclient.Interface + restClient rest.Interface } func (c *ExtensionsV1beta1Client) DaemonSets(namespace string) DaemonSetInterface { @@ -54,12 +54,12 @@ func (c *ExtensionsV1beta1Client) ReplicaSets(namespace string) ReplicaSetInterf } // NewForConfig creates a new ExtensionsV1beta1Client for the given config. -func NewForConfig(c *restclient.Config) (*ExtensionsV1beta1Client, error) { +func NewForConfig(c *rest.Config) (*ExtensionsV1beta1Client, error) { config := *c if err := setConfigDefaults(&config); err != nil { return nil, err } - client, err := restclient.RESTClientFor(&config) + client, err := rest.RESTClientFor(&config) if err != nil { return nil, err } @@ -68,7 +68,7 @@ func NewForConfig(c *restclient.Config) (*ExtensionsV1beta1Client, error) { // NewForConfigOrDie creates a new ExtensionsV1beta1Client for the given config and // panics if there is an error in the config. -func NewForConfigOrDie(c *restclient.Config) *ExtensionsV1beta1Client { +func NewForConfigOrDie(c *rest.Config) *ExtensionsV1beta1Client { client, err := NewForConfig(c) if err != nil { panic(err) @@ -77,11 +77,11 @@ func NewForConfigOrDie(c *restclient.Config) *ExtensionsV1beta1Client { } // New creates a new ExtensionsV1beta1Client for the given RESTClient. -func New(c restclient.Interface) *ExtensionsV1beta1Client { +func New(c rest.Interface) *ExtensionsV1beta1Client { return &ExtensionsV1beta1Client{c} } -func setConfigDefaults(config *restclient.Config) error { +func setConfigDefaults(config *rest.Config) error { gv, err := schema.ParseGroupVersion("extensions/v1beta1") if err != nil { return err @@ -92,7 +92,7 @@ func setConfigDefaults(config *restclient.Config) error { } config.APIPath = "/apis" if config.UserAgent == "" { - config.UserAgent = restclient.DefaultKubernetesUserAgent() + config.UserAgent = rest.DefaultKubernetesUserAgent() } copyGroupVersion := gv config.GroupVersion = ©GroupVersion @@ -104,7 +104,7 @@ func setConfigDefaults(config *restclient.Config) error { // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *ExtensionsV1beta1Client) RESTClient() restclient.Interface { +func (c *ExtensionsV1beta1Client) RESTClient() rest.Interface { if c == nil { return nil } diff --git a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/BUILD b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/BUILD index 6bfeca5d7e..2ae4220670 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/BUILD +++ b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/BUILD @@ -23,13 +23,13 @@ go_library( "//federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_extensions_client.go b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_extensions_client.go index e42de1f6fa..3442070b7b 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_extensions_client.go +++ b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_extensions_client.go @@ -17,8 +17,8 @@ limitations under the License. package fake import ( + rest "k8s.io/client-go/rest" v1beta1 "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1" - restclient "k8s.io/kubernetes/pkg/client/restclient" core "k8s.io/kubernetes/pkg/client/testing/core" ) @@ -44,7 +44,7 @@ func (c *FakeExtensionsV1beta1) ReplicaSets(namespace string) v1beta1.ReplicaSet // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeExtensionsV1beta1) RESTClient() restclient.Interface { - var ret *restclient.RESTClient +func (c *FakeExtensionsV1beta1) RESTClient() rest.Interface { + var ret *rest.RESTClient return ret } diff --git a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/ingress.go b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/ingress.go index ced46ccb88..aaa1494699 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/ingress.go +++ b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/ingress.go @@ -20,10 +20,10 @@ import ( meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" 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" ) // IngressesGetter has a method to return a IngressInterface. @@ -48,7 +48,7 @@ type IngressInterface interface { // ingresses implements IngressInterface type ingresses struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/replicaset.go b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/replicaset.go index 7b1ca121ae..3bc699ff35 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/replicaset.go +++ b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/replicaset.go @@ -20,10 +20,10 @@ import ( meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" 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" ) // ReplicaSetsGetter has a method to return a ReplicaSetInterface. @@ -48,7 +48,7 @@ type ReplicaSetInterface interface { // replicaSets implements ReplicaSetInterface type replicaSets struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/BUILD b/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/BUILD index 79c265485e..06393d6648 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/BUILD +++ b/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/BUILD @@ -20,12 +20,12 @@ go_library( "//federation/apis/federation/v1beta1:go_default_library", "//pkg/api:go_default_library", "//pkg/api/v1:go_default_library", - "//pkg/client/restclient:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/cluster.go b/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/cluster.go index 9be7265a88..87c83d16d5 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/cluster.go +++ b/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/cluster.go @@ -20,10 +20,10 @@ import ( meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" 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" ) // ClustersGetter has a method to return a ClusterInterface. @@ -48,7 +48,7 @@ type ClusterInterface interface { // clusters implements ClusterInterface type clusters struct { - client restclient.Interface + client rest.Interface } // newClusters returns a Clusters diff --git a/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/fake/BUILD b/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/fake/BUILD index 765ac8b451..27ed257198 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/fake/BUILD +++ b/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/fake/BUILD @@ -19,13 +19,13 @@ go_library( "//federation/apis/federation/v1beta1:go_default_library", "//federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1:go_default_library", "//pkg/api/v1:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/fake/fake_federation_client.go b/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/fake/fake_federation_client.go index 4d74cade45..1128a199ba 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/fake/fake_federation_client.go +++ b/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/fake/fake_federation_client.go @@ -17,8 +17,8 @@ limitations under the License. package fake import ( + rest "k8s.io/client-go/rest" v1beta1 "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1" - restclient "k8s.io/kubernetes/pkg/client/restclient" core "k8s.io/kubernetes/pkg/client/testing/core" ) @@ -32,7 +32,7 @@ func (c *FakeFederationV1beta1) Clusters() v1beta1.ClusterInterface { // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeFederationV1beta1) RESTClient() restclient.Interface { - var ret *restclient.RESTClient +func (c *FakeFederationV1beta1) RESTClient() rest.Interface { + var ret *rest.RESTClient return ret } diff --git a/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/federation_client.go b/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/federation_client.go index db28a80c43..b51bfda223 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/federation_client.go +++ b/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/federation_client.go @@ -20,18 +20,18 @@ import ( fmt "fmt" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) type FederationV1beta1Interface interface { - RESTClient() restclient.Interface + RESTClient() rest.Interface ClustersGetter } // FederationV1beta1Client is used to interact with features provided by the federation group. type FederationV1beta1Client struct { - restClient restclient.Interface + restClient rest.Interface } func (c *FederationV1beta1Client) Clusters() ClusterInterface { @@ -39,12 +39,12 @@ func (c *FederationV1beta1Client) Clusters() ClusterInterface { } // NewForConfig creates a new FederationV1beta1Client for the given config. -func NewForConfig(c *restclient.Config) (*FederationV1beta1Client, error) { +func NewForConfig(c *rest.Config) (*FederationV1beta1Client, error) { config := *c if err := setConfigDefaults(&config); err != nil { return nil, err } - client, err := restclient.RESTClientFor(&config) + client, err := rest.RESTClientFor(&config) if err != nil { return nil, err } @@ -53,7 +53,7 @@ func NewForConfig(c *restclient.Config) (*FederationV1beta1Client, error) { // NewForConfigOrDie creates a new FederationV1beta1Client for the given config and // panics if there is an error in the config. -func NewForConfigOrDie(c *restclient.Config) *FederationV1beta1Client { +func NewForConfigOrDie(c *rest.Config) *FederationV1beta1Client { client, err := NewForConfig(c) if err != nil { panic(err) @@ -62,11 +62,11 @@ func NewForConfigOrDie(c *restclient.Config) *FederationV1beta1Client { } // New creates a new FederationV1beta1Client for the given RESTClient. -func New(c restclient.Interface) *FederationV1beta1Client { +func New(c rest.Interface) *FederationV1beta1Client { return &FederationV1beta1Client{c} } -func setConfigDefaults(config *restclient.Config) error { +func setConfigDefaults(config *rest.Config) error { gv, err := schema.ParseGroupVersion("federation/v1beta1") if err != nil { return err @@ -77,7 +77,7 @@ func setConfigDefaults(config *restclient.Config) error { } config.APIPath = "/apis" if config.UserAgent == "" { - config.UserAgent = restclient.DefaultKubernetesUserAgent() + config.UserAgent = rest.DefaultKubernetesUserAgent() } copyGroupVersion := gv config.GroupVersion = ©GroupVersion @@ -89,7 +89,7 @@ func setConfigDefaults(config *restclient.Config) error { // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FederationV1beta1Client) RESTClient() restclient.Interface { +func (c *FederationV1beta1Client) RESTClient() rest.Interface { if c == nil { return nil } diff --git a/federation/client/clientset_generated/federation_internalclientset/BUILD b/federation/client/clientset_generated/federation_internalclientset/BUILD index 8c602ac66a..f5fdbb9f45 100644 --- a/federation/client/clientset_generated/federation_internalclientset/BUILD +++ b/federation/client/clientset_generated/federation_internalclientset/BUILD @@ -21,11 +21,11 @@ go_library( "//federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion:go_default_library", "//federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion:go_default_library", "//federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/typed/discovery:go_default_library", "//plugin/pkg/client/auth:go_default_library", "//vendor:github.com/golang/glog", "//vendor:k8s.io/client-go/pkg/util/flowcontrol", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/federation/client/clientset_generated/federation_internalclientset/clientset.go b/federation/client/clientset_generated/federation_internalclientset/clientset.go index 59040401cd..384279514b 100644 --- a/federation/client/clientset_generated/federation_internalclientset/clientset.go +++ b/federation/client/clientset_generated/federation_internalclientset/clientset.go @@ -19,11 +19,11 @@ package federation_internalclientset import ( "github.com/golang/glog" "k8s.io/client-go/pkg/util/flowcontrol" + rest "k8s.io/client-go/rest" internalversionbatch "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion" internalversioncore "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion" internalversionextensions "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion" internalversionfederation "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion" - restclient "k8s.io/kubernetes/pkg/client/restclient" discovery "k8s.io/kubernetes/pkg/client/typed/discovery" _ "k8s.io/kubernetes/plugin/pkg/client/auth" ) @@ -90,7 +90,7 @@ func (c *Clientset) Discovery() discovery.DiscoveryInterface { } // NewForConfig creates a new Clientset for the given config. -func NewForConfig(c *restclient.Config) (*Clientset, error) { +func NewForConfig(c *rest.Config) (*Clientset, error) { configShallowCopy := *c if configShallowCopy.RateLimiter == nil && configShallowCopy.QPS > 0 { configShallowCopy.RateLimiter = flowcontrol.NewTokenBucketRateLimiter(configShallowCopy.QPS, configShallowCopy.Burst) @@ -124,7 +124,7 @@ func NewForConfig(c *restclient.Config) (*Clientset, error) { // NewForConfigOrDie creates a new Clientset for the given config and // panics if there is an error in the config. -func NewForConfigOrDie(c *restclient.Config) *Clientset { +func NewForConfigOrDie(c *rest.Config) *Clientset { var cs Clientset cs.CoreClient = internalversioncore.NewForConfigOrDie(c) cs.BatchClient = internalversionbatch.NewForConfigOrDie(c) @@ -136,7 +136,7 @@ func NewForConfigOrDie(c *restclient.Config) *Clientset { } // New creates a new Clientset for the given RESTClient. -func New(c restclient.Interface) *Clientset { +func New(c rest.Interface) *Clientset { var cs Clientset cs.CoreClient = internalversioncore.New(c) cs.BatchClient = internalversionbatch.New(c) diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion/BUILD b/federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion/BUILD index c0ed263d6d..c71f24eeed 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion/BUILD +++ b/federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion/BUILD @@ -19,10 +19,10 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/apis/batch:go_default_library", - "//pkg/client/restclient:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion/batch_client.go b/federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion/batch_client.go index 9488779067..613297f3c8 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion/batch_client.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion/batch_client.go @@ -17,18 +17,18 @@ limitations under the License. package internalversion import ( + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) type BatchInterface interface { - RESTClient() restclient.Interface + RESTClient() rest.Interface JobsGetter } // BatchClient is used to interact with features provided by the batch group. type BatchClient struct { - restClient restclient.Interface + restClient rest.Interface } func (c *BatchClient) Jobs(namespace string) JobInterface { @@ -36,12 +36,12 @@ func (c *BatchClient) Jobs(namespace string) JobInterface { } // NewForConfig creates a new BatchClient for the given config. -func NewForConfig(c *restclient.Config) (*BatchClient, error) { +func NewForConfig(c *rest.Config) (*BatchClient, error) { config := *c if err := setConfigDefaults(&config); err != nil { return nil, err } - client, err := restclient.RESTClientFor(&config) + client, err := rest.RESTClientFor(&config) if err != nil { return nil, err } @@ -50,7 +50,7 @@ func NewForConfig(c *restclient.Config) (*BatchClient, error) { // NewForConfigOrDie creates a new BatchClient for the given config and // panics if there is an error in the config. -func NewForConfigOrDie(c *restclient.Config) *BatchClient { +func NewForConfigOrDie(c *rest.Config) *BatchClient { client, err := NewForConfig(c) if err != nil { panic(err) @@ -59,11 +59,11 @@ func NewForConfigOrDie(c *restclient.Config) *BatchClient { } // New creates a new BatchClient for the given RESTClient. -func New(c restclient.Interface) *BatchClient { +func New(c rest.Interface) *BatchClient { return &BatchClient{c} } -func setConfigDefaults(config *restclient.Config) error { +func setConfigDefaults(config *rest.Config) error { // if batch group is not registered, return an error g, err := api.Registry.Group("batch") if err != nil { @@ -71,7 +71,7 @@ func setConfigDefaults(config *restclient.Config) error { } config.APIPath = "/apis" if config.UserAgent == "" { - config.UserAgent = restclient.DefaultKubernetesUserAgent() + config.UserAgent = rest.DefaultKubernetesUserAgent() } if config.GroupVersion == nil || config.GroupVersion.Group != g.GroupVersion.Group { copyGroupVersion := g.GroupVersion @@ -90,7 +90,7 @@ func setConfigDefaults(config *restclient.Config) error { // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *BatchClient) RESTClient() restclient.Interface { +func (c *BatchClient) RESTClient() rest.Interface { if c == nil { return nil } diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion/fake/BUILD b/federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion/fake/BUILD index 748e7e303a..43eafb26dd 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion/fake/BUILD +++ b/federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion/fake/BUILD @@ -19,13 +19,13 @@ go_library( "//federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion:go_default_library", "//pkg/api:go_default_library", "//pkg/apis/batch:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion/fake/fake_batch_client.go b/federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion/fake/fake_batch_client.go index 8484b5a644..a5d989d3ed 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion/fake/fake_batch_client.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion/fake/fake_batch_client.go @@ -17,8 +17,8 @@ limitations under the License. package fake import ( + rest "k8s.io/client-go/rest" internalversion "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion" - restclient "k8s.io/kubernetes/pkg/client/restclient" core "k8s.io/kubernetes/pkg/client/testing/core" ) @@ -32,7 +32,7 @@ func (c *FakeBatch) Jobs(namespace string) internalversion.JobInterface { // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeBatch) RESTClient() restclient.Interface { - var ret *restclient.RESTClient +func (c *FakeBatch) RESTClient() rest.Interface { + var ret *rest.RESTClient return ret } diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion/job.go b/federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion/job.go index 9e24c6436d..53fea7e604 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion/job.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion/job.go @@ -20,9 +20,9 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" batch "k8s.io/kubernetes/pkg/apis/batch" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // JobsGetter has a method to return a JobInterface. @@ -47,7 +47,7 @@ type JobInterface interface { // jobs implements JobInterface type jobs struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/BUILD b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/BUILD index 8b8d6acff7..50951d4a44 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/BUILD +++ b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/BUILD @@ -23,10 +23,10 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/client/restclient:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/configmap.go b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/configmap.go index 5d2f111e4a..cc5accb295 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/configmap.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/configmap.go @@ -20,8 +20,8 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // ConfigMapsGetter has a method to return a ConfigMapInterface. @@ -45,7 +45,7 @@ type ConfigMapInterface interface { // configMaps implements ConfigMapInterface type configMaps struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/core_client.go b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/core_client.go index e4b87f9597..ea41ad9d7c 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/core_client.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/core_client.go @@ -17,12 +17,12 @@ limitations under the License. package internalversion import ( + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) type CoreInterface interface { - RESTClient() restclient.Interface + RESTClient() rest.Interface ConfigMapsGetter EventsGetter NamespacesGetter @@ -32,7 +32,7 @@ type CoreInterface interface { // CoreClient is used to interact with features provided by the group. type CoreClient struct { - restClient restclient.Interface + restClient rest.Interface } func (c *CoreClient) ConfigMaps(namespace string) ConfigMapInterface { @@ -56,12 +56,12 @@ func (c *CoreClient) Services(namespace string) ServiceInterface { } // NewForConfig creates a new CoreClient for the given config. -func NewForConfig(c *restclient.Config) (*CoreClient, error) { +func NewForConfig(c *rest.Config) (*CoreClient, error) { config := *c if err := setConfigDefaults(&config); err != nil { return nil, err } - client, err := restclient.RESTClientFor(&config) + client, err := rest.RESTClientFor(&config) if err != nil { return nil, err } @@ -70,7 +70,7 @@ func NewForConfig(c *restclient.Config) (*CoreClient, error) { // NewForConfigOrDie creates a new CoreClient for the given config and // panics if there is an error in the config. -func NewForConfigOrDie(c *restclient.Config) *CoreClient { +func NewForConfigOrDie(c *rest.Config) *CoreClient { client, err := NewForConfig(c) if err != nil { panic(err) @@ -79,11 +79,11 @@ func NewForConfigOrDie(c *restclient.Config) *CoreClient { } // New creates a new CoreClient for the given RESTClient. -func New(c restclient.Interface) *CoreClient { +func New(c rest.Interface) *CoreClient { return &CoreClient{c} } -func setConfigDefaults(config *restclient.Config) error { +func setConfigDefaults(config *rest.Config) error { // if core group is not registered, return an error g, err := api.Registry.Group("") if err != nil { @@ -91,7 +91,7 @@ func setConfigDefaults(config *restclient.Config) error { } config.APIPath = "/api" if config.UserAgent == "" { - config.UserAgent = restclient.DefaultKubernetesUserAgent() + config.UserAgent = rest.DefaultKubernetesUserAgent() } if config.GroupVersion == nil || config.GroupVersion.Group != g.GroupVersion.Group { copyGroupVersion := g.GroupVersion @@ -110,7 +110,7 @@ func setConfigDefaults(config *restclient.Config) error { // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *CoreClient) RESTClient() restclient.Interface { +func (c *CoreClient) RESTClient() rest.Interface { if c == nil { return nil } diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/event.go b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/event.go index d8f20e2710..bbb6a39843 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/event.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/event.go @@ -20,8 +20,8 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // EventsGetter has a method to return a EventInterface. @@ -45,7 +45,7 @@ type EventInterface interface { // events implements EventInterface type events struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/BUILD b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/BUILD index 6c73f3e49f..78547efd51 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/BUILD +++ b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/BUILD @@ -23,13 +23,13 @@ go_library( deps = [ "//federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion:go_default_library", "//pkg/api:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/fake_core_client.go b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/fake_core_client.go index 31264b0fd3..a19f8d86d2 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/fake_core_client.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/fake_core_client.go @@ -17,8 +17,8 @@ limitations under the License. package fake import ( + rest "k8s.io/client-go/rest" internalversion "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion" - restclient "k8s.io/kubernetes/pkg/client/restclient" core "k8s.io/kubernetes/pkg/client/testing/core" ) @@ -48,7 +48,7 @@ func (c *FakeCore) Services(namespace string) internalversion.ServiceInterface { // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeCore) RESTClient() restclient.Interface { - var ret *restclient.RESTClient +func (c *FakeCore) RESTClient() rest.Interface { + var ret *rest.RESTClient return ret } diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/namespace.go b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/namespace.go index 3c33dc4457..7cec0560ca 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/namespace.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/namespace.go @@ -20,8 +20,8 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // NamespacesGetter has a method to return a NamespaceInterface. @@ -46,7 +46,7 @@ type NamespaceInterface interface { // namespaces implements NamespaceInterface type namespaces struct { - client restclient.Interface + client rest.Interface } // newNamespaces returns a Namespaces diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/secret.go b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/secret.go index 5707ff1f70..29902d461f 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/secret.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/secret.go @@ -20,8 +20,8 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // SecretsGetter has a method to return a SecretInterface. @@ -45,7 +45,7 @@ type SecretInterface interface { // secrets implements SecretInterface type secrets struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/service.go b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/service.go index abfe3bea06..c83fbd95eb 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/service.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/service.go @@ -20,8 +20,8 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // ServicesGetter has a method to return a ServiceInterface. @@ -46,7 +46,7 @@ type ServiceInterface interface { // services implements ServiceInterface type services struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/BUILD b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/BUILD index c3f1c2ae64..bf69571a10 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/BUILD +++ b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/BUILD @@ -22,10 +22,10 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/apis/extensions:go_default_library", - "//pkg/client/restclient:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/daemonset.go b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/daemonset.go index 98f6c2e327..c6ab08f065 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/daemonset.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/daemonset.go @@ -20,9 +20,9 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" extensions "k8s.io/kubernetes/pkg/apis/extensions" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // DaemonSetsGetter has a method to return a DaemonSetInterface. @@ -47,7 +47,7 @@ type DaemonSetInterface interface { // daemonSets implements DaemonSetInterface type daemonSets struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/deployment.go b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/deployment.go index 0426b40c63..d48ea58051 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/deployment.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/deployment.go @@ -20,9 +20,9 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" extensions "k8s.io/kubernetes/pkg/apis/extensions" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // DeploymentsGetter has a method to return a DeploymentInterface. @@ -47,7 +47,7 @@ type DeploymentInterface interface { // deployments implements DeploymentInterface type deployments struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/extensions_client.go b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/extensions_client.go index 86065d6c18..9f37c172c8 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/extensions_client.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/extensions_client.go @@ -17,12 +17,12 @@ limitations under the License. package internalversion import ( + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) type ExtensionsInterface interface { - RESTClient() restclient.Interface + RESTClient() rest.Interface DaemonSetsGetter DeploymentsGetter IngressesGetter @@ -31,7 +31,7 @@ type ExtensionsInterface interface { // ExtensionsClient is used to interact with features provided by the extensions group. type ExtensionsClient struct { - restClient restclient.Interface + restClient rest.Interface } func (c *ExtensionsClient) DaemonSets(namespace string) DaemonSetInterface { @@ -51,12 +51,12 @@ func (c *ExtensionsClient) ReplicaSets(namespace string) ReplicaSetInterface { } // NewForConfig creates a new ExtensionsClient for the given config. -func NewForConfig(c *restclient.Config) (*ExtensionsClient, error) { +func NewForConfig(c *rest.Config) (*ExtensionsClient, error) { config := *c if err := setConfigDefaults(&config); err != nil { return nil, err } - client, err := restclient.RESTClientFor(&config) + client, err := rest.RESTClientFor(&config) if err != nil { return nil, err } @@ -65,7 +65,7 @@ func NewForConfig(c *restclient.Config) (*ExtensionsClient, error) { // NewForConfigOrDie creates a new ExtensionsClient for the given config and // panics if there is an error in the config. -func NewForConfigOrDie(c *restclient.Config) *ExtensionsClient { +func NewForConfigOrDie(c *rest.Config) *ExtensionsClient { client, err := NewForConfig(c) if err != nil { panic(err) @@ -74,11 +74,11 @@ func NewForConfigOrDie(c *restclient.Config) *ExtensionsClient { } // New creates a new ExtensionsClient for the given RESTClient. -func New(c restclient.Interface) *ExtensionsClient { +func New(c rest.Interface) *ExtensionsClient { return &ExtensionsClient{c} } -func setConfigDefaults(config *restclient.Config) error { +func setConfigDefaults(config *rest.Config) error { // if extensions group is not registered, return an error g, err := api.Registry.Group("extensions") if err != nil { @@ -86,7 +86,7 @@ func setConfigDefaults(config *restclient.Config) error { } config.APIPath = "/apis" if config.UserAgent == "" { - config.UserAgent = restclient.DefaultKubernetesUserAgent() + config.UserAgent = rest.DefaultKubernetesUserAgent() } if config.GroupVersion == nil || config.GroupVersion.Group != g.GroupVersion.Group { copyGroupVersion := g.GroupVersion @@ -105,7 +105,7 @@ func setConfigDefaults(config *restclient.Config) error { // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *ExtensionsClient) RESTClient() restclient.Interface { +func (c *ExtensionsClient) RESTClient() rest.Interface { if c == nil { return nil } diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/fake/BUILD b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/fake/BUILD index 1ba5f3a94b..9ca8312009 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/fake/BUILD +++ b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/fake/BUILD @@ -22,13 +22,13 @@ go_library( "//federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion:go_default_library", "//pkg/api:go_default_library", "//pkg/apis/extensions:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/fake/fake_extensions_client.go b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/fake/fake_extensions_client.go index 2267ec5cd2..23ac7065c3 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/fake/fake_extensions_client.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/fake/fake_extensions_client.go @@ -17,8 +17,8 @@ limitations under the License. package fake import ( + rest "k8s.io/client-go/rest" internalversion "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion" - restclient "k8s.io/kubernetes/pkg/client/restclient" core "k8s.io/kubernetes/pkg/client/testing/core" ) @@ -44,7 +44,7 @@ func (c *FakeExtensions) ReplicaSets(namespace string) internalversion.ReplicaSe // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeExtensions) RESTClient() restclient.Interface { - var ret *restclient.RESTClient +func (c *FakeExtensions) RESTClient() rest.Interface { + var ret *rest.RESTClient return ret } diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/ingress.go b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/ingress.go index bd99ec11ea..b026e2e33a 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/ingress.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/ingress.go @@ -20,9 +20,9 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" extensions "k8s.io/kubernetes/pkg/apis/extensions" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // IngressesGetter has a method to return a IngressInterface. @@ -47,7 +47,7 @@ type IngressInterface interface { // ingresses implements IngressInterface type ingresses struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/replicaset.go b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/replicaset.go index 1410821881..5de36beb0f 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/replicaset.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/replicaset.go @@ -20,9 +20,9 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" extensions "k8s.io/kubernetes/pkg/apis/extensions" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // ReplicaSetsGetter has a method to return a ReplicaSetInterface. @@ -47,7 +47,7 @@ type ReplicaSetInterface interface { // replicaSets implements ReplicaSetInterface type replicaSets struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/BUILD b/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/BUILD index 25fb103f14..2a4c6bcad4 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/BUILD +++ b/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/BUILD @@ -19,10 +19,10 @@ go_library( deps = [ "//federation/apis/federation:go_default_library", "//pkg/api:go_default_library", - "//pkg/client/restclient:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/cluster.go b/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/cluster.go index 5c5359acf9..8530d86751 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/cluster.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/cluster.go @@ -20,9 +20,9 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" federation "k8s.io/kubernetes/federation/apis/federation" api "k8s.io/kubernetes/pkg/api" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // ClustersGetter has a method to return a ClusterInterface. @@ -47,7 +47,7 @@ type ClusterInterface interface { // clusters implements ClusterInterface type clusters struct { - client restclient.Interface + client rest.Interface } // newClusters returns a Clusters diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/fake/BUILD b/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/fake/BUILD index c23291596d..61e1ef15b2 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/fake/BUILD +++ b/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/fake/BUILD @@ -19,13 +19,13 @@ go_library( "//federation/apis/federation:go_default_library", "//federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion:go_default_library", "//pkg/api:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/fake/fake_federation_client.go b/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/fake/fake_federation_client.go index 6e96cdf911..0bd29d4398 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/fake/fake_federation_client.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/fake/fake_federation_client.go @@ -17,8 +17,8 @@ limitations under the License. package fake import ( + rest "k8s.io/client-go/rest" internalversion "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion" - restclient "k8s.io/kubernetes/pkg/client/restclient" core "k8s.io/kubernetes/pkg/client/testing/core" ) @@ -32,7 +32,7 @@ func (c *FakeFederation) Clusters() internalversion.ClusterInterface { // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeFederation) RESTClient() restclient.Interface { - var ret *restclient.RESTClient +func (c *FakeFederation) RESTClient() rest.Interface { + var ret *rest.RESTClient return ret } diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/federation_client.go b/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/federation_client.go index 17367d1244..e9108f0f7f 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/federation_client.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/federation_client.go @@ -17,18 +17,18 @@ limitations under the License. package internalversion import ( + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) type FederationInterface interface { - RESTClient() restclient.Interface + RESTClient() rest.Interface ClustersGetter } // FederationClient is used to interact with features provided by the federation group. type FederationClient struct { - restClient restclient.Interface + restClient rest.Interface } func (c *FederationClient) Clusters() ClusterInterface { @@ -36,12 +36,12 @@ func (c *FederationClient) Clusters() ClusterInterface { } // NewForConfig creates a new FederationClient for the given config. -func NewForConfig(c *restclient.Config) (*FederationClient, error) { +func NewForConfig(c *rest.Config) (*FederationClient, error) { config := *c if err := setConfigDefaults(&config); err != nil { return nil, err } - client, err := restclient.RESTClientFor(&config) + client, err := rest.RESTClientFor(&config) if err != nil { return nil, err } @@ -50,7 +50,7 @@ func NewForConfig(c *restclient.Config) (*FederationClient, error) { // NewForConfigOrDie creates a new FederationClient for the given config and // panics if there is an error in the config. -func NewForConfigOrDie(c *restclient.Config) *FederationClient { +func NewForConfigOrDie(c *rest.Config) *FederationClient { client, err := NewForConfig(c) if err != nil { panic(err) @@ -59,11 +59,11 @@ func NewForConfigOrDie(c *restclient.Config) *FederationClient { } // New creates a new FederationClient for the given RESTClient. -func New(c restclient.Interface) *FederationClient { +func New(c rest.Interface) *FederationClient { return &FederationClient{c} } -func setConfigDefaults(config *restclient.Config) error { +func setConfigDefaults(config *rest.Config) error { // if federation group is not registered, return an error g, err := api.Registry.Group("federation") if err != nil { @@ -71,7 +71,7 @@ func setConfigDefaults(config *restclient.Config) error { } config.APIPath = "/apis" if config.UserAgent == "" { - config.UserAgent = restclient.DefaultKubernetesUserAgent() + config.UserAgent = rest.DefaultKubernetesUserAgent() } if config.GroupVersion == nil || config.GroupVersion.Group != g.GroupVersion.Group { copyGroupVersion := g.GroupVersion @@ -90,7 +90,7 @@ func setConfigDefaults(config *restclient.Config) error { // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FederationClient) RESTClient() restclient.Interface { +func (c *FederationClient) RESTClient() rest.Interface { if c == nil { return nil } diff --git a/federation/cmd/federation-controller-manager/app/BUILD b/federation/cmd/federation-controller-manager/app/BUILD index 53f1f8896e..25597707e3 100644 --- a/federation/cmd/federation-controller-manager/app/BUILD +++ b/federation/cmd/federation-controller-manager/app/BUILD @@ -32,7 +32,6 @@ go_library( "//federation/pkg/federation-controller/secret:go_default_library", "//federation/pkg/federation-controller/service:go_default_library", "//federation/pkg/federation-controller/util:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/typed/discovery:go_default_library", "//pkg/client/unversioned/clientcmd:go_default_library", "//pkg/util/config:go_default_library", diff --git a/federation/pkg/federation-controller/cluster/BUILD b/federation/pkg/federation-controller/cluster/BUILD index f294ff6f7b..bb27fe5ce7 100644 --- a/federation/pkg/federation-controller/cluster/BUILD +++ b/federation/pkg/federation-controller/cluster/BUILD @@ -25,7 +25,6 @@ go_library( "//pkg/api/v1:go_default_library", "//pkg/client/cache:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/typed/discovery:go_default_library", "//pkg/controller:go_default_library", "//vendor:github.com/golang/glog", @@ -49,7 +48,6 @@ go_test( "//federation/pkg/federation-controller/util:go_default_library", "//pkg/api/testapi:go_default_library", "//pkg/api/v1:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/unversioned/clientcmd:go_default_library", "//pkg/util/uuid:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", diff --git a/federation/pkg/federation-controller/service/BUILD b/federation/pkg/federation-controller/service/BUILD index 66546b6121..ec67967a13 100644 --- a/federation/pkg/federation-controller/service/BUILD +++ b/federation/pkg/federation-controller/service/BUILD @@ -32,7 +32,6 @@ go_library( "//pkg/client/cache:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", "//pkg/client/record:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/controller:go_default_library", "//pkg/util/workqueue:go_default_library", "//vendor:github.com/golang/glog", diff --git a/federation/pkg/federation-controller/util/BUILD b/federation/pkg/federation-controller/util/BUILD index e2a8b023b4..c13628b29f 100644 --- a/federation/pkg/federation-controller/util/BUILD +++ b/federation/pkg/federation-controller/util/BUILD @@ -33,7 +33,6 @@ go_library( "//pkg/client/cache:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/unversioned/clientcmd:go_default_library", "//pkg/controller/deployment/util:go_default_library", "//vendor:github.com/golang/glog", diff --git a/federation/pkg/kubefed/testing/BUILD b/federation/pkg/kubefed/testing/BUILD index e60a19adf7..b7286b3123 100644 --- a/federation/pkg/kubefed/testing/BUILD +++ b/federation/pkg/kubefed/testing/BUILD @@ -15,7 +15,6 @@ go_library( "//federation/client/clientset_generated/federation_clientset:go_default_library", "//federation/pkg/kubefed/util:go_default_library", "//pkg/api:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/unversioned/clientcmd:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", diff --git a/pkg/BUILD b/pkg/BUILD index ec71dac3bc..917e6bbb10 100644 --- a/pkg/BUILD +++ b/pkg/BUILD @@ -69,7 +69,7 @@ filegroup( "//pkg/client/listers/storage/v1beta1:all-srcs", "//pkg/client/metrics:all-srcs", "//pkg/client/record:all-srcs", - "//pkg/client/restclient:all-srcs", + "//pkg/client/restclient/fake:all-srcs", "//pkg/client/retry:all-srcs", "//pkg/client/testdata:all-srcs", "//pkg/client/testing/cache:all-srcs", diff --git a/pkg/client/cache/BUILD b/pkg/client/cache/BUILD index 0663658c90..18e535f506 100644 --- a/pkg/client/cache/BUILD +++ b/pkg/client/cache/BUILD @@ -43,7 +43,6 @@ go_library( "//pkg/apis/rbac:go_default_library", "//pkg/apis/storage:go_default_library", "//pkg/apis/storage/v1beta1:go_default_library", - "//pkg/client/restclient:go_default_library", "//vendor:github.com/golang/glog", "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/api/meta", @@ -85,7 +84,6 @@ go_test( "//pkg/api/v1:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/testing/cache:go_default_library", "//pkg/util/testing:go_default_library", "//vendor:github.com/google/gofuzz", diff --git a/pkg/client/clientset_generated/clientset/BUILD b/pkg/client/clientset_generated/clientset/BUILD index 94fe428f3b..9675803ac4 100644 --- a/pkg/client/clientset_generated/clientset/BUILD +++ b/pkg/client/clientset_generated/clientset/BUILD @@ -41,11 +41,11 @@ go_library( "//pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1:go_default_library", "//pkg/client/clientset_generated/clientset/typed/rbac/v1beta1:go_default_library", "//pkg/client/clientset_generated/clientset/typed/storage/v1beta1:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/typed/discovery:go_default_library", "//plugin/pkg/client/auth:go_default_library", "//vendor:github.com/golang/glog", "//vendor:k8s.io/client-go/pkg/util/flowcontrol", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/pkg/client/clientset_generated/clientset/clientset.go b/pkg/client/clientset_generated/clientset/clientset.go index 0647ac733c..b3a6a4ba8d 100644 --- a/pkg/client/clientset_generated/clientset/clientset.go +++ b/pkg/client/clientset_generated/clientset/clientset.go @@ -19,6 +19,7 @@ package clientset import ( "github.com/golang/glog" "k8s.io/client-go/pkg/util/flowcontrol" + rest "k8s.io/client-go/rest" v1beta1apps "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/apps/v1beta1" v1beta1authentication "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1" v1beta1authorization "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1" @@ -32,7 +33,6 @@ import ( v1alpha1rbac "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1" v1beta1rbac "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1" v1beta1storage "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/storage/v1beta1" - restclient "k8s.io/kubernetes/pkg/client/restclient" discovery "k8s.io/kubernetes/pkg/client/typed/discovery" _ "k8s.io/kubernetes/plugin/pkg/client/auth" ) @@ -309,7 +309,7 @@ func (c *Clientset) Discovery() discovery.DiscoveryInterface { } // NewForConfig creates a new Clientset for the given config. -func NewForConfig(c *restclient.Config) (*Clientset, error) { +func NewForConfig(c *rest.Config) (*Clientset, error) { configShallowCopy := *c if configShallowCopy.RateLimiter == nil && configShallowCopy.QPS > 0 { configShallowCopy.RateLimiter = flowcontrol.NewTokenBucketRateLimiter(configShallowCopy.QPS, configShallowCopy.Burst) @@ -379,7 +379,7 @@ func NewForConfig(c *restclient.Config) (*Clientset, error) { // NewForConfigOrDie creates a new Clientset for the given config and // panics if there is an error in the config. -func NewForConfigOrDie(c *restclient.Config) *Clientset { +func NewForConfigOrDie(c *rest.Config) *Clientset { var cs Clientset cs.CoreV1Client = v1core.NewForConfigOrDie(c) cs.AppsV1beta1Client = v1beta1apps.NewForConfigOrDie(c) @@ -400,7 +400,7 @@ func NewForConfigOrDie(c *restclient.Config) *Clientset { } // New creates a new Clientset for the given RESTClient. -func New(c restclient.Interface) *Clientset { +func New(c rest.Interface) *Clientset { var cs Clientset cs.CoreV1Client = v1core.New(c) cs.AppsV1beta1Client = v1beta1apps.New(c) diff --git a/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/BUILD b/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/BUILD index 1b95744f46..60366d1fe4 100644 --- a/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/BUILD +++ b/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/BUILD @@ -20,12 +20,12 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apis/apps/v1beta1:go_default_library", - "//pkg/client/restclient:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/apps_client.go b/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/apps_client.go index 535dae43d9..e84cddeab2 100644 --- a/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/apps_client.go +++ b/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/apps_client.go @@ -20,18 +20,18 @@ import ( fmt "fmt" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) type AppsV1beta1Interface interface { - RESTClient() restclient.Interface + RESTClient() rest.Interface StatefulSetsGetter } // AppsV1beta1Client is used to interact with features provided by the apps group. type AppsV1beta1Client struct { - restClient restclient.Interface + restClient rest.Interface } func (c *AppsV1beta1Client) StatefulSets(namespace string) StatefulSetInterface { @@ -39,12 +39,12 @@ func (c *AppsV1beta1Client) StatefulSets(namespace string) StatefulSetInterface } // NewForConfig creates a new AppsV1beta1Client for the given config. -func NewForConfig(c *restclient.Config) (*AppsV1beta1Client, error) { +func NewForConfig(c *rest.Config) (*AppsV1beta1Client, error) { config := *c if err := setConfigDefaults(&config); err != nil { return nil, err } - client, err := restclient.RESTClientFor(&config) + client, err := rest.RESTClientFor(&config) if err != nil { return nil, err } @@ -53,7 +53,7 @@ func NewForConfig(c *restclient.Config) (*AppsV1beta1Client, error) { // NewForConfigOrDie creates a new AppsV1beta1Client for the given config and // panics if there is an error in the config. -func NewForConfigOrDie(c *restclient.Config) *AppsV1beta1Client { +func NewForConfigOrDie(c *rest.Config) *AppsV1beta1Client { client, err := NewForConfig(c) if err != nil { panic(err) @@ -62,11 +62,11 @@ func NewForConfigOrDie(c *restclient.Config) *AppsV1beta1Client { } // New creates a new AppsV1beta1Client for the given RESTClient. -func New(c restclient.Interface) *AppsV1beta1Client { +func New(c rest.Interface) *AppsV1beta1Client { return &AppsV1beta1Client{c} } -func setConfigDefaults(config *restclient.Config) error { +func setConfigDefaults(config *rest.Config) error { gv, err := schema.ParseGroupVersion("apps/v1beta1") if err != nil { return err @@ -77,7 +77,7 @@ func setConfigDefaults(config *restclient.Config) error { } config.APIPath = "/apis" if config.UserAgent == "" { - config.UserAgent = restclient.DefaultKubernetesUserAgent() + config.UserAgent = rest.DefaultKubernetesUserAgent() } copyGroupVersion := gv config.GroupVersion = ©GroupVersion @@ -89,7 +89,7 @@ func setConfigDefaults(config *restclient.Config) error { // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *AppsV1beta1Client) RESTClient() restclient.Interface { +func (c *AppsV1beta1Client) RESTClient() rest.Interface { if c == nil { return nil } diff --git a/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/fake/BUILD b/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/fake/BUILD index 7b84e8295d..400c7fa31d 100644 --- a/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/fake/BUILD +++ b/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/fake/BUILD @@ -19,13 +19,13 @@ go_library( "//pkg/api/v1:go_default_library", "//pkg/apis/apps/v1beta1:go_default_library", "//pkg/client/clientset_generated/clientset/typed/apps/v1beta1:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/fake/fake_apps_client.go b/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/fake/fake_apps_client.go index 815cbc8b92..ae22f079ba 100644 --- a/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/fake/fake_apps_client.go +++ b/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/fake/fake_apps_client.go @@ -17,8 +17,8 @@ limitations under the License. package fake import ( + rest "k8s.io/client-go/rest" v1beta1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/apps/v1beta1" - restclient "k8s.io/kubernetes/pkg/client/restclient" core "k8s.io/kubernetes/pkg/client/testing/core" ) @@ -32,7 +32,7 @@ func (c *FakeAppsV1beta1) StatefulSets(namespace string) v1beta1.StatefulSetInte // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeAppsV1beta1) RESTClient() restclient.Interface { - var ret *restclient.RESTClient +func (c *FakeAppsV1beta1) RESTClient() rest.Interface { + var ret *rest.RESTClient return ret } diff --git a/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/statefulset.go b/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/statefulset.go index 88e7ff9f04..2278785716 100644 --- a/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/statefulset.go +++ b/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/statefulset.go @@ -20,10 +20,10 @@ import ( meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" v1beta1 "k8s.io/kubernetes/pkg/apis/apps/v1beta1" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // StatefulSetsGetter has a method to return a StatefulSetInterface. @@ -48,7 +48,7 @@ type StatefulSetInterface interface { // statefulSets implements StatefulSetInterface type statefulSets struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1/BUILD b/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1/BUILD index 96b33eecf8..06e0edd018 100644 --- a/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1/BUILD +++ b/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1/BUILD @@ -20,9 +20,9 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/apis/authentication/v1beta1:go_default_library", - "//pkg/client/restclient:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1/authentication_client.go b/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1/authentication_client.go index bb60779a70..b4107ae629 100644 --- a/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1/authentication_client.go +++ b/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1/authentication_client.go @@ -20,18 +20,18 @@ import ( fmt "fmt" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) type AuthenticationV1beta1Interface interface { - RESTClient() restclient.Interface + RESTClient() rest.Interface TokenReviewsGetter } // AuthenticationV1beta1Client is used to interact with features provided by the authentication.k8s.io group. type AuthenticationV1beta1Client struct { - restClient restclient.Interface + restClient rest.Interface } func (c *AuthenticationV1beta1Client) TokenReviews() TokenReviewInterface { @@ -39,12 +39,12 @@ func (c *AuthenticationV1beta1Client) TokenReviews() TokenReviewInterface { } // NewForConfig creates a new AuthenticationV1beta1Client for the given config. -func NewForConfig(c *restclient.Config) (*AuthenticationV1beta1Client, error) { +func NewForConfig(c *rest.Config) (*AuthenticationV1beta1Client, error) { config := *c if err := setConfigDefaults(&config); err != nil { return nil, err } - client, err := restclient.RESTClientFor(&config) + client, err := rest.RESTClientFor(&config) if err != nil { return nil, err } @@ -53,7 +53,7 @@ func NewForConfig(c *restclient.Config) (*AuthenticationV1beta1Client, error) { // NewForConfigOrDie creates a new AuthenticationV1beta1Client for the given config and // panics if there is an error in the config. -func NewForConfigOrDie(c *restclient.Config) *AuthenticationV1beta1Client { +func NewForConfigOrDie(c *rest.Config) *AuthenticationV1beta1Client { client, err := NewForConfig(c) if err != nil { panic(err) @@ -62,11 +62,11 @@ func NewForConfigOrDie(c *restclient.Config) *AuthenticationV1beta1Client { } // New creates a new AuthenticationV1beta1Client for the given RESTClient. -func New(c restclient.Interface) *AuthenticationV1beta1Client { +func New(c rest.Interface) *AuthenticationV1beta1Client { return &AuthenticationV1beta1Client{c} } -func setConfigDefaults(config *restclient.Config) error { +func setConfigDefaults(config *rest.Config) error { gv, err := schema.ParseGroupVersion("authentication.k8s.io/v1beta1") if err != nil { return err @@ -77,7 +77,7 @@ func setConfigDefaults(config *restclient.Config) error { } config.APIPath = "/apis" if config.UserAgent == "" { - config.UserAgent = restclient.DefaultKubernetesUserAgent() + config.UserAgent = rest.DefaultKubernetesUserAgent() } copyGroupVersion := gv config.GroupVersion = ©GroupVersion @@ -89,7 +89,7 @@ func setConfigDefaults(config *restclient.Config) error { // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *AuthenticationV1beta1Client) RESTClient() restclient.Interface { +func (c *AuthenticationV1beta1Client) RESTClient() rest.Interface { if c == nil { return nil } diff --git a/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1/fake/BUILD b/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1/fake/BUILD index 241141bb1f..02d4e95b34 100644 --- a/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1/fake/BUILD +++ b/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1/fake/BUILD @@ -19,8 +19,8 @@ go_library( deps = [ "//pkg/apis/authentication/v1beta1:go_default_library", "//pkg/client/clientset_generated/clientset/typed/authentication/v1beta1:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/testing/core:go_default_library", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1/fake/fake_authentication_client.go b/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1/fake/fake_authentication_client.go index 61ed5c9f46..460d7dd8eb 100644 --- a/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1/fake/fake_authentication_client.go +++ b/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1/fake/fake_authentication_client.go @@ -17,8 +17,8 @@ limitations under the License. package fake import ( + rest "k8s.io/client-go/rest" v1beta1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1" - restclient "k8s.io/kubernetes/pkg/client/restclient" core "k8s.io/kubernetes/pkg/client/testing/core" ) @@ -32,7 +32,7 @@ func (c *FakeAuthenticationV1beta1) TokenReviews() v1beta1.TokenReviewInterface // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeAuthenticationV1beta1) RESTClient() restclient.Interface { - var ret *restclient.RESTClient +func (c *FakeAuthenticationV1beta1) RESTClient() rest.Interface { + var ret *rest.RESTClient return ret } diff --git a/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1/tokenreview.go b/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1/tokenreview.go index 584713f5f3..7f9f1e9fa0 100644 --- a/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1/tokenreview.go +++ b/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1/tokenreview.go @@ -17,7 +17,7 @@ limitations under the License. package v1beta1 import ( - restclient "k8s.io/kubernetes/pkg/client/restclient" + rest "k8s.io/client-go/rest" ) // TokenReviewsGetter has a method to return a TokenReviewInterface. @@ -33,7 +33,7 @@ type TokenReviewInterface interface { // tokenReviews implements TokenReviewInterface type tokenReviews struct { - client restclient.Interface + client rest.Interface } // newTokenReviews returns a TokenReviews diff --git a/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/BUILD b/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/BUILD index 9b89c253dc..17adcb15c3 100644 --- a/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/BUILD +++ b/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/BUILD @@ -24,9 +24,9 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/apis/authorization/v1beta1:go_default_library", - "//pkg/client/restclient:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/authorization_client.go b/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/authorization_client.go index 0768137d01..57c8cdb460 100644 --- a/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/authorization_client.go +++ b/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/authorization_client.go @@ -20,12 +20,12 @@ import ( fmt "fmt" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) type AuthorizationV1beta1Interface interface { - RESTClient() restclient.Interface + RESTClient() rest.Interface LocalSubjectAccessReviewsGetter SelfSubjectAccessReviewsGetter SubjectAccessReviewsGetter @@ -33,7 +33,7 @@ type AuthorizationV1beta1Interface interface { // AuthorizationV1beta1Client is used to interact with features provided by the authorization.k8s.io group. type AuthorizationV1beta1Client struct { - restClient restclient.Interface + restClient rest.Interface } func (c *AuthorizationV1beta1Client) LocalSubjectAccessReviews(namespace string) LocalSubjectAccessReviewInterface { @@ -49,12 +49,12 @@ func (c *AuthorizationV1beta1Client) SubjectAccessReviews() SubjectAccessReviewI } // NewForConfig creates a new AuthorizationV1beta1Client for the given config. -func NewForConfig(c *restclient.Config) (*AuthorizationV1beta1Client, error) { +func NewForConfig(c *rest.Config) (*AuthorizationV1beta1Client, error) { config := *c if err := setConfigDefaults(&config); err != nil { return nil, err } - client, err := restclient.RESTClientFor(&config) + client, err := rest.RESTClientFor(&config) if err != nil { return nil, err } @@ -63,7 +63,7 @@ func NewForConfig(c *restclient.Config) (*AuthorizationV1beta1Client, error) { // NewForConfigOrDie creates a new AuthorizationV1beta1Client for the given config and // panics if there is an error in the config. -func NewForConfigOrDie(c *restclient.Config) *AuthorizationV1beta1Client { +func NewForConfigOrDie(c *rest.Config) *AuthorizationV1beta1Client { client, err := NewForConfig(c) if err != nil { panic(err) @@ -72,11 +72,11 @@ func NewForConfigOrDie(c *restclient.Config) *AuthorizationV1beta1Client { } // New creates a new AuthorizationV1beta1Client for the given RESTClient. -func New(c restclient.Interface) *AuthorizationV1beta1Client { +func New(c rest.Interface) *AuthorizationV1beta1Client { return &AuthorizationV1beta1Client{c} } -func setConfigDefaults(config *restclient.Config) error { +func setConfigDefaults(config *rest.Config) error { gv, err := schema.ParseGroupVersion("authorization.k8s.io/v1beta1") if err != nil { return err @@ -87,7 +87,7 @@ func setConfigDefaults(config *restclient.Config) error { } config.APIPath = "/apis" if config.UserAgent == "" { - config.UserAgent = restclient.DefaultKubernetesUserAgent() + config.UserAgent = rest.DefaultKubernetesUserAgent() } copyGroupVersion := gv config.GroupVersion = ©GroupVersion @@ -99,7 +99,7 @@ func setConfigDefaults(config *restclient.Config) error { // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *AuthorizationV1beta1Client) RESTClient() restclient.Interface { +func (c *AuthorizationV1beta1Client) RESTClient() rest.Interface { if c == nil { return nil } diff --git a/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/fake/BUILD b/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/fake/BUILD index 684ecb635b..7c92cf62d4 100644 --- a/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/fake/BUILD +++ b/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/fake/BUILD @@ -24,8 +24,8 @@ go_library( deps = [ "//pkg/apis/authorization/v1beta1:go_default_library", "//pkg/client/clientset_generated/clientset/typed/authorization/v1beta1:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/testing/core:go_default_library", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/fake/fake_authorization_client.go b/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/fake/fake_authorization_client.go index b15f516114..b528ba0402 100644 --- a/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/fake/fake_authorization_client.go +++ b/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/fake/fake_authorization_client.go @@ -17,8 +17,8 @@ limitations under the License. package fake import ( + rest "k8s.io/client-go/rest" v1beta1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1" - restclient "k8s.io/kubernetes/pkg/client/restclient" core "k8s.io/kubernetes/pkg/client/testing/core" ) @@ -40,7 +40,7 @@ func (c *FakeAuthorizationV1beta1) SubjectAccessReviews() v1beta1.SubjectAccessR // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeAuthorizationV1beta1) RESTClient() restclient.Interface { - var ret *restclient.RESTClient +func (c *FakeAuthorizationV1beta1) RESTClient() rest.Interface { + var ret *rest.RESTClient return ret } diff --git a/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/localsubjectaccessreview.go b/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/localsubjectaccessreview.go index f9209a94fb..9b8e103419 100644 --- a/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/localsubjectaccessreview.go +++ b/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/localsubjectaccessreview.go @@ -17,7 +17,7 @@ limitations under the License. package v1beta1 import ( - restclient "k8s.io/kubernetes/pkg/client/restclient" + rest "k8s.io/client-go/rest" ) // LocalSubjectAccessReviewsGetter has a method to return a LocalSubjectAccessReviewInterface. @@ -33,7 +33,7 @@ type LocalSubjectAccessReviewInterface interface { // localSubjectAccessReviews implements LocalSubjectAccessReviewInterface type localSubjectAccessReviews struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/selfsubjectaccessreview.go b/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/selfsubjectaccessreview.go index 571bb29402..1ef3e49afe 100644 --- a/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/selfsubjectaccessreview.go +++ b/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/selfsubjectaccessreview.go @@ -17,7 +17,7 @@ limitations under the License. package v1beta1 import ( - restclient "k8s.io/kubernetes/pkg/client/restclient" + rest "k8s.io/client-go/rest" ) // SelfSubjectAccessReviewsGetter has a method to return a SelfSubjectAccessReviewInterface. @@ -33,7 +33,7 @@ type SelfSubjectAccessReviewInterface interface { // selfSubjectAccessReviews implements SelfSubjectAccessReviewInterface type selfSubjectAccessReviews struct { - client restclient.Interface + client rest.Interface } // newSelfSubjectAccessReviews returns a SelfSubjectAccessReviews diff --git a/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/subjectaccessreview.go b/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/subjectaccessreview.go index 22e7ea0026..cd60e9df6b 100644 --- a/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/subjectaccessreview.go +++ b/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/subjectaccessreview.go @@ -17,7 +17,7 @@ limitations under the License. package v1beta1 import ( - restclient "k8s.io/kubernetes/pkg/client/restclient" + rest "k8s.io/client-go/rest" ) // SubjectAccessReviewsGetter has a method to return a SubjectAccessReviewInterface. @@ -33,7 +33,7 @@ type SubjectAccessReviewInterface interface { // subjectAccessReviews implements SubjectAccessReviewInterface type subjectAccessReviews struct { - client restclient.Interface + client rest.Interface } // newSubjectAccessReviews returns a SubjectAccessReviews diff --git a/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/BUILD b/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/BUILD index 4c1297a17d..f30f36bd9e 100644 --- a/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/BUILD +++ b/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/BUILD @@ -20,12 +20,12 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apis/autoscaling/v1:go_default_library", - "//pkg/client/restclient:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/autoscaling_client.go b/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/autoscaling_client.go index d0aaf869b7..0b50198209 100644 --- a/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/autoscaling_client.go +++ b/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/autoscaling_client.go @@ -20,18 +20,18 @@ import ( fmt "fmt" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) type AutoscalingV1Interface interface { - RESTClient() restclient.Interface + RESTClient() rest.Interface HorizontalPodAutoscalersGetter } // AutoscalingV1Client is used to interact with features provided by the autoscaling group. type AutoscalingV1Client struct { - restClient restclient.Interface + restClient rest.Interface } func (c *AutoscalingV1Client) HorizontalPodAutoscalers(namespace string) HorizontalPodAutoscalerInterface { @@ -39,12 +39,12 @@ func (c *AutoscalingV1Client) HorizontalPodAutoscalers(namespace string) Horizon } // NewForConfig creates a new AutoscalingV1Client for the given config. -func NewForConfig(c *restclient.Config) (*AutoscalingV1Client, error) { +func NewForConfig(c *rest.Config) (*AutoscalingV1Client, error) { config := *c if err := setConfigDefaults(&config); err != nil { return nil, err } - client, err := restclient.RESTClientFor(&config) + client, err := rest.RESTClientFor(&config) if err != nil { return nil, err } @@ -53,7 +53,7 @@ func NewForConfig(c *restclient.Config) (*AutoscalingV1Client, error) { // NewForConfigOrDie creates a new AutoscalingV1Client for the given config and // panics if there is an error in the config. -func NewForConfigOrDie(c *restclient.Config) *AutoscalingV1Client { +func NewForConfigOrDie(c *rest.Config) *AutoscalingV1Client { client, err := NewForConfig(c) if err != nil { panic(err) @@ -62,11 +62,11 @@ func NewForConfigOrDie(c *restclient.Config) *AutoscalingV1Client { } // New creates a new AutoscalingV1Client for the given RESTClient. -func New(c restclient.Interface) *AutoscalingV1Client { +func New(c rest.Interface) *AutoscalingV1Client { return &AutoscalingV1Client{c} } -func setConfigDefaults(config *restclient.Config) error { +func setConfigDefaults(config *rest.Config) error { gv, err := schema.ParseGroupVersion("autoscaling/v1") if err != nil { return err @@ -77,7 +77,7 @@ func setConfigDefaults(config *restclient.Config) error { } config.APIPath = "/apis" if config.UserAgent == "" { - config.UserAgent = restclient.DefaultKubernetesUserAgent() + config.UserAgent = rest.DefaultKubernetesUserAgent() } copyGroupVersion := gv config.GroupVersion = ©GroupVersion @@ -89,7 +89,7 @@ func setConfigDefaults(config *restclient.Config) error { // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *AutoscalingV1Client) RESTClient() restclient.Interface { +func (c *AutoscalingV1Client) RESTClient() rest.Interface { if c == nil { return nil } diff --git a/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/fake/BUILD b/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/fake/BUILD index c56c104fc6..79e0b9f1e5 100644 --- a/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/fake/BUILD +++ b/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/fake/BUILD @@ -19,13 +19,13 @@ go_library( "//pkg/api/v1:go_default_library", "//pkg/apis/autoscaling/v1:go_default_library", "//pkg/client/clientset_generated/clientset/typed/autoscaling/v1:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/fake/fake_autoscaling_client.go b/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/fake/fake_autoscaling_client.go index 6db35b011e..13fef5bd89 100644 --- a/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/fake/fake_autoscaling_client.go +++ b/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/fake/fake_autoscaling_client.go @@ -17,8 +17,8 @@ limitations under the License. package fake import ( + rest "k8s.io/client-go/rest" v1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/autoscaling/v1" - restclient "k8s.io/kubernetes/pkg/client/restclient" core "k8s.io/kubernetes/pkg/client/testing/core" ) @@ -32,7 +32,7 @@ func (c *FakeAutoscalingV1) HorizontalPodAutoscalers(namespace string) v1.Horizo // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeAutoscalingV1) RESTClient() restclient.Interface { - var ret *restclient.RESTClient +func (c *FakeAutoscalingV1) RESTClient() rest.Interface { + var ret *rest.RESTClient return ret } diff --git a/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/horizontalpodautoscaler.go b/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/horizontalpodautoscaler.go index ba59773c1b..7a268a04c8 100644 --- a/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/horizontalpodautoscaler.go +++ b/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/horizontalpodautoscaler.go @@ -20,10 +20,10 @@ import ( meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" 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" ) // HorizontalPodAutoscalersGetter has a method to return a HorizontalPodAutoscalerInterface. @@ -48,7 +48,7 @@ type HorizontalPodAutoscalerInterface interface { // horizontalPodAutoscalers implements HorizontalPodAutoscalerInterface type horizontalPodAutoscalers struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/pkg/client/clientset_generated/clientset/typed/batch/v1/BUILD b/pkg/client/clientset_generated/clientset/typed/batch/v1/BUILD index 90c93e2bd4..fb28af8f49 100644 --- a/pkg/client/clientset_generated/clientset/typed/batch/v1/BUILD +++ b/pkg/client/clientset_generated/clientset/typed/batch/v1/BUILD @@ -20,12 +20,12 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apis/batch/v1:go_default_library", - "//pkg/client/restclient:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/pkg/client/clientset_generated/clientset/typed/batch/v1/batch_client.go b/pkg/client/clientset_generated/clientset/typed/batch/v1/batch_client.go index def6f1e39a..2c1dba1658 100644 --- a/pkg/client/clientset_generated/clientset/typed/batch/v1/batch_client.go +++ b/pkg/client/clientset_generated/clientset/typed/batch/v1/batch_client.go @@ -20,18 +20,18 @@ import ( fmt "fmt" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) type BatchV1Interface interface { - RESTClient() restclient.Interface + RESTClient() rest.Interface JobsGetter } // BatchV1Client is used to interact with features provided by the batch group. type BatchV1Client struct { - restClient restclient.Interface + restClient rest.Interface } func (c *BatchV1Client) Jobs(namespace string) JobInterface { @@ -39,12 +39,12 @@ func (c *BatchV1Client) Jobs(namespace string) JobInterface { } // NewForConfig creates a new BatchV1Client for the given config. -func NewForConfig(c *restclient.Config) (*BatchV1Client, error) { +func NewForConfig(c *rest.Config) (*BatchV1Client, error) { config := *c if err := setConfigDefaults(&config); err != nil { return nil, err } - client, err := restclient.RESTClientFor(&config) + client, err := rest.RESTClientFor(&config) if err != nil { return nil, err } @@ -53,7 +53,7 @@ func NewForConfig(c *restclient.Config) (*BatchV1Client, error) { // NewForConfigOrDie creates a new BatchV1Client for the given config and // panics if there is an error in the config. -func NewForConfigOrDie(c *restclient.Config) *BatchV1Client { +func NewForConfigOrDie(c *rest.Config) *BatchV1Client { client, err := NewForConfig(c) if err != nil { panic(err) @@ -62,11 +62,11 @@ func NewForConfigOrDie(c *restclient.Config) *BatchV1Client { } // New creates a new BatchV1Client for the given RESTClient. -func New(c restclient.Interface) *BatchV1Client { +func New(c rest.Interface) *BatchV1Client { return &BatchV1Client{c} } -func setConfigDefaults(config *restclient.Config) error { +func setConfigDefaults(config *rest.Config) error { gv, err := schema.ParseGroupVersion("batch/v1") if err != nil { return err @@ -77,7 +77,7 @@ func setConfigDefaults(config *restclient.Config) error { } config.APIPath = "/apis" if config.UserAgent == "" { - config.UserAgent = restclient.DefaultKubernetesUserAgent() + config.UserAgent = rest.DefaultKubernetesUserAgent() } copyGroupVersion := gv config.GroupVersion = ©GroupVersion @@ -89,7 +89,7 @@ func setConfigDefaults(config *restclient.Config) error { // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *BatchV1Client) RESTClient() restclient.Interface { +func (c *BatchV1Client) RESTClient() rest.Interface { if c == nil { return nil } diff --git a/pkg/client/clientset_generated/clientset/typed/batch/v1/fake/BUILD b/pkg/client/clientset_generated/clientset/typed/batch/v1/fake/BUILD index b73bc75538..ba3eb2a67c 100644 --- a/pkg/client/clientset_generated/clientset/typed/batch/v1/fake/BUILD +++ b/pkg/client/clientset_generated/clientset/typed/batch/v1/fake/BUILD @@ -19,13 +19,13 @@ go_library( "//pkg/api/v1:go_default_library", "//pkg/apis/batch/v1:go_default_library", "//pkg/client/clientset_generated/clientset/typed/batch/v1:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/pkg/client/clientset_generated/clientset/typed/batch/v1/fake/fake_batch_client.go b/pkg/client/clientset_generated/clientset/typed/batch/v1/fake/fake_batch_client.go index b764cddff7..ae9b99f473 100644 --- a/pkg/client/clientset_generated/clientset/typed/batch/v1/fake/fake_batch_client.go +++ b/pkg/client/clientset_generated/clientset/typed/batch/v1/fake/fake_batch_client.go @@ -17,8 +17,8 @@ limitations under the License. package fake import ( + rest "k8s.io/client-go/rest" v1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/batch/v1" - restclient "k8s.io/kubernetes/pkg/client/restclient" core "k8s.io/kubernetes/pkg/client/testing/core" ) @@ -32,7 +32,7 @@ func (c *FakeBatchV1) Jobs(namespace string) v1.JobInterface { // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeBatchV1) RESTClient() restclient.Interface { - var ret *restclient.RESTClient +func (c *FakeBatchV1) RESTClient() rest.Interface { + var ret *rest.RESTClient return ret } diff --git a/pkg/client/clientset_generated/clientset/typed/batch/v1/job.go b/pkg/client/clientset_generated/clientset/typed/batch/v1/job.go index 2d1e34259c..67ff9f03e0 100644 --- a/pkg/client/clientset_generated/clientset/typed/batch/v1/job.go +++ b/pkg/client/clientset_generated/clientset/typed/batch/v1/job.go @@ -20,10 +20,10 @@ import ( meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" 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" ) // JobsGetter has a method to return a JobInterface. @@ -48,7 +48,7 @@ type JobInterface interface { // jobs implements JobInterface type jobs struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/BUILD b/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/BUILD index 489630384f..5038df6bca 100644 --- a/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/BUILD +++ b/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/BUILD @@ -21,12 +21,12 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apis/batch/v2alpha1:go_default_library", - "//pkg/client/restclient:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/batch_client.go b/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/batch_client.go index 044517c295..9757b4f746 100644 --- a/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/batch_client.go +++ b/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/batch_client.go @@ -20,19 +20,19 @@ import ( fmt "fmt" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) type BatchV2alpha1Interface interface { - RESTClient() restclient.Interface + RESTClient() rest.Interface CronJobsGetter JobsGetter } // BatchV2alpha1Client is used to interact with features provided by the batch group. type BatchV2alpha1Client struct { - restClient restclient.Interface + restClient rest.Interface } func (c *BatchV2alpha1Client) CronJobs(namespace string) CronJobInterface { @@ -44,12 +44,12 @@ func (c *BatchV2alpha1Client) Jobs(namespace string) JobInterface { } // NewForConfig creates a new BatchV2alpha1Client for the given config. -func NewForConfig(c *restclient.Config) (*BatchV2alpha1Client, error) { +func NewForConfig(c *rest.Config) (*BatchV2alpha1Client, error) { config := *c if err := setConfigDefaults(&config); err != nil { return nil, err } - client, err := restclient.RESTClientFor(&config) + client, err := rest.RESTClientFor(&config) if err != nil { return nil, err } @@ -58,7 +58,7 @@ func NewForConfig(c *restclient.Config) (*BatchV2alpha1Client, error) { // NewForConfigOrDie creates a new BatchV2alpha1Client for the given config and // panics if there is an error in the config. -func NewForConfigOrDie(c *restclient.Config) *BatchV2alpha1Client { +func NewForConfigOrDie(c *rest.Config) *BatchV2alpha1Client { client, err := NewForConfig(c) if err != nil { panic(err) @@ -67,11 +67,11 @@ func NewForConfigOrDie(c *restclient.Config) *BatchV2alpha1Client { } // New creates a new BatchV2alpha1Client for the given RESTClient. -func New(c restclient.Interface) *BatchV2alpha1Client { +func New(c rest.Interface) *BatchV2alpha1Client { return &BatchV2alpha1Client{c} } -func setConfigDefaults(config *restclient.Config) error { +func setConfigDefaults(config *rest.Config) error { gv, err := schema.ParseGroupVersion("batch/v2alpha1") if err != nil { return err @@ -82,7 +82,7 @@ func setConfigDefaults(config *restclient.Config) error { } config.APIPath = "/apis" if config.UserAgent == "" { - config.UserAgent = restclient.DefaultKubernetesUserAgent() + config.UserAgent = rest.DefaultKubernetesUserAgent() } copyGroupVersion := gv config.GroupVersion = ©GroupVersion @@ -94,7 +94,7 @@ func setConfigDefaults(config *restclient.Config) error { // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *BatchV2alpha1Client) RESTClient() restclient.Interface { +func (c *BatchV2alpha1Client) RESTClient() rest.Interface { if c == nil { return nil } diff --git a/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/cronjob.go b/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/cronjob.go index 94cabc4122..f2d40b3ab9 100644 --- a/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/cronjob.go +++ b/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/cronjob.go @@ -20,10 +20,10 @@ import ( meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" v2alpha1 "k8s.io/kubernetes/pkg/apis/batch/v2alpha1" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // CronJobsGetter has a method to return a CronJobInterface. @@ -48,7 +48,7 @@ type CronJobInterface interface { // cronJobs implements CronJobInterface type cronJobs struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/fake/BUILD b/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/fake/BUILD index ae9e78a3a5..b205355a36 100644 --- a/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/fake/BUILD +++ b/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/fake/BUILD @@ -20,13 +20,13 @@ go_library( "//pkg/api/v1:go_default_library", "//pkg/apis/batch/v2alpha1:go_default_library", "//pkg/client/clientset_generated/clientset/typed/batch/v2alpha1:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/fake/fake_batch_client.go b/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/fake/fake_batch_client.go index 3e2a1f6f32..aff53da59a 100644 --- a/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/fake/fake_batch_client.go +++ b/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/fake/fake_batch_client.go @@ -17,8 +17,8 @@ limitations under the License. package fake import ( + rest "k8s.io/client-go/rest" v2alpha1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1" - restclient "k8s.io/kubernetes/pkg/client/restclient" core "k8s.io/kubernetes/pkg/client/testing/core" ) @@ -36,7 +36,7 @@ func (c *FakeBatchV2alpha1) Jobs(namespace string) v2alpha1.JobInterface { // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeBatchV2alpha1) RESTClient() restclient.Interface { - var ret *restclient.RESTClient +func (c *FakeBatchV2alpha1) RESTClient() rest.Interface { + var ret *rest.RESTClient return ret } diff --git a/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/job.go b/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/job.go index 55f10be88b..cc92b55a6e 100644 --- a/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/job.go +++ b/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/job.go @@ -20,10 +20,10 @@ import ( meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" v2alpha1 "k8s.io/kubernetes/pkg/apis/batch/v2alpha1" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // JobsGetter has a method to return a JobInterface. @@ -48,7 +48,7 @@ type JobInterface interface { // jobs implements JobInterface type jobs struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/certificates_client.go b/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/certificates_client.go index d449b83a51..27f77d3518 100644 --- a/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/certificates_client.go +++ b/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/certificates_client.go @@ -20,18 +20,18 @@ import ( fmt "fmt" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) type CertificatesV1beta1Interface interface { - RESTClient() restclient.Interface + RESTClient() rest.Interface CertificateSigningRequestsGetter } // CertificatesV1beta1Client is used to interact with features provided by the certificates.k8s.io group. type CertificatesV1beta1Client struct { - restClient restclient.Interface + restClient rest.Interface } func (c *CertificatesV1beta1Client) CertificateSigningRequests() CertificateSigningRequestInterface { @@ -39,12 +39,12 @@ func (c *CertificatesV1beta1Client) CertificateSigningRequests() CertificateSign } // NewForConfig creates a new CertificatesV1beta1Client for the given config. -func NewForConfig(c *restclient.Config) (*CertificatesV1beta1Client, error) { +func NewForConfig(c *rest.Config) (*CertificatesV1beta1Client, error) { config := *c if err := setConfigDefaults(&config); err != nil { return nil, err } - client, err := restclient.RESTClientFor(&config) + client, err := rest.RESTClientFor(&config) if err != nil { return nil, err } @@ -53,7 +53,7 @@ func NewForConfig(c *restclient.Config) (*CertificatesV1beta1Client, error) { // NewForConfigOrDie creates a new CertificatesV1beta1Client for the given config and // panics if there is an error in the config. -func NewForConfigOrDie(c *restclient.Config) *CertificatesV1beta1Client { +func NewForConfigOrDie(c *rest.Config) *CertificatesV1beta1Client { client, err := NewForConfig(c) if err != nil { panic(err) @@ -62,11 +62,11 @@ func NewForConfigOrDie(c *restclient.Config) *CertificatesV1beta1Client { } // New creates a new CertificatesV1beta1Client for the given RESTClient. -func New(c restclient.Interface) *CertificatesV1beta1Client { +func New(c rest.Interface) *CertificatesV1beta1Client { return &CertificatesV1beta1Client{c} } -func setConfigDefaults(config *restclient.Config) error { +func setConfigDefaults(config *rest.Config) error { gv, err := schema.ParseGroupVersion("certificates.k8s.io/v1beta1") if err != nil { return err @@ -77,7 +77,7 @@ func setConfigDefaults(config *restclient.Config) error { } config.APIPath = "/apis" if config.UserAgent == "" { - config.UserAgent = restclient.DefaultKubernetesUserAgent() + config.UserAgent = rest.DefaultKubernetesUserAgent() } copyGroupVersion := gv config.GroupVersion = ©GroupVersion @@ -89,7 +89,7 @@ func setConfigDefaults(config *restclient.Config) error { // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *CertificatesV1beta1Client) RESTClient() restclient.Interface { +func (c *CertificatesV1beta1Client) RESTClient() rest.Interface { if c == nil { return nil } diff --git a/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/certificatesigningrequest.go b/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/certificatesigningrequest.go index 78b643ff4c..418be1b263 100644 --- a/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/certificatesigningrequest.go +++ b/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/certificatesigningrequest.go @@ -20,10 +20,10 @@ import ( meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" v1beta1 "k8s.io/kubernetes/pkg/apis/certificates/v1beta1" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // CertificateSigningRequestsGetter has a method to return a CertificateSigningRequestInterface. @@ -48,7 +48,7 @@ type CertificateSigningRequestInterface interface { // certificateSigningRequests implements CertificateSigningRequestInterface type certificateSigningRequests struct { - client restclient.Interface + client rest.Interface } // newCertificateSigningRequests returns a CertificateSigningRequests diff --git a/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/fake/fake_certificates_client.go b/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/fake/fake_certificates_client.go index 95546ab73b..a8877370ab 100644 --- a/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/fake/fake_certificates_client.go +++ b/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/fake/fake_certificates_client.go @@ -17,8 +17,8 @@ limitations under the License. package fake import ( + rest "k8s.io/client-go/rest" v1beta1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1" - restclient "k8s.io/kubernetes/pkg/client/restclient" core "k8s.io/kubernetes/pkg/client/testing/core" ) @@ -32,7 +32,7 @@ func (c *FakeCertificatesV1beta1) CertificateSigningRequests() v1beta1.Certifica // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeCertificatesV1beta1) RESTClient() restclient.Interface { - var ret *restclient.RESTClient +func (c *FakeCertificatesV1beta1) RESTClient() rest.Interface { + var ret *rest.RESTClient return ret } diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/BUILD b/pkg/client/clientset_generated/clientset/typed/core/v1/BUILD index 46270b1047..3b71b94c3b 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/BUILD +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/BUILD @@ -40,7 +40,6 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apis/policy/v1beta1:go_default_library", - "//pkg/client/restclient:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/fields", "//vendor:k8s.io/apimachinery/pkg/runtime", @@ -49,6 +48,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/util/net", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/componentstatus.go b/pkg/client/clientset_generated/clientset/typed/core/v1/componentstatus.go index 034ded8f07..f3858d9279 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/componentstatus.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/componentstatus.go @@ -20,9 +20,9 @@ import ( meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // ComponentStatusesGetter has a method to return a ComponentStatusInterface. @@ -46,7 +46,7 @@ type ComponentStatusInterface interface { // componentStatuses implements ComponentStatusInterface type componentStatuses struct { - client restclient.Interface + client rest.Interface } // newComponentStatuses returns a ComponentStatuses diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/configmap.go b/pkg/client/clientset_generated/clientset/typed/core/v1/configmap.go index b4f846eca1..01de98954e 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/configmap.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/configmap.go @@ -20,9 +20,9 @@ import ( meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // ConfigMapsGetter has a method to return a ConfigMapInterface. @@ -46,7 +46,7 @@ type ConfigMapInterface interface { // configMaps implements ConfigMapInterface type configMaps struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/core_client.go b/pkg/client/clientset_generated/clientset/typed/core/v1/core_client.go index ecb0454820..0bd232da3f 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/core_client.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/core_client.go @@ -20,12 +20,12 @@ import ( fmt "fmt" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) type CoreV1Interface interface { - RESTClient() restclient.Interface + RESTClient() rest.Interface ComponentStatusesGetter ConfigMapsGetter EndpointsGetter @@ -46,7 +46,7 @@ type CoreV1Interface interface { // CoreV1Client is used to interact with features provided by the group. type CoreV1Client struct { - restClient restclient.Interface + restClient rest.Interface } func (c *CoreV1Client) ComponentStatuses() ComponentStatusInterface { @@ -114,12 +114,12 @@ func (c *CoreV1Client) ServiceAccounts(namespace string) ServiceAccountInterface } // NewForConfig creates a new CoreV1Client for the given config. -func NewForConfig(c *restclient.Config) (*CoreV1Client, error) { +func NewForConfig(c *rest.Config) (*CoreV1Client, error) { config := *c if err := setConfigDefaults(&config); err != nil { return nil, err } - client, err := restclient.RESTClientFor(&config) + client, err := rest.RESTClientFor(&config) if err != nil { return nil, err } @@ -128,7 +128,7 @@ func NewForConfig(c *restclient.Config) (*CoreV1Client, error) { // NewForConfigOrDie creates a new CoreV1Client for the given config and // panics if there is an error in the config. -func NewForConfigOrDie(c *restclient.Config) *CoreV1Client { +func NewForConfigOrDie(c *rest.Config) *CoreV1Client { client, err := NewForConfig(c) if err != nil { panic(err) @@ -137,11 +137,11 @@ func NewForConfigOrDie(c *restclient.Config) *CoreV1Client { } // New creates a new CoreV1Client for the given RESTClient. -func New(c restclient.Interface) *CoreV1Client { +func New(c rest.Interface) *CoreV1Client { return &CoreV1Client{c} } -func setConfigDefaults(config *restclient.Config) error { +func setConfigDefaults(config *rest.Config) error { gv, err := schema.ParseGroupVersion("/v1") if err != nil { return err @@ -152,7 +152,7 @@ func setConfigDefaults(config *restclient.Config) error { } config.APIPath = "/api" if config.UserAgent == "" { - config.UserAgent = restclient.DefaultKubernetesUserAgent() + config.UserAgent = rest.DefaultKubernetesUserAgent() } copyGroupVersion := gv config.GroupVersion = ©GroupVersion @@ -164,7 +164,7 @@ func setConfigDefaults(config *restclient.Config) error { // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *CoreV1Client) RESTClient() restclient.Interface { +func (c *CoreV1Client) RESTClient() rest.Interface { if c == nil { return nil } diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/endpoints.go b/pkg/client/clientset_generated/clientset/typed/core/v1/endpoints.go index 685658b707..4e688a32e8 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/endpoints.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/endpoints.go @@ -20,9 +20,9 @@ import ( meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // EndpointsGetter has a method to return a EndpointsInterface. @@ -46,7 +46,7 @@ type EndpointsInterface interface { // endpoints implements EndpointsInterface type endpoints struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/event.go b/pkg/client/clientset_generated/clientset/typed/core/v1/event.go index 040e1b68d0..7ee9a35f17 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/event.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/event.go @@ -20,9 +20,9 @@ import ( meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // EventsGetter has a method to return a EventInterface. @@ -46,7 +46,7 @@ type EventInterface interface { // events implements EventInterface type events struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/BUILD b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/BUILD index 04017267d8..f94c0f481f 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/BUILD +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/BUILD @@ -40,7 +40,6 @@ go_library( "//pkg/api/v1:go_default_library", "//pkg/apis/policy/v1beta1:go_default_library", "//pkg/client/clientset_generated/clientset/typed/core/v1:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/fields", @@ -49,6 +48,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_core_client.go b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_core_client.go index fcf04dfe1d..98fd03a0c9 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_core_client.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_core_client.go @@ -17,8 +17,8 @@ limitations under the License. package fake import ( + rest "k8s.io/client-go/rest" v1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/core/v1" - restclient "k8s.io/kubernetes/pkg/client/restclient" core "k8s.io/kubernetes/pkg/client/testing/core" ) @@ -92,7 +92,7 @@ func (c *FakeCoreV1) ServiceAccounts(namespace string) v1.ServiceAccountInterfac // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeCoreV1) RESTClient() restclient.Interface { - var ret *restclient.RESTClient +func (c *FakeCoreV1) RESTClient() rest.Interface { + var ret *rest.RESTClient return ret } diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/limitrange.go b/pkg/client/clientset_generated/clientset/typed/core/v1/limitrange.go index 1e7e212236..0e007cbcb2 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/limitrange.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/limitrange.go @@ -20,9 +20,9 @@ import ( meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // LimitRangesGetter has a method to return a LimitRangeInterface. @@ -46,7 +46,7 @@ type LimitRangeInterface interface { // limitRanges implements LimitRangeInterface type limitRanges struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/namespace.go b/pkg/client/clientset_generated/clientset/typed/core/v1/namespace.go index 0a01c78f2c..6fc64ff4e7 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/namespace.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/namespace.go @@ -20,9 +20,9 @@ import ( meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // NamespacesGetter has a method to return a NamespaceInterface. @@ -47,7 +47,7 @@ type NamespaceInterface interface { // namespaces implements NamespaceInterface type namespaces struct { - client restclient.Interface + client rest.Interface } // newNamespaces returns a Namespaces diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/node.go b/pkg/client/clientset_generated/clientset/typed/core/v1/node.go index 096d220c7f..38d47ae9ac 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/node.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/node.go @@ -20,9 +20,9 @@ import ( meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // NodesGetter has a method to return a NodeInterface. @@ -47,7 +47,7 @@ type NodeInterface interface { // nodes implements NodeInterface type nodes struct { - client restclient.Interface + client rest.Interface } // newNodes returns a Nodes diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/persistentvolume.go b/pkg/client/clientset_generated/clientset/typed/core/v1/persistentvolume.go index 319ebada29..4e75654a4b 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/persistentvolume.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/persistentvolume.go @@ -20,9 +20,9 @@ import ( meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // PersistentVolumesGetter has a method to return a PersistentVolumeInterface. @@ -47,7 +47,7 @@ type PersistentVolumeInterface interface { // persistentVolumes implements PersistentVolumeInterface type persistentVolumes struct { - client restclient.Interface + client rest.Interface } // newPersistentVolumes returns a PersistentVolumes diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/persistentvolumeclaim.go b/pkg/client/clientset_generated/clientset/typed/core/v1/persistentvolumeclaim.go index a8b4375ac3..4cdc98eb17 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/persistentvolumeclaim.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/persistentvolumeclaim.go @@ -20,9 +20,9 @@ import ( meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // PersistentVolumeClaimsGetter has a method to return a PersistentVolumeClaimInterface. @@ -47,7 +47,7 @@ type PersistentVolumeClaimInterface interface { // persistentVolumeClaims implements PersistentVolumeClaimInterface type persistentVolumeClaims struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/pod.go b/pkg/client/clientset_generated/clientset/typed/core/v1/pod.go index 74e7b2f1b2..8a1d5e9f03 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/pod.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/pod.go @@ -20,9 +20,9 @@ import ( meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // PodsGetter has a method to return a PodInterface. @@ -47,7 +47,7 @@ type PodInterface interface { // pods implements PodInterface type pods struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/podtemplate.go b/pkg/client/clientset_generated/clientset/typed/core/v1/podtemplate.go index 79110c21dc..d8763eaaa0 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/podtemplate.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/podtemplate.go @@ -20,9 +20,9 @@ import ( meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // PodTemplatesGetter has a method to return a PodTemplateInterface. @@ -46,7 +46,7 @@ type PodTemplateInterface interface { // podTemplates implements PodTemplateInterface type podTemplates struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/replicationcontroller.go b/pkg/client/clientset_generated/clientset/typed/core/v1/replicationcontroller.go index a8ba8605db..d6f3101dc8 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/replicationcontroller.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/replicationcontroller.go @@ -20,9 +20,9 @@ import ( meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // ReplicationControllersGetter has a method to return a ReplicationControllerInterface. @@ -47,7 +47,7 @@ type ReplicationControllerInterface interface { // replicationControllers implements ReplicationControllerInterface type replicationControllers struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/resourcequota.go b/pkg/client/clientset_generated/clientset/typed/core/v1/resourcequota.go index ada814db37..675a0c357b 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/resourcequota.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/resourcequota.go @@ -20,9 +20,9 @@ import ( meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // ResourceQuotasGetter has a method to return a ResourceQuotaInterface. @@ -47,7 +47,7 @@ type ResourceQuotaInterface interface { // resourceQuotas implements ResourceQuotaInterface type resourceQuotas struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/secret.go b/pkg/client/clientset_generated/clientset/typed/core/v1/secret.go index 298ca343e0..0ba9ba8bfb 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/secret.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/secret.go @@ -20,9 +20,9 @@ import ( meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // SecretsGetter has a method to return a SecretInterface. @@ -46,7 +46,7 @@ type SecretInterface interface { // secrets implements SecretInterface type secrets struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/service.go b/pkg/client/clientset_generated/clientset/typed/core/v1/service.go index 660d1a632c..99c6d3f7a7 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/service.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/service.go @@ -20,9 +20,9 @@ import ( meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // ServicesGetter has a method to return a ServiceInterface. @@ -47,7 +47,7 @@ type ServiceInterface interface { // services implements ServiceInterface type services struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/serviceaccount.go b/pkg/client/clientset_generated/clientset/typed/core/v1/serviceaccount.go index 00eab9c960..f47e4eec48 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/serviceaccount.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/serviceaccount.go @@ -20,9 +20,9 @@ import ( meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // ServiceAccountsGetter has a method to return a ServiceAccountInterface. @@ -46,7 +46,7 @@ type ServiceAccountInterface interface { // serviceAccounts implements ServiceAccountInterface type serviceAccounts struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/BUILD b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/BUILD index 35be8f5f10..ecf3d3fbce 100644 --- a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/BUILD +++ b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/BUILD @@ -28,13 +28,13 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", - "//pkg/client/restclient:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/meta", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/daemonset.go b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/daemonset.go index aaebd1e968..cdc71b8b55 100644 --- a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/daemonset.go +++ b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/daemonset.go @@ -20,10 +20,10 @@ import ( meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" 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" ) // DaemonSetsGetter has a method to return a DaemonSetInterface. @@ -48,7 +48,7 @@ type DaemonSetInterface interface { // daemonSets implements DaemonSetInterface type daemonSets struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/deployment.go b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/deployment.go index 2987c87651..1060d60eca 100644 --- a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/deployment.go +++ b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/deployment.go @@ -20,10 +20,10 @@ import ( meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" 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" ) // DeploymentsGetter has a method to return a DeploymentInterface. @@ -48,7 +48,7 @@ type DeploymentInterface interface { // deployments implements DeploymentInterface type deployments struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/extensions_client.go b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/extensions_client.go index 646cd50476..d646e5a1b8 100644 --- a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/extensions_client.go +++ b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/extensions_client.go @@ -20,12 +20,12 @@ import ( fmt "fmt" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) type ExtensionsV1beta1Interface interface { - RESTClient() restclient.Interface + RESTClient() rest.Interface DaemonSetsGetter DeploymentsGetter IngressesGetter @@ -37,7 +37,7 @@ type ExtensionsV1beta1Interface interface { // ExtensionsV1beta1Client is used to interact with features provided by the extensions group. type ExtensionsV1beta1Client struct { - restClient restclient.Interface + restClient rest.Interface } func (c *ExtensionsV1beta1Client) DaemonSets(namespace string) DaemonSetInterface { @@ -69,12 +69,12 @@ func (c *ExtensionsV1beta1Client) ThirdPartyResources() ThirdPartyResourceInterf } // NewForConfig creates a new ExtensionsV1beta1Client for the given config. -func NewForConfig(c *restclient.Config) (*ExtensionsV1beta1Client, error) { +func NewForConfig(c *rest.Config) (*ExtensionsV1beta1Client, error) { config := *c if err := setConfigDefaults(&config); err != nil { return nil, err } - client, err := restclient.RESTClientFor(&config) + client, err := rest.RESTClientFor(&config) if err != nil { return nil, err } @@ -83,7 +83,7 @@ func NewForConfig(c *restclient.Config) (*ExtensionsV1beta1Client, error) { // NewForConfigOrDie creates a new ExtensionsV1beta1Client for the given config and // panics if there is an error in the config. -func NewForConfigOrDie(c *restclient.Config) *ExtensionsV1beta1Client { +func NewForConfigOrDie(c *rest.Config) *ExtensionsV1beta1Client { client, err := NewForConfig(c) if err != nil { panic(err) @@ -92,11 +92,11 @@ func NewForConfigOrDie(c *restclient.Config) *ExtensionsV1beta1Client { } // New creates a new ExtensionsV1beta1Client for the given RESTClient. -func New(c restclient.Interface) *ExtensionsV1beta1Client { +func New(c rest.Interface) *ExtensionsV1beta1Client { return &ExtensionsV1beta1Client{c} } -func setConfigDefaults(config *restclient.Config) error { +func setConfigDefaults(config *rest.Config) error { gv, err := schema.ParseGroupVersion("extensions/v1beta1") if err != nil { return err @@ -107,7 +107,7 @@ func setConfigDefaults(config *restclient.Config) error { } config.APIPath = "/apis" if config.UserAgent == "" { - config.UserAgent = restclient.DefaultKubernetesUserAgent() + config.UserAgent = rest.DefaultKubernetesUserAgent() } copyGroupVersion := gv config.GroupVersion = ©GroupVersion @@ -119,7 +119,7 @@ func setConfigDefaults(config *restclient.Config) error { // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *ExtensionsV1beta1Client) RESTClient() restclient.Interface { +func (c *ExtensionsV1beta1Client) RESTClient() rest.Interface { if c == nil { return nil } diff --git a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/BUILD b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/BUILD index f1c96dd376..f9c967251f 100644 --- a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/BUILD +++ b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/BUILD @@ -27,13 +27,13 @@ go_library( "//pkg/api/v1:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", "//pkg/client/clientset_generated/clientset/typed/extensions/v1beta1:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_extensions_client.go b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_extensions_client.go index a6e5207c16..84749284c2 100644 --- a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_extensions_client.go +++ b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_extensions_client.go @@ -17,8 +17,8 @@ limitations under the License. package fake import ( + rest "k8s.io/client-go/rest" v1beta1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1" - restclient "k8s.io/kubernetes/pkg/client/restclient" core "k8s.io/kubernetes/pkg/client/testing/core" ) @@ -56,7 +56,7 @@ func (c *FakeExtensionsV1beta1) ThirdPartyResources() v1beta1.ThirdPartyResource // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeExtensionsV1beta1) RESTClient() restclient.Interface { - var ret *restclient.RESTClient +func (c *FakeExtensionsV1beta1) RESTClient() rest.Interface { + var ret *rest.RESTClient return ret } diff --git a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/ingress.go b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/ingress.go index ced46ccb88..aaa1494699 100644 --- a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/ingress.go +++ b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/ingress.go @@ -20,10 +20,10 @@ import ( meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" 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" ) // IngressesGetter has a method to return a IngressInterface. @@ -48,7 +48,7 @@ type IngressInterface interface { // ingresses implements IngressInterface type ingresses struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/podsecuritypolicy.go b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/podsecuritypolicy.go index ba24ee5393..918aec4549 100644 --- a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/podsecuritypolicy.go +++ b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/podsecuritypolicy.go @@ -20,10 +20,10 @@ import ( meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" 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" ) // PodSecurityPoliciesGetter has a method to return a PodSecurityPolicyInterface. @@ -47,7 +47,7 @@ type PodSecurityPolicyInterface interface { // podSecurityPolicies implements PodSecurityPolicyInterface type podSecurityPolicies struct { - client restclient.Interface + client rest.Interface } // newPodSecurityPolicies returns a PodSecurityPolicies diff --git a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/replicaset.go b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/replicaset.go index 7b1ca121ae..3bc699ff35 100644 --- a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/replicaset.go +++ b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/replicaset.go @@ -20,10 +20,10 @@ import ( meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" 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" ) // ReplicaSetsGetter has a method to return a ReplicaSetInterface. @@ -48,7 +48,7 @@ type ReplicaSetInterface interface { // replicaSets implements ReplicaSetInterface type replicaSets struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/scale.go b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/scale.go index 3900aaa048..733012adee 100644 --- a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/scale.go +++ b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/scale.go @@ -17,7 +17,7 @@ limitations under the License. package v1beta1 import ( - restclient "k8s.io/kubernetes/pkg/client/restclient" + rest "k8s.io/client-go/rest" ) // ScalesGetter has a method to return a ScaleInterface. @@ -33,7 +33,7 @@ type ScaleInterface interface { // scales implements ScaleInterface type scales struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/thirdpartyresource.go b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/thirdpartyresource.go index 2c8bb8b14b..cee01c6b11 100644 --- a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/thirdpartyresource.go +++ b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/thirdpartyresource.go @@ -20,10 +20,10 @@ import ( meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" 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" ) // ThirdPartyResourcesGetter has a method to return a ThirdPartyResourceInterface. @@ -47,7 +47,7 @@ type ThirdPartyResourceInterface interface { // thirdPartyResources implements ThirdPartyResourceInterface type thirdPartyResources struct { - client restclient.Interface + client rest.Interface } // newThirdPartyResources returns a ThirdPartyResources diff --git a/pkg/client/clientset_generated/clientset/typed/policy/v1alpha1/BUILD b/pkg/client/clientset_generated/clientset/typed/policy/v1alpha1/BUILD index a873b7693d..2053955716 100644 --- a/pkg/client/clientset_generated/clientset/typed/policy/v1alpha1/BUILD +++ b/pkg/client/clientset_generated/clientset/typed/policy/v1alpha1/BUILD @@ -20,7 +20,6 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apis/policy/v1alpha1:go_default_library", - "//pkg/client/restclient:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", "//vendor:k8s.io/apimachinery/pkg/types", diff --git a/pkg/client/clientset_generated/clientset/typed/policy/v1alpha1/fake/BUILD b/pkg/client/clientset_generated/clientset/typed/policy/v1alpha1/fake/BUILD index 0ec6dc865b..3b05acf9da 100644 --- a/pkg/client/clientset_generated/clientset/typed/policy/v1alpha1/fake/BUILD +++ b/pkg/client/clientset_generated/clientset/typed/policy/v1alpha1/fake/BUILD @@ -19,7 +19,6 @@ go_library( "//pkg/api/v1:go_default_library", "//pkg/apis/policy/v1alpha1:go_default_library", "//pkg/client/clientset_generated/clientset/typed/policy/v1alpha1:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", diff --git a/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/BUILD b/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/BUILD index bea4dfbfaf..965539cf80 100644 --- a/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/BUILD +++ b/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/BUILD @@ -22,12 +22,12 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apis/policy/v1beta1:go_default_library", - "//pkg/client/restclient:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/eviction.go b/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/eviction.go index 3137a97a73..9c4133e369 100644 --- a/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/eviction.go +++ b/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/eviction.go @@ -17,7 +17,7 @@ limitations under the License. package v1beta1 import ( - restclient "k8s.io/kubernetes/pkg/client/restclient" + rest "k8s.io/client-go/rest" ) // EvictionsGetter has a method to return a EvictionInterface. @@ -33,7 +33,7 @@ type EvictionInterface interface { // evictions implements EvictionInterface type evictions struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/fake/BUILD b/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/fake/BUILD index d8fc74b1a2..f5b6c7557b 100644 --- a/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/fake/BUILD +++ b/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/fake/BUILD @@ -21,13 +21,13 @@ go_library( "//pkg/api/v1:go_default_library", "//pkg/apis/policy/v1beta1:go_default_library", "//pkg/client/clientset_generated/clientset/typed/policy/v1beta1:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/fake/fake_policy_client.go b/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/fake/fake_policy_client.go index 36fa3becb1..d25b1753b1 100644 --- a/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/fake/fake_policy_client.go +++ b/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/fake/fake_policy_client.go @@ -17,8 +17,8 @@ limitations under the License. package fake import ( + rest "k8s.io/client-go/rest" v1beta1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/policy/v1beta1" - restclient "k8s.io/kubernetes/pkg/client/restclient" core "k8s.io/kubernetes/pkg/client/testing/core" ) @@ -36,7 +36,7 @@ func (c *FakePolicyV1beta1) PodDisruptionBudgets(namespace string) v1beta1.PodDi // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakePolicyV1beta1) RESTClient() restclient.Interface { - var ret *restclient.RESTClient +func (c *FakePolicyV1beta1) RESTClient() rest.Interface { + var ret *rest.RESTClient return ret } diff --git a/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/poddisruptionbudget.go b/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/poddisruptionbudget.go index a4b605ed17..ffa09bd674 100644 --- a/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/poddisruptionbudget.go +++ b/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/poddisruptionbudget.go @@ -20,10 +20,10 @@ import ( meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" v1beta1 "k8s.io/kubernetes/pkg/apis/policy/v1beta1" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // PodDisruptionBudgetsGetter has a method to return a PodDisruptionBudgetInterface. @@ -48,7 +48,7 @@ type PodDisruptionBudgetInterface interface { // podDisruptionBudgets implements PodDisruptionBudgetInterface type podDisruptionBudgets struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/policy_client.go b/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/policy_client.go index a501ea13d3..c542fcfed8 100644 --- a/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/policy_client.go +++ b/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/policy_client.go @@ -20,19 +20,19 @@ import ( fmt "fmt" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) type PolicyV1beta1Interface interface { - RESTClient() restclient.Interface + RESTClient() rest.Interface EvictionsGetter PodDisruptionBudgetsGetter } // PolicyV1beta1Client is used to interact with features provided by the policy group. type PolicyV1beta1Client struct { - restClient restclient.Interface + restClient rest.Interface } func (c *PolicyV1beta1Client) Evictions(namespace string) EvictionInterface { @@ -44,12 +44,12 @@ func (c *PolicyV1beta1Client) PodDisruptionBudgets(namespace string) PodDisrupti } // NewForConfig creates a new PolicyV1beta1Client for the given config. -func NewForConfig(c *restclient.Config) (*PolicyV1beta1Client, error) { +func NewForConfig(c *rest.Config) (*PolicyV1beta1Client, error) { config := *c if err := setConfigDefaults(&config); err != nil { return nil, err } - client, err := restclient.RESTClientFor(&config) + client, err := rest.RESTClientFor(&config) if err != nil { return nil, err } @@ -58,7 +58,7 @@ func NewForConfig(c *restclient.Config) (*PolicyV1beta1Client, error) { // NewForConfigOrDie creates a new PolicyV1beta1Client for the given config and // panics if there is an error in the config. -func NewForConfigOrDie(c *restclient.Config) *PolicyV1beta1Client { +func NewForConfigOrDie(c *rest.Config) *PolicyV1beta1Client { client, err := NewForConfig(c) if err != nil { panic(err) @@ -67,11 +67,11 @@ func NewForConfigOrDie(c *restclient.Config) *PolicyV1beta1Client { } // New creates a new PolicyV1beta1Client for the given RESTClient. -func New(c restclient.Interface) *PolicyV1beta1Client { +func New(c rest.Interface) *PolicyV1beta1Client { return &PolicyV1beta1Client{c} } -func setConfigDefaults(config *restclient.Config) error { +func setConfigDefaults(config *rest.Config) error { gv, err := schema.ParseGroupVersion("policy/v1beta1") if err != nil { return err @@ -82,7 +82,7 @@ func setConfigDefaults(config *restclient.Config) error { } config.APIPath = "/apis" if config.UserAgent == "" { - config.UserAgent = restclient.DefaultKubernetesUserAgent() + config.UserAgent = rest.DefaultKubernetesUserAgent() } copyGroupVersion := gv config.GroupVersion = ©GroupVersion @@ -94,7 +94,7 @@ func setConfigDefaults(config *restclient.Config) error { // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *PolicyV1beta1Client) RESTClient() restclient.Interface { +func (c *PolicyV1beta1Client) RESTClient() rest.Interface { if c == nil { return nil } diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/BUILD b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/BUILD index 21e3197e29..b3bbd26a71 100644 --- a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/BUILD +++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/BUILD @@ -23,12 +23,12 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apis/rbac/v1alpha1:go_default_library", - "//pkg/client/restclient:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/clusterrole.go b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/clusterrole.go index 8f90298d91..4247ade523 100644 --- a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/clusterrole.go +++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/clusterrole.go @@ -20,10 +20,10 @@ import ( meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" 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" ) // ClusterRolesGetter has a method to return a ClusterRoleInterface. @@ -47,7 +47,7 @@ type ClusterRoleInterface interface { // clusterRoles implements ClusterRoleInterface type clusterRoles struct { - client restclient.Interface + client rest.Interface } // newClusterRoles returns a ClusterRoles diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/clusterrolebinding.go b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/clusterrolebinding.go index 5eb312658d..315b8810df 100644 --- a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/clusterrolebinding.go +++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/clusterrolebinding.go @@ -20,10 +20,10 @@ import ( meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" 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" ) // ClusterRoleBindingsGetter has a method to return a ClusterRoleBindingInterface. @@ -47,7 +47,7 @@ type ClusterRoleBindingInterface interface { // clusterRoleBindings implements ClusterRoleBindingInterface type clusterRoleBindings struct { - client restclient.Interface + client rest.Interface } // newClusterRoleBindings returns a ClusterRoleBindings diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/fake/BUILD b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/fake/BUILD index cf2f704099..23186e71f6 100644 --- a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/fake/BUILD +++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/fake/BUILD @@ -22,13 +22,13 @@ go_library( "//pkg/api/v1:go_default_library", "//pkg/apis/rbac/v1alpha1:go_default_library", "//pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/fake/fake_rbac_client.go b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/fake/fake_rbac_client.go index 1b370bfd44..5216e04bbd 100644 --- a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/fake/fake_rbac_client.go +++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/fake/fake_rbac_client.go @@ -17,8 +17,8 @@ limitations under the License. package fake import ( + rest "k8s.io/client-go/rest" v1alpha1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1" - restclient "k8s.io/kubernetes/pkg/client/restclient" core "k8s.io/kubernetes/pkg/client/testing/core" ) @@ -44,7 +44,7 @@ func (c *FakeRbacV1alpha1) RoleBindings(namespace string) v1alpha1.RoleBindingIn // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeRbacV1alpha1) RESTClient() restclient.Interface { - var ret *restclient.RESTClient +func (c *FakeRbacV1alpha1) RESTClient() rest.Interface { + var ret *rest.RESTClient return ret } diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/rbac_client.go b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/rbac_client.go index 52bf74a08c..42f077ca27 100644 --- a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/rbac_client.go +++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/rbac_client.go @@ -20,12 +20,12 @@ import ( fmt "fmt" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) type RbacV1alpha1Interface interface { - RESTClient() restclient.Interface + RESTClient() rest.Interface ClusterRolesGetter ClusterRoleBindingsGetter RolesGetter @@ -34,7 +34,7 @@ type RbacV1alpha1Interface interface { // RbacV1alpha1Client is used to interact with features provided by the rbac.authorization.k8s.io group. type RbacV1alpha1Client struct { - restClient restclient.Interface + restClient rest.Interface } func (c *RbacV1alpha1Client) ClusterRoles() ClusterRoleInterface { @@ -54,12 +54,12 @@ func (c *RbacV1alpha1Client) RoleBindings(namespace string) RoleBindingInterface } // NewForConfig creates a new RbacV1alpha1Client for the given config. -func NewForConfig(c *restclient.Config) (*RbacV1alpha1Client, error) { +func NewForConfig(c *rest.Config) (*RbacV1alpha1Client, error) { config := *c if err := setConfigDefaults(&config); err != nil { return nil, err } - client, err := restclient.RESTClientFor(&config) + client, err := rest.RESTClientFor(&config) if err != nil { return nil, err } @@ -68,7 +68,7 @@ func NewForConfig(c *restclient.Config) (*RbacV1alpha1Client, error) { // NewForConfigOrDie creates a new RbacV1alpha1Client for the given config and // panics if there is an error in the config. -func NewForConfigOrDie(c *restclient.Config) *RbacV1alpha1Client { +func NewForConfigOrDie(c *rest.Config) *RbacV1alpha1Client { client, err := NewForConfig(c) if err != nil { panic(err) @@ -77,11 +77,11 @@ func NewForConfigOrDie(c *restclient.Config) *RbacV1alpha1Client { } // New creates a new RbacV1alpha1Client for the given RESTClient. -func New(c restclient.Interface) *RbacV1alpha1Client { +func New(c rest.Interface) *RbacV1alpha1Client { return &RbacV1alpha1Client{c} } -func setConfigDefaults(config *restclient.Config) error { +func setConfigDefaults(config *rest.Config) error { gv, err := schema.ParseGroupVersion("rbac.authorization.k8s.io/v1alpha1") if err != nil { return err @@ -92,7 +92,7 @@ func setConfigDefaults(config *restclient.Config) error { } config.APIPath = "/apis" if config.UserAgent == "" { - config.UserAgent = restclient.DefaultKubernetesUserAgent() + config.UserAgent = rest.DefaultKubernetesUserAgent() } copyGroupVersion := gv config.GroupVersion = ©GroupVersion @@ -104,7 +104,7 @@ func setConfigDefaults(config *restclient.Config) error { // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *RbacV1alpha1Client) RESTClient() restclient.Interface { +func (c *RbacV1alpha1Client) RESTClient() rest.Interface { if c == nil { return nil } diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/role.go b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/role.go index e16b3097ce..b7c47fff72 100644 --- a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/role.go +++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/role.go @@ -20,10 +20,10 @@ import ( meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" 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" ) // RolesGetter has a method to return a RoleInterface. @@ -47,7 +47,7 @@ type RoleInterface interface { // roles implements RoleInterface type roles struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/rolebinding.go b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/rolebinding.go index 06ad70bea3..d181b021e4 100644 --- a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/rolebinding.go +++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/rolebinding.go @@ -20,10 +20,10 @@ import ( meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" 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" ) // RoleBindingsGetter has a method to return a RoleBindingInterface. @@ -47,7 +47,7 @@ type RoleBindingInterface interface { // roleBindings implements RoleBindingInterface type roleBindings struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/BUILD b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/BUILD index 5966b6b7b3..af79b68819 100644 --- a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/BUILD +++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/BUILD @@ -23,12 +23,12 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apis/rbac/v1beta1:go_default_library", - "//pkg/client/restclient:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/clusterrole.go b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/clusterrole.go index 90804b8ed5..41aef63d14 100644 --- a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/clusterrole.go +++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/clusterrole.go @@ -20,10 +20,10 @@ import ( meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" v1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // ClusterRolesGetter has a method to return a ClusterRoleInterface. @@ -47,7 +47,7 @@ type ClusterRoleInterface interface { // clusterRoles implements ClusterRoleInterface type clusterRoles struct { - client restclient.Interface + client rest.Interface } // newClusterRoles returns a ClusterRoles diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/clusterrolebinding.go b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/clusterrolebinding.go index 8cb4c4683f..6229b8e93d 100644 --- a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/clusterrolebinding.go +++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/clusterrolebinding.go @@ -20,10 +20,10 @@ import ( meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" v1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // ClusterRoleBindingsGetter has a method to return a ClusterRoleBindingInterface. @@ -47,7 +47,7 @@ type ClusterRoleBindingInterface interface { // clusterRoleBindings implements ClusterRoleBindingInterface type clusterRoleBindings struct { - client restclient.Interface + client rest.Interface } // newClusterRoleBindings returns a ClusterRoleBindings diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/fake/BUILD b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/fake/BUILD index f28839868e..fc0b18e0c9 100644 --- a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/fake/BUILD +++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/fake/BUILD @@ -22,13 +22,13 @@ go_library( "//pkg/api/v1:go_default_library", "//pkg/apis/rbac/v1beta1:go_default_library", "//pkg/client/clientset_generated/clientset/typed/rbac/v1beta1:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/fake/fake_rbac_client.go b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/fake/fake_rbac_client.go index e84c89d59f..2ce1900f6b 100644 --- a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/fake/fake_rbac_client.go +++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/fake/fake_rbac_client.go @@ -17,8 +17,8 @@ limitations under the License. package fake import ( + rest "k8s.io/client-go/rest" v1beta1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1" - restclient "k8s.io/kubernetes/pkg/client/restclient" core "k8s.io/kubernetes/pkg/client/testing/core" ) @@ -44,7 +44,7 @@ func (c *FakeRbacV1beta1) RoleBindings(namespace string) v1beta1.RoleBindingInte // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeRbacV1beta1) RESTClient() restclient.Interface { - var ret *restclient.RESTClient +func (c *FakeRbacV1beta1) RESTClient() rest.Interface { + var ret *rest.RESTClient return ret } diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/rbac_client.go b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/rbac_client.go index 11dbb3d5cd..dbce670854 100644 --- a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/rbac_client.go +++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/rbac_client.go @@ -20,12 +20,12 @@ import ( fmt "fmt" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) type RbacV1beta1Interface interface { - RESTClient() restclient.Interface + RESTClient() rest.Interface ClusterRolesGetter ClusterRoleBindingsGetter RolesGetter @@ -34,7 +34,7 @@ type RbacV1beta1Interface interface { // RbacV1beta1Client is used to interact with features provided by the rbac.authorization.k8s.io group. type RbacV1beta1Client struct { - restClient restclient.Interface + restClient rest.Interface } func (c *RbacV1beta1Client) ClusterRoles() ClusterRoleInterface { @@ -54,12 +54,12 @@ func (c *RbacV1beta1Client) RoleBindings(namespace string) RoleBindingInterface } // NewForConfig creates a new RbacV1beta1Client for the given config. -func NewForConfig(c *restclient.Config) (*RbacV1beta1Client, error) { +func NewForConfig(c *rest.Config) (*RbacV1beta1Client, error) { config := *c if err := setConfigDefaults(&config); err != nil { return nil, err } - client, err := restclient.RESTClientFor(&config) + client, err := rest.RESTClientFor(&config) if err != nil { return nil, err } @@ -68,7 +68,7 @@ func NewForConfig(c *restclient.Config) (*RbacV1beta1Client, error) { // NewForConfigOrDie creates a new RbacV1beta1Client for the given config and // panics if there is an error in the config. -func NewForConfigOrDie(c *restclient.Config) *RbacV1beta1Client { +func NewForConfigOrDie(c *rest.Config) *RbacV1beta1Client { client, err := NewForConfig(c) if err != nil { panic(err) @@ -77,11 +77,11 @@ func NewForConfigOrDie(c *restclient.Config) *RbacV1beta1Client { } // New creates a new RbacV1beta1Client for the given RESTClient. -func New(c restclient.Interface) *RbacV1beta1Client { +func New(c rest.Interface) *RbacV1beta1Client { return &RbacV1beta1Client{c} } -func setConfigDefaults(config *restclient.Config) error { +func setConfigDefaults(config *rest.Config) error { gv, err := schema.ParseGroupVersion("rbac.authorization.k8s.io/v1beta1") if err != nil { return err @@ -92,7 +92,7 @@ func setConfigDefaults(config *restclient.Config) error { } config.APIPath = "/apis" if config.UserAgent == "" { - config.UserAgent = restclient.DefaultKubernetesUserAgent() + config.UserAgent = rest.DefaultKubernetesUserAgent() } copyGroupVersion := gv config.GroupVersion = ©GroupVersion @@ -104,7 +104,7 @@ func setConfigDefaults(config *restclient.Config) error { // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *RbacV1beta1Client) RESTClient() restclient.Interface { +func (c *RbacV1beta1Client) RESTClient() rest.Interface { if c == nil { return nil } diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/role.go b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/role.go index 8da6501e73..958516dffe 100644 --- a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/role.go +++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/role.go @@ -20,10 +20,10 @@ import ( meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" v1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // RolesGetter has a method to return a RoleInterface. @@ -47,7 +47,7 @@ type RoleInterface interface { // roles implements RoleInterface type roles struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/rolebinding.go b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/rolebinding.go index 6cfeee95c1..ce490766c6 100644 --- a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/rolebinding.go +++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/rolebinding.go @@ -20,10 +20,10 @@ import ( meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" v1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // RoleBindingsGetter has a method to return a RoleBindingInterface. @@ -47,7 +47,7 @@ type RoleBindingInterface interface { // roleBindings implements RoleBindingInterface type roleBindings struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/BUILD b/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/BUILD index f14f88cd6b..a8dbf06176 100644 --- a/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/BUILD +++ b/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/BUILD @@ -20,12 +20,12 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apis/storage/v1beta1:go_default_library", - "//pkg/client/restclient:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/fake/BUILD b/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/fake/BUILD index d2119655d3..0fc26bd69a 100644 --- a/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/fake/BUILD +++ b/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/fake/BUILD @@ -19,13 +19,13 @@ go_library( "//pkg/api/v1:go_default_library", "//pkg/apis/storage/v1beta1:go_default_library", "//pkg/client/clientset_generated/clientset/typed/storage/v1beta1:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/fake/fake_storage_client.go b/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/fake/fake_storage_client.go index 83394b201d..ac58580602 100644 --- a/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/fake/fake_storage_client.go +++ b/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/fake/fake_storage_client.go @@ -17,8 +17,8 @@ limitations under the License. package fake import ( + rest "k8s.io/client-go/rest" v1beta1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/storage/v1beta1" - restclient "k8s.io/kubernetes/pkg/client/restclient" core "k8s.io/kubernetes/pkg/client/testing/core" ) @@ -32,7 +32,7 @@ func (c *FakeStorageV1beta1) StorageClasses() v1beta1.StorageClassInterface { // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeStorageV1beta1) RESTClient() restclient.Interface { - var ret *restclient.RESTClient +func (c *FakeStorageV1beta1) RESTClient() rest.Interface { + var ret *rest.RESTClient return ret } diff --git a/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/storage_client.go b/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/storage_client.go index 142c14a928..fa29839bd9 100644 --- a/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/storage_client.go +++ b/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/storage_client.go @@ -20,18 +20,18 @@ import ( fmt "fmt" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) type StorageV1beta1Interface interface { - RESTClient() restclient.Interface + RESTClient() rest.Interface StorageClassesGetter } // StorageV1beta1Client is used to interact with features provided by the storage.k8s.io group. type StorageV1beta1Client struct { - restClient restclient.Interface + restClient rest.Interface } func (c *StorageV1beta1Client) StorageClasses() StorageClassInterface { @@ -39,12 +39,12 @@ func (c *StorageV1beta1Client) StorageClasses() StorageClassInterface { } // NewForConfig creates a new StorageV1beta1Client for the given config. -func NewForConfig(c *restclient.Config) (*StorageV1beta1Client, error) { +func NewForConfig(c *rest.Config) (*StorageV1beta1Client, error) { config := *c if err := setConfigDefaults(&config); err != nil { return nil, err } - client, err := restclient.RESTClientFor(&config) + client, err := rest.RESTClientFor(&config) if err != nil { return nil, err } @@ -53,7 +53,7 @@ func NewForConfig(c *restclient.Config) (*StorageV1beta1Client, error) { // NewForConfigOrDie creates a new StorageV1beta1Client for the given config and // panics if there is an error in the config. -func NewForConfigOrDie(c *restclient.Config) *StorageV1beta1Client { +func NewForConfigOrDie(c *rest.Config) *StorageV1beta1Client { client, err := NewForConfig(c) if err != nil { panic(err) @@ -62,11 +62,11 @@ func NewForConfigOrDie(c *restclient.Config) *StorageV1beta1Client { } // New creates a new StorageV1beta1Client for the given RESTClient. -func New(c restclient.Interface) *StorageV1beta1Client { +func New(c rest.Interface) *StorageV1beta1Client { return &StorageV1beta1Client{c} } -func setConfigDefaults(config *restclient.Config) error { +func setConfigDefaults(config *rest.Config) error { gv, err := schema.ParseGroupVersion("storage.k8s.io/v1beta1") if err != nil { return err @@ -77,7 +77,7 @@ func setConfigDefaults(config *restclient.Config) error { } config.APIPath = "/apis" if config.UserAgent == "" { - config.UserAgent = restclient.DefaultKubernetesUserAgent() + config.UserAgent = rest.DefaultKubernetesUserAgent() } copyGroupVersion := gv config.GroupVersion = ©GroupVersion @@ -89,7 +89,7 @@ func setConfigDefaults(config *restclient.Config) error { // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *StorageV1beta1Client) RESTClient() restclient.Interface { +func (c *StorageV1beta1Client) RESTClient() rest.Interface { if c == nil { return nil } diff --git a/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/storageclass.go b/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/storageclass.go index 64f716aa13..92a8530046 100644 --- a/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/storageclass.go +++ b/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/storageclass.go @@ -20,10 +20,10 @@ import ( meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" 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" ) // StorageClassesGetter has a method to return a StorageClassInterface. @@ -47,7 +47,7 @@ type StorageClassInterface interface { // storageClasses implements StorageClassInterface type storageClasses struct { - client restclient.Interface + client rest.Interface } // newStorageClasses returns a StorageClasses diff --git a/pkg/client/clientset_generated/internalclientset/BUILD b/pkg/client/clientset_generated/internalclientset/BUILD index 7446d5cf62..0639817e75 100644 --- a/pkg/client/clientset_generated/internalclientset/BUILD +++ b/pkg/client/clientset_generated/internalclientset/BUILD @@ -40,11 +40,11 @@ go_library( "//pkg/client/clientset_generated/internalclientset/typed/policy/internalversion:go_default_library", "//pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion:go_default_library", "//pkg/client/clientset_generated/internalclientset/typed/storage/internalversion:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/typed/discovery:go_default_library", "//plugin/pkg/client/auth:go_default_library", "//vendor:github.com/golang/glog", "//vendor:k8s.io/client-go/pkg/util/flowcontrol", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/pkg/client/clientset_generated/internalclientset/clientset.go b/pkg/client/clientset_generated/internalclientset/clientset.go index 91aa5ebef2..ee063c5151 100644 --- a/pkg/client/clientset_generated/internalclientset/clientset.go +++ b/pkg/client/clientset_generated/internalclientset/clientset.go @@ -19,6 +19,7 @@ package internalclientset import ( "github.com/golang/glog" "k8s.io/client-go/pkg/util/flowcontrol" + rest "k8s.io/client-go/rest" internalversionapps "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion" internalversionauthentication "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion" internalversionauthorization "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion" @@ -30,7 +31,6 @@ import ( internalversionpolicy "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion" internalversionrbac "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion" internalversionstorage "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion" - restclient "k8s.io/kubernetes/pkg/client/restclient" discovery "k8s.io/kubernetes/pkg/client/typed/discovery" _ "k8s.io/kubernetes/plugin/pkg/client/auth" ) @@ -174,7 +174,7 @@ func (c *Clientset) Discovery() discovery.DiscoveryInterface { } // NewForConfig creates a new Clientset for the given config. -func NewForConfig(c *restclient.Config) (*Clientset, error) { +func NewForConfig(c *rest.Config) (*Clientset, error) { configShallowCopy := *c if configShallowCopy.RateLimiter == nil && configShallowCopy.QPS > 0 { configShallowCopy.RateLimiter = flowcontrol.NewTokenBucketRateLimiter(configShallowCopy.QPS, configShallowCopy.Burst) @@ -236,7 +236,7 @@ func NewForConfig(c *restclient.Config) (*Clientset, error) { // NewForConfigOrDie creates a new Clientset for the given config and // panics if there is an error in the config. -func NewForConfigOrDie(c *restclient.Config) *Clientset { +func NewForConfigOrDie(c *rest.Config) *Clientset { var cs Clientset cs.CoreClient = internalversioncore.NewForConfigOrDie(c) cs.AppsClient = internalversionapps.NewForConfigOrDie(c) @@ -255,7 +255,7 @@ func NewForConfigOrDie(c *restclient.Config) *Clientset { } // New creates a new Clientset for the given RESTClient. -func New(c restclient.Interface) *Clientset { +func New(c rest.Interface) *Clientset { var cs Clientset cs.CoreClient = internalversioncore.New(c) cs.AppsClient = internalversionapps.New(c) diff --git a/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/BUILD b/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/BUILD index 6da44f6483..a8f6c124d9 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/BUILD +++ b/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/BUILD @@ -19,10 +19,10 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/apis/apps:go_default_library", - "//pkg/client/restclient:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/apps_client.go b/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/apps_client.go index c5fa3524ae..df9653ad46 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/apps_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/apps_client.go @@ -17,18 +17,18 @@ limitations under the License. package internalversion import ( + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) type AppsInterface interface { - RESTClient() restclient.Interface + RESTClient() rest.Interface StatefulSetsGetter } // AppsClient is used to interact with features provided by the apps group. type AppsClient struct { - restClient restclient.Interface + restClient rest.Interface } func (c *AppsClient) StatefulSets(namespace string) StatefulSetInterface { @@ -36,12 +36,12 @@ func (c *AppsClient) StatefulSets(namespace string) StatefulSetInterface { } // NewForConfig creates a new AppsClient for the given config. -func NewForConfig(c *restclient.Config) (*AppsClient, error) { +func NewForConfig(c *rest.Config) (*AppsClient, error) { config := *c if err := setConfigDefaults(&config); err != nil { return nil, err } - client, err := restclient.RESTClientFor(&config) + client, err := rest.RESTClientFor(&config) if err != nil { return nil, err } @@ -50,7 +50,7 @@ func NewForConfig(c *restclient.Config) (*AppsClient, error) { // NewForConfigOrDie creates a new AppsClient for the given config and // panics if there is an error in the config. -func NewForConfigOrDie(c *restclient.Config) *AppsClient { +func NewForConfigOrDie(c *rest.Config) *AppsClient { client, err := NewForConfig(c) if err != nil { panic(err) @@ -59,11 +59,11 @@ func NewForConfigOrDie(c *restclient.Config) *AppsClient { } // New creates a new AppsClient for the given RESTClient. -func New(c restclient.Interface) *AppsClient { +func New(c rest.Interface) *AppsClient { return &AppsClient{c} } -func setConfigDefaults(config *restclient.Config) error { +func setConfigDefaults(config *rest.Config) error { // if apps group is not registered, return an error g, err := api.Registry.Group("apps") if err != nil { @@ -71,7 +71,7 @@ func setConfigDefaults(config *restclient.Config) error { } config.APIPath = "/apis" if config.UserAgent == "" { - config.UserAgent = restclient.DefaultKubernetesUserAgent() + config.UserAgent = rest.DefaultKubernetesUserAgent() } if config.GroupVersion == nil || config.GroupVersion.Group != g.GroupVersion.Group { copyGroupVersion := g.GroupVersion @@ -90,7 +90,7 @@ func setConfigDefaults(config *restclient.Config) error { // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *AppsClient) RESTClient() restclient.Interface { +func (c *AppsClient) RESTClient() rest.Interface { if c == nil { return nil } diff --git a/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/fake/BUILD b/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/fake/BUILD index 544f04e203..96d2da3425 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/fake/BUILD +++ b/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/fake/BUILD @@ -19,13 +19,13 @@ go_library( "//pkg/api:go_default_library", "//pkg/apis/apps:go_default_library", "//pkg/client/clientset_generated/internalclientset/typed/apps/internalversion:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/fake/fake_apps_client.go b/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/fake/fake_apps_client.go index 9b1f71c1cb..69f39aea96 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/fake/fake_apps_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/fake/fake_apps_client.go @@ -17,8 +17,8 @@ limitations under the License. package fake import ( + rest "k8s.io/client-go/rest" internalversion "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion" - restclient "k8s.io/kubernetes/pkg/client/restclient" core "k8s.io/kubernetes/pkg/client/testing/core" ) @@ -32,7 +32,7 @@ func (c *FakeApps) StatefulSets(namespace string) internalversion.StatefulSetInt // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeApps) RESTClient() restclient.Interface { - var ret *restclient.RESTClient +func (c *FakeApps) RESTClient() rest.Interface { + var ret *rest.RESTClient return ret } diff --git a/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/statefulset.go b/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/statefulset.go index 77b92a9ed0..8947ee661c 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/statefulset.go +++ b/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/statefulset.go @@ -20,9 +20,9 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" apps "k8s.io/kubernetes/pkg/apis/apps" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // StatefulSetsGetter has a method to return a StatefulSetInterface. @@ -47,7 +47,7 @@ type StatefulSetInterface interface { // statefulSets implements StatefulSetInterface type statefulSets struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/BUILD b/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/BUILD index 93c17e89f9..89dbc89116 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/BUILD +++ b/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/BUILD @@ -20,7 +20,7 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/apis/authentication:go_default_library", - "//pkg/client/restclient:go_default_library", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/authentication_client.go b/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/authentication_client.go index ff45ce11ee..ea971cd67a 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/authentication_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/authentication_client.go @@ -17,18 +17,18 @@ limitations under the License. package internalversion import ( + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) type AuthenticationInterface interface { - RESTClient() restclient.Interface + RESTClient() rest.Interface TokenReviewsGetter } // AuthenticationClient is used to interact with features provided by the authentication.k8s.io group. type AuthenticationClient struct { - restClient restclient.Interface + restClient rest.Interface } func (c *AuthenticationClient) TokenReviews() TokenReviewInterface { @@ -36,12 +36,12 @@ func (c *AuthenticationClient) TokenReviews() TokenReviewInterface { } // NewForConfig creates a new AuthenticationClient for the given config. -func NewForConfig(c *restclient.Config) (*AuthenticationClient, error) { +func NewForConfig(c *rest.Config) (*AuthenticationClient, error) { config := *c if err := setConfigDefaults(&config); err != nil { return nil, err } - client, err := restclient.RESTClientFor(&config) + client, err := rest.RESTClientFor(&config) if err != nil { return nil, err } @@ -50,7 +50,7 @@ func NewForConfig(c *restclient.Config) (*AuthenticationClient, error) { // NewForConfigOrDie creates a new AuthenticationClient for the given config and // panics if there is an error in the config. -func NewForConfigOrDie(c *restclient.Config) *AuthenticationClient { +func NewForConfigOrDie(c *rest.Config) *AuthenticationClient { client, err := NewForConfig(c) if err != nil { panic(err) @@ -59,11 +59,11 @@ func NewForConfigOrDie(c *restclient.Config) *AuthenticationClient { } // New creates a new AuthenticationClient for the given RESTClient. -func New(c restclient.Interface) *AuthenticationClient { +func New(c rest.Interface) *AuthenticationClient { return &AuthenticationClient{c} } -func setConfigDefaults(config *restclient.Config) error { +func setConfigDefaults(config *rest.Config) error { // if authentication group is not registered, return an error g, err := api.Registry.Group("authentication.k8s.io") if err != nil { @@ -71,7 +71,7 @@ func setConfigDefaults(config *restclient.Config) error { } config.APIPath = "/apis" if config.UserAgent == "" { - config.UserAgent = restclient.DefaultKubernetesUserAgent() + config.UserAgent = rest.DefaultKubernetesUserAgent() } if config.GroupVersion == nil || config.GroupVersion.Group != g.GroupVersion.Group { copyGroupVersion := g.GroupVersion @@ -90,7 +90,7 @@ func setConfigDefaults(config *restclient.Config) error { // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *AuthenticationClient) RESTClient() restclient.Interface { +func (c *AuthenticationClient) RESTClient() rest.Interface { if c == nil { return nil } diff --git a/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/fake/BUILD b/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/fake/BUILD index 96f1434863..fce2c0e7ea 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/fake/BUILD +++ b/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/fake/BUILD @@ -20,8 +20,8 @@ go_library( deps = [ "//pkg/apis/authentication:go_default_library", "//pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/testing/core:go_default_library", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/fake/fake_authentication_client.go b/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/fake/fake_authentication_client.go index 20f3330eba..93da718a48 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/fake/fake_authentication_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/fake/fake_authentication_client.go @@ -17,8 +17,8 @@ limitations under the License. package fake import ( + rest "k8s.io/client-go/rest" internalversion "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion" - restclient "k8s.io/kubernetes/pkg/client/restclient" core "k8s.io/kubernetes/pkg/client/testing/core" ) @@ -32,7 +32,7 @@ func (c *FakeAuthentication) TokenReviews() internalversion.TokenReviewInterface // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeAuthentication) RESTClient() restclient.Interface { - var ret *restclient.RESTClient +func (c *FakeAuthentication) RESTClient() rest.Interface { + var ret *rest.RESTClient return ret } diff --git a/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/tokenreview.go b/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/tokenreview.go index d6cbc51f79..c0880edb87 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/tokenreview.go +++ b/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/tokenreview.go @@ -17,7 +17,7 @@ limitations under the License. package internalversion import ( - restclient "k8s.io/kubernetes/pkg/client/restclient" + rest "k8s.io/client-go/rest" ) // TokenReviewsGetter has a method to return a TokenReviewInterface. @@ -33,7 +33,7 @@ type TokenReviewInterface interface { // tokenReviews implements TokenReviewInterface type tokenReviews struct { - client restclient.Interface + client rest.Interface } // newTokenReviews returns a TokenReviews diff --git a/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/BUILD b/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/BUILD index cccce09ff1..7701656a15 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/BUILD +++ b/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/BUILD @@ -24,7 +24,7 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/apis/authorization:go_default_library", - "//pkg/client/restclient:go_default_library", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/authorization_client.go b/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/authorization_client.go index fdda05a6db..9bbd05411c 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/authorization_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/authorization_client.go @@ -17,12 +17,12 @@ limitations under the License. package internalversion import ( + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) type AuthorizationInterface interface { - RESTClient() restclient.Interface + RESTClient() rest.Interface LocalSubjectAccessReviewsGetter SelfSubjectAccessReviewsGetter SubjectAccessReviewsGetter @@ -30,7 +30,7 @@ type AuthorizationInterface interface { // AuthorizationClient is used to interact with features provided by the authorization.k8s.io group. type AuthorizationClient struct { - restClient restclient.Interface + restClient rest.Interface } func (c *AuthorizationClient) LocalSubjectAccessReviews(namespace string) LocalSubjectAccessReviewInterface { @@ -46,12 +46,12 @@ func (c *AuthorizationClient) SubjectAccessReviews() SubjectAccessReviewInterfac } // NewForConfig creates a new AuthorizationClient for the given config. -func NewForConfig(c *restclient.Config) (*AuthorizationClient, error) { +func NewForConfig(c *rest.Config) (*AuthorizationClient, error) { config := *c if err := setConfigDefaults(&config); err != nil { return nil, err } - client, err := restclient.RESTClientFor(&config) + client, err := rest.RESTClientFor(&config) if err != nil { return nil, err } @@ -60,7 +60,7 @@ func NewForConfig(c *restclient.Config) (*AuthorizationClient, error) { // NewForConfigOrDie creates a new AuthorizationClient for the given config and // panics if there is an error in the config. -func NewForConfigOrDie(c *restclient.Config) *AuthorizationClient { +func NewForConfigOrDie(c *rest.Config) *AuthorizationClient { client, err := NewForConfig(c) if err != nil { panic(err) @@ -69,11 +69,11 @@ func NewForConfigOrDie(c *restclient.Config) *AuthorizationClient { } // New creates a new AuthorizationClient for the given RESTClient. -func New(c restclient.Interface) *AuthorizationClient { +func New(c rest.Interface) *AuthorizationClient { return &AuthorizationClient{c} } -func setConfigDefaults(config *restclient.Config) error { +func setConfigDefaults(config *rest.Config) error { // if authorization group is not registered, return an error g, err := api.Registry.Group("authorization.k8s.io") if err != nil { @@ -81,7 +81,7 @@ func setConfigDefaults(config *restclient.Config) error { } config.APIPath = "/apis" if config.UserAgent == "" { - config.UserAgent = restclient.DefaultKubernetesUserAgent() + config.UserAgent = rest.DefaultKubernetesUserAgent() } if config.GroupVersion == nil || config.GroupVersion.Group != g.GroupVersion.Group { copyGroupVersion := g.GroupVersion @@ -100,7 +100,7 @@ func setConfigDefaults(config *restclient.Config) error { // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *AuthorizationClient) RESTClient() restclient.Interface { +func (c *AuthorizationClient) RESTClient() rest.Interface { if c == nil { return nil } diff --git a/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/fake/BUILD b/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/fake/BUILD index 704513ac51..4f3bd44ca2 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/fake/BUILD +++ b/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/fake/BUILD @@ -24,8 +24,8 @@ go_library( deps = [ "//pkg/apis/authorization:go_default_library", "//pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/testing/core:go_default_library", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/fake/fake_authorization_client.go b/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/fake/fake_authorization_client.go index 5c34558d38..4c32605ceb 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/fake/fake_authorization_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/fake/fake_authorization_client.go @@ -17,8 +17,8 @@ limitations under the License. package fake import ( + rest "k8s.io/client-go/rest" internalversion "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion" - restclient "k8s.io/kubernetes/pkg/client/restclient" core "k8s.io/kubernetes/pkg/client/testing/core" ) @@ -40,7 +40,7 @@ func (c *FakeAuthorization) SubjectAccessReviews() internalversion.SubjectAccess // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeAuthorization) RESTClient() restclient.Interface { - var ret *restclient.RESTClient +func (c *FakeAuthorization) RESTClient() rest.Interface { + var ret *rest.RESTClient return ret } diff --git a/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/localsubjectaccessreview.go b/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/localsubjectaccessreview.go index cc5805657a..bf02fad768 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/localsubjectaccessreview.go +++ b/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/localsubjectaccessreview.go @@ -17,7 +17,7 @@ limitations under the License. package internalversion import ( - restclient "k8s.io/kubernetes/pkg/client/restclient" + rest "k8s.io/client-go/rest" ) // LocalSubjectAccessReviewsGetter has a method to return a LocalSubjectAccessReviewInterface. @@ -33,7 +33,7 @@ type LocalSubjectAccessReviewInterface interface { // localSubjectAccessReviews implements LocalSubjectAccessReviewInterface type localSubjectAccessReviews struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/selfsubjectaccessreview.go b/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/selfsubjectaccessreview.go index 961e37c8c0..cb19357c48 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/selfsubjectaccessreview.go +++ b/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/selfsubjectaccessreview.go @@ -17,7 +17,7 @@ limitations under the License. package internalversion import ( - restclient "k8s.io/kubernetes/pkg/client/restclient" + rest "k8s.io/client-go/rest" ) // SelfSubjectAccessReviewsGetter has a method to return a SelfSubjectAccessReviewInterface. @@ -33,7 +33,7 @@ type SelfSubjectAccessReviewInterface interface { // selfSubjectAccessReviews implements SelfSubjectAccessReviewInterface type selfSubjectAccessReviews struct { - client restclient.Interface + client rest.Interface } // newSelfSubjectAccessReviews returns a SelfSubjectAccessReviews diff --git a/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/subjectaccessreview.go b/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/subjectaccessreview.go index e11f016238..456b469b19 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/subjectaccessreview.go +++ b/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/subjectaccessreview.go @@ -17,7 +17,7 @@ limitations under the License. package internalversion import ( - restclient "k8s.io/kubernetes/pkg/client/restclient" + rest "k8s.io/client-go/rest" ) // SubjectAccessReviewsGetter has a method to return a SubjectAccessReviewInterface. @@ -33,7 +33,7 @@ type SubjectAccessReviewInterface interface { // subjectAccessReviews implements SubjectAccessReviewInterface type subjectAccessReviews struct { - client restclient.Interface + client rest.Interface } // newSubjectAccessReviews returns a SubjectAccessReviews diff --git a/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/BUILD b/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/BUILD index b1d2c37cf5..d5f2d174d6 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/BUILD +++ b/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/BUILD @@ -19,10 +19,10 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/apis/autoscaling:go_default_library", - "//pkg/client/restclient:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/autoscaling_client.go b/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/autoscaling_client.go index 0384256c98..325e11ba02 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/autoscaling_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/autoscaling_client.go @@ -17,18 +17,18 @@ limitations under the License. package internalversion import ( + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) type AutoscalingInterface interface { - RESTClient() restclient.Interface + RESTClient() rest.Interface HorizontalPodAutoscalersGetter } // AutoscalingClient is used to interact with features provided by the autoscaling group. type AutoscalingClient struct { - restClient restclient.Interface + restClient rest.Interface } func (c *AutoscalingClient) HorizontalPodAutoscalers(namespace string) HorizontalPodAutoscalerInterface { @@ -36,12 +36,12 @@ func (c *AutoscalingClient) HorizontalPodAutoscalers(namespace string) Horizonta } // NewForConfig creates a new AutoscalingClient for the given config. -func NewForConfig(c *restclient.Config) (*AutoscalingClient, error) { +func NewForConfig(c *rest.Config) (*AutoscalingClient, error) { config := *c if err := setConfigDefaults(&config); err != nil { return nil, err } - client, err := restclient.RESTClientFor(&config) + client, err := rest.RESTClientFor(&config) if err != nil { return nil, err } @@ -50,7 +50,7 @@ func NewForConfig(c *restclient.Config) (*AutoscalingClient, error) { // NewForConfigOrDie creates a new AutoscalingClient for the given config and // panics if there is an error in the config. -func NewForConfigOrDie(c *restclient.Config) *AutoscalingClient { +func NewForConfigOrDie(c *rest.Config) *AutoscalingClient { client, err := NewForConfig(c) if err != nil { panic(err) @@ -59,11 +59,11 @@ func NewForConfigOrDie(c *restclient.Config) *AutoscalingClient { } // New creates a new AutoscalingClient for the given RESTClient. -func New(c restclient.Interface) *AutoscalingClient { +func New(c rest.Interface) *AutoscalingClient { return &AutoscalingClient{c} } -func setConfigDefaults(config *restclient.Config) error { +func setConfigDefaults(config *rest.Config) error { // if autoscaling group is not registered, return an error g, err := api.Registry.Group("autoscaling") if err != nil { @@ -71,7 +71,7 @@ func setConfigDefaults(config *restclient.Config) error { } config.APIPath = "/apis" if config.UserAgent == "" { - config.UserAgent = restclient.DefaultKubernetesUserAgent() + config.UserAgent = rest.DefaultKubernetesUserAgent() } if config.GroupVersion == nil || config.GroupVersion.Group != g.GroupVersion.Group { copyGroupVersion := g.GroupVersion @@ -90,7 +90,7 @@ func setConfigDefaults(config *restclient.Config) error { // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *AutoscalingClient) RESTClient() restclient.Interface { +func (c *AutoscalingClient) RESTClient() rest.Interface { if c == nil { return nil } diff --git a/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/fake/BUILD b/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/fake/BUILD index 5ffcf7d775..0a47501863 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/fake/BUILD +++ b/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/fake/BUILD @@ -19,13 +19,13 @@ go_library( "//pkg/api:go_default_library", "//pkg/apis/autoscaling:go_default_library", "//pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/fake/fake_autoscaling_client.go b/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/fake/fake_autoscaling_client.go index 07e962152f..e427da90bc 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/fake/fake_autoscaling_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/fake/fake_autoscaling_client.go @@ -17,8 +17,8 @@ limitations under the License. package fake import ( + rest "k8s.io/client-go/rest" internalversion "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion" - restclient "k8s.io/kubernetes/pkg/client/restclient" core "k8s.io/kubernetes/pkg/client/testing/core" ) @@ -32,7 +32,7 @@ func (c *FakeAutoscaling) HorizontalPodAutoscalers(namespace string) internalver // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeAutoscaling) RESTClient() restclient.Interface { - var ret *restclient.RESTClient +func (c *FakeAutoscaling) RESTClient() rest.Interface { + var ret *rest.RESTClient return ret } diff --git a/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/horizontalpodautoscaler.go b/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/horizontalpodautoscaler.go index 572586f03a..74bf1376e9 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/horizontalpodautoscaler.go +++ b/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/horizontalpodautoscaler.go @@ -20,9 +20,9 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" autoscaling "k8s.io/kubernetes/pkg/apis/autoscaling" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // HorizontalPodAutoscalersGetter has a method to return a HorizontalPodAutoscalerInterface. @@ -47,7 +47,7 @@ type HorizontalPodAutoscalerInterface interface { // horizontalPodAutoscalers implements HorizontalPodAutoscalerInterface type horizontalPodAutoscalers struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/BUILD b/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/BUILD index e8275ed310..ddad532047 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/BUILD +++ b/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/BUILD @@ -20,10 +20,10 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/apis/batch:go_default_library", - "//pkg/client/restclient:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/batch_client.go b/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/batch_client.go index 6b3525b3ef..90866b44fb 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/batch_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/batch_client.go @@ -17,19 +17,19 @@ limitations under the License. package internalversion import ( + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) type BatchInterface interface { - RESTClient() restclient.Interface + RESTClient() rest.Interface CronJobsGetter JobsGetter } // BatchClient is used to interact with features provided by the batch group. type BatchClient struct { - restClient restclient.Interface + restClient rest.Interface } func (c *BatchClient) CronJobs(namespace string) CronJobInterface { @@ -41,12 +41,12 @@ func (c *BatchClient) Jobs(namespace string) JobInterface { } // NewForConfig creates a new BatchClient for the given config. -func NewForConfig(c *restclient.Config) (*BatchClient, error) { +func NewForConfig(c *rest.Config) (*BatchClient, error) { config := *c if err := setConfigDefaults(&config); err != nil { return nil, err } - client, err := restclient.RESTClientFor(&config) + client, err := rest.RESTClientFor(&config) if err != nil { return nil, err } @@ -55,7 +55,7 @@ func NewForConfig(c *restclient.Config) (*BatchClient, error) { // NewForConfigOrDie creates a new BatchClient for the given config and // panics if there is an error in the config. -func NewForConfigOrDie(c *restclient.Config) *BatchClient { +func NewForConfigOrDie(c *rest.Config) *BatchClient { client, err := NewForConfig(c) if err != nil { panic(err) @@ -64,11 +64,11 @@ func NewForConfigOrDie(c *restclient.Config) *BatchClient { } // New creates a new BatchClient for the given RESTClient. -func New(c restclient.Interface) *BatchClient { +func New(c rest.Interface) *BatchClient { return &BatchClient{c} } -func setConfigDefaults(config *restclient.Config) error { +func setConfigDefaults(config *rest.Config) error { // if batch group is not registered, return an error g, err := api.Registry.Group("batch") if err != nil { @@ -76,7 +76,7 @@ func setConfigDefaults(config *restclient.Config) error { } config.APIPath = "/apis" if config.UserAgent == "" { - config.UserAgent = restclient.DefaultKubernetesUserAgent() + config.UserAgent = rest.DefaultKubernetesUserAgent() } if config.GroupVersion == nil || config.GroupVersion.Group != g.GroupVersion.Group { copyGroupVersion := g.GroupVersion @@ -95,7 +95,7 @@ func setConfigDefaults(config *restclient.Config) error { // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *BatchClient) RESTClient() restclient.Interface { +func (c *BatchClient) RESTClient() rest.Interface { if c == nil { return nil } diff --git a/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/cronjob.go b/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/cronjob.go index 81a92a3433..89ebf2efd9 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/cronjob.go +++ b/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/cronjob.go @@ -20,9 +20,9 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" batch "k8s.io/kubernetes/pkg/apis/batch" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // CronJobsGetter has a method to return a CronJobInterface. @@ -47,7 +47,7 @@ type CronJobInterface interface { // cronJobs implements CronJobInterface type cronJobs struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/fake/BUILD b/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/fake/BUILD index 799768c2b7..e2a3ba8382 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/fake/BUILD +++ b/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/fake/BUILD @@ -20,13 +20,13 @@ go_library( "//pkg/api:go_default_library", "//pkg/apis/batch:go_default_library", "//pkg/client/clientset_generated/internalclientset/typed/batch/internalversion:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/fake/fake_batch_client.go b/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/fake/fake_batch_client.go index 8adbdac56c..a1ad34c6dc 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/fake/fake_batch_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/fake/fake_batch_client.go @@ -17,8 +17,8 @@ limitations under the License. package fake import ( + rest "k8s.io/client-go/rest" internalversion "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion" - restclient "k8s.io/kubernetes/pkg/client/restclient" core "k8s.io/kubernetes/pkg/client/testing/core" ) @@ -36,7 +36,7 @@ func (c *FakeBatch) Jobs(namespace string) internalversion.JobInterface { // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeBatch) RESTClient() restclient.Interface { - var ret *restclient.RESTClient +func (c *FakeBatch) RESTClient() rest.Interface { + var ret *rest.RESTClient return ret } diff --git a/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/job.go b/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/job.go index 9e24c6436d..53fea7e604 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/job.go +++ b/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/job.go @@ -20,9 +20,9 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" batch "k8s.io/kubernetes/pkg/apis/batch" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // JobsGetter has a method to return a JobInterface. @@ -47,7 +47,7 @@ type JobInterface interface { // jobs implements JobInterface type jobs struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/BUILD b/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/BUILD index f5e210ab21..baf0d8510d 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/BUILD +++ b/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/BUILD @@ -20,10 +20,10 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/apis/certificates:go_default_library", - "//pkg/client/restclient:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/certificates_client.go b/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/certificates_client.go index 7814661579..692461bc69 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/certificates_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/certificates_client.go @@ -17,18 +17,18 @@ limitations under the License. package internalversion import ( + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) type CertificatesInterface interface { - RESTClient() restclient.Interface + RESTClient() rest.Interface CertificateSigningRequestsGetter } // CertificatesClient is used to interact with features provided by the certificates.k8s.io group. type CertificatesClient struct { - restClient restclient.Interface + restClient rest.Interface } func (c *CertificatesClient) CertificateSigningRequests() CertificateSigningRequestInterface { @@ -36,12 +36,12 @@ func (c *CertificatesClient) CertificateSigningRequests() CertificateSigningRequ } // NewForConfig creates a new CertificatesClient for the given config. -func NewForConfig(c *restclient.Config) (*CertificatesClient, error) { +func NewForConfig(c *rest.Config) (*CertificatesClient, error) { config := *c if err := setConfigDefaults(&config); err != nil { return nil, err } - client, err := restclient.RESTClientFor(&config) + client, err := rest.RESTClientFor(&config) if err != nil { return nil, err } @@ -50,7 +50,7 @@ func NewForConfig(c *restclient.Config) (*CertificatesClient, error) { // NewForConfigOrDie creates a new CertificatesClient for the given config and // panics if there is an error in the config. -func NewForConfigOrDie(c *restclient.Config) *CertificatesClient { +func NewForConfigOrDie(c *rest.Config) *CertificatesClient { client, err := NewForConfig(c) if err != nil { panic(err) @@ -59,11 +59,11 @@ func NewForConfigOrDie(c *restclient.Config) *CertificatesClient { } // New creates a new CertificatesClient for the given RESTClient. -func New(c restclient.Interface) *CertificatesClient { +func New(c rest.Interface) *CertificatesClient { return &CertificatesClient{c} } -func setConfigDefaults(config *restclient.Config) error { +func setConfigDefaults(config *rest.Config) error { // if certificates group is not registered, return an error g, err := api.Registry.Group("certificates.k8s.io") if err != nil { @@ -71,7 +71,7 @@ func setConfigDefaults(config *restclient.Config) error { } config.APIPath = "/apis" if config.UserAgent == "" { - config.UserAgent = restclient.DefaultKubernetesUserAgent() + config.UserAgent = rest.DefaultKubernetesUserAgent() } if config.GroupVersion == nil || config.GroupVersion.Group != g.GroupVersion.Group { copyGroupVersion := g.GroupVersion @@ -90,7 +90,7 @@ func setConfigDefaults(config *restclient.Config) error { // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *CertificatesClient) RESTClient() restclient.Interface { +func (c *CertificatesClient) RESTClient() rest.Interface { if c == nil { return nil } diff --git a/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/certificatesigningrequest.go b/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/certificatesigningrequest.go index e7b61c2500..6cb7d2622e 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/certificatesigningrequest.go +++ b/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/certificatesigningrequest.go @@ -20,9 +20,9 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" certificates "k8s.io/kubernetes/pkg/apis/certificates" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // CertificateSigningRequestsGetter has a method to return a CertificateSigningRequestInterface. @@ -47,7 +47,7 @@ type CertificateSigningRequestInterface interface { // certificateSigningRequests implements CertificateSigningRequestInterface type certificateSigningRequests struct { - client restclient.Interface + client rest.Interface } // newCertificateSigningRequests returns a CertificateSigningRequests diff --git a/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/fake/BUILD b/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/fake/BUILD index 482cb960be..2414e40175 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/fake/BUILD +++ b/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/fake/BUILD @@ -20,13 +20,13 @@ go_library( "//pkg/api:go_default_library", "//pkg/apis/certificates:go_default_library", "//pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/fake/fake_certificates_client.go b/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/fake/fake_certificates_client.go index 9ea0c45c9c..dfb1a2d8f9 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/fake/fake_certificates_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/fake/fake_certificates_client.go @@ -17,8 +17,8 @@ limitations under the License. package fake import ( + rest "k8s.io/client-go/rest" internalversion "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion" - restclient "k8s.io/kubernetes/pkg/client/restclient" core "k8s.io/kubernetes/pkg/client/testing/core" ) @@ -32,7 +32,7 @@ func (c *FakeCertificates) CertificateSigningRequests() internalversion.Certific // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeCertificates) RESTClient() restclient.Interface { - var ret *restclient.RESTClient +func (c *FakeCertificates) RESTClient() rest.Interface { + var ret *rest.RESTClient return ret } diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/BUILD b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/BUILD index b897830eed..cbde75b71a 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/BUILD +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/BUILD @@ -39,13 +39,13 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/v1:go_default_library", - "//pkg/client/restclient:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/fields", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/util/net", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/componentstatus.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/componentstatus.go index 5f6761f2e9..da735d6270 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/componentstatus.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/componentstatus.go @@ -20,8 +20,8 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // ComponentStatusesGetter has a method to return a ComponentStatusInterface. @@ -45,7 +45,7 @@ type ComponentStatusInterface interface { // componentStatuses implements ComponentStatusInterface type componentStatuses struct { - client restclient.Interface + client rest.Interface } // newComponentStatuses returns a ComponentStatuses diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/configmap.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/configmap.go index 5d2f111e4a..cc5accb295 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/configmap.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/configmap.go @@ -20,8 +20,8 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // ConfigMapsGetter has a method to return a ConfigMapInterface. @@ -45,7 +45,7 @@ type ConfigMapInterface interface { // configMaps implements ConfigMapInterface type configMaps struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/core_client.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/core_client.go index 39fe89d655..b20f00053d 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/core_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/core_client.go @@ -17,12 +17,12 @@ limitations under the License. package internalversion import ( + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) type CoreInterface interface { - RESTClient() restclient.Interface + RESTClient() rest.Interface ComponentStatusesGetter ConfigMapsGetter EndpointsGetter @@ -43,7 +43,7 @@ type CoreInterface interface { // CoreClient is used to interact with features provided by the group. type CoreClient struct { - restClient restclient.Interface + restClient rest.Interface } func (c *CoreClient) ComponentStatuses() ComponentStatusInterface { @@ -111,12 +111,12 @@ func (c *CoreClient) ServiceAccounts(namespace string) ServiceAccountInterface { } // NewForConfig creates a new CoreClient for the given config. -func NewForConfig(c *restclient.Config) (*CoreClient, error) { +func NewForConfig(c *rest.Config) (*CoreClient, error) { config := *c if err := setConfigDefaults(&config); err != nil { return nil, err } - client, err := restclient.RESTClientFor(&config) + client, err := rest.RESTClientFor(&config) if err != nil { return nil, err } @@ -125,7 +125,7 @@ func NewForConfig(c *restclient.Config) (*CoreClient, error) { // NewForConfigOrDie creates a new CoreClient for the given config and // panics if there is an error in the config. -func NewForConfigOrDie(c *restclient.Config) *CoreClient { +func NewForConfigOrDie(c *rest.Config) *CoreClient { client, err := NewForConfig(c) if err != nil { panic(err) @@ -134,11 +134,11 @@ func NewForConfigOrDie(c *restclient.Config) *CoreClient { } // New creates a new CoreClient for the given RESTClient. -func New(c restclient.Interface) *CoreClient { +func New(c rest.Interface) *CoreClient { return &CoreClient{c} } -func setConfigDefaults(config *restclient.Config) error { +func setConfigDefaults(config *rest.Config) error { // if core group is not registered, return an error g, err := api.Registry.Group("") if err != nil { @@ -146,7 +146,7 @@ func setConfigDefaults(config *restclient.Config) error { } config.APIPath = "/api" if config.UserAgent == "" { - config.UserAgent = restclient.DefaultKubernetesUserAgent() + config.UserAgent = rest.DefaultKubernetesUserAgent() } if config.GroupVersion == nil || config.GroupVersion.Group != g.GroupVersion.Group { copyGroupVersion := g.GroupVersion @@ -165,7 +165,7 @@ func setConfigDefaults(config *restclient.Config) error { // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *CoreClient) RESTClient() restclient.Interface { +func (c *CoreClient) RESTClient() rest.Interface { if c == nil { return nil } diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/endpoints.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/endpoints.go index df77d46c4b..eb5134b2b8 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/endpoints.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/endpoints.go @@ -20,8 +20,8 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // EndpointsGetter has a method to return a EndpointsInterface. @@ -45,7 +45,7 @@ type EndpointsInterface interface { // endpoints implements EndpointsInterface type endpoints struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/event.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/event.go index d8f20e2710..bbb6a39843 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/event.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/event.go @@ -20,8 +20,8 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // EventsGetter has a method to return a EventInterface. @@ -45,7 +45,7 @@ type EventInterface interface { // events implements EventInterface type events struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/BUILD b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/BUILD index bbdfd0793b..03d34850a6 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/BUILD +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/BUILD @@ -38,7 +38,6 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/client/clientset_generated/internalclientset/typed/core/internalversion:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/fields", @@ -47,6 +46,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_core_client.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_core_client.go index 10f001b43f..da9719b5fe 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_core_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_core_client.go @@ -17,8 +17,8 @@ limitations under the License. package fake import ( + rest "k8s.io/client-go/rest" internalversion "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" - restclient "k8s.io/kubernetes/pkg/client/restclient" core "k8s.io/kubernetes/pkg/client/testing/core" ) @@ -92,7 +92,7 @@ func (c *FakeCore) ServiceAccounts(namespace string) internalversion.ServiceAcco // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeCore) RESTClient() restclient.Interface { - var ret *restclient.RESTClient +func (c *FakeCore) RESTClient() rest.Interface { + var ret *rest.RESTClient return ret } diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/limitrange.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/limitrange.go index 0481ce46d4..8b30bbb6e0 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/limitrange.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/limitrange.go @@ -20,8 +20,8 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // LimitRangesGetter has a method to return a LimitRangeInterface. @@ -45,7 +45,7 @@ type LimitRangeInterface interface { // limitRanges implements LimitRangeInterface type limitRanges struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/namespace.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/namespace.go index 3c33dc4457..7cec0560ca 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/namespace.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/namespace.go @@ -20,8 +20,8 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // NamespacesGetter has a method to return a NamespaceInterface. @@ -46,7 +46,7 @@ type NamespaceInterface interface { // namespaces implements NamespaceInterface type namespaces struct { - client restclient.Interface + client rest.Interface } // newNamespaces returns a Namespaces diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/node.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/node.go index e02210d6e4..4ee65b2ca1 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/node.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/node.go @@ -20,8 +20,8 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // NodesGetter has a method to return a NodeInterface. @@ -46,7 +46,7 @@ type NodeInterface interface { // nodes implements NodeInterface type nodes struct { - client restclient.Interface + client rest.Interface } // newNodes returns a Nodes diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/persistentvolume.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/persistentvolume.go index 72876d1a0a..88c7308275 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/persistentvolume.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/persistentvolume.go @@ -20,8 +20,8 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // PersistentVolumesGetter has a method to return a PersistentVolumeInterface. @@ -46,7 +46,7 @@ type PersistentVolumeInterface interface { // persistentVolumes implements PersistentVolumeInterface type persistentVolumes struct { - client restclient.Interface + client rest.Interface } // newPersistentVolumes returns a PersistentVolumes diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/persistentvolumeclaim.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/persistentvolumeclaim.go index 66e2d8e11e..85ad719e65 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/persistentvolumeclaim.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/persistentvolumeclaim.go @@ -20,8 +20,8 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // PersistentVolumeClaimsGetter has a method to return a PersistentVolumeClaimInterface. @@ -46,7 +46,7 @@ type PersistentVolumeClaimInterface interface { // persistentVolumeClaims implements PersistentVolumeClaimInterface type persistentVolumeClaims struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/pod.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/pod.go index ebdf0fca2c..5e0dce9d38 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/pod.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/pod.go @@ -20,8 +20,8 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // PodsGetter has a method to return a PodInterface. @@ -46,7 +46,7 @@ type PodInterface interface { // pods implements PodInterface type pods struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/podtemplate.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/podtemplate.go index 0c15928200..066f157d09 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/podtemplate.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/podtemplate.go @@ -20,8 +20,8 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // PodTemplatesGetter has a method to return a PodTemplateInterface. @@ -45,7 +45,7 @@ type PodTemplateInterface interface { // podTemplates implements PodTemplateInterface type podTemplates struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/replicationcontroller.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/replicationcontroller.go index 717bf34921..5c5f7e4524 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/replicationcontroller.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/replicationcontroller.go @@ -20,8 +20,8 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // ReplicationControllersGetter has a method to return a ReplicationControllerInterface. @@ -46,7 +46,7 @@ type ReplicationControllerInterface interface { // replicationControllers implements ReplicationControllerInterface type replicationControllers struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/resourcequota.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/resourcequota.go index 1ed3f99824..24cc8bae50 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/resourcequota.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/resourcequota.go @@ -20,8 +20,8 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // ResourceQuotasGetter has a method to return a ResourceQuotaInterface. @@ -46,7 +46,7 @@ type ResourceQuotaInterface interface { // resourceQuotas implements ResourceQuotaInterface type resourceQuotas struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/secret.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/secret.go index 5707ff1f70..29902d461f 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/secret.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/secret.go @@ -20,8 +20,8 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // SecretsGetter has a method to return a SecretInterface. @@ -45,7 +45,7 @@ type SecretInterface interface { // secrets implements SecretInterface type secrets struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/service.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/service.go index abfe3bea06..c83fbd95eb 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/service.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/service.go @@ -20,8 +20,8 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // ServicesGetter has a method to return a ServiceInterface. @@ -46,7 +46,7 @@ type ServiceInterface interface { // services implements ServiceInterface type services struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/serviceaccount.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/serviceaccount.go index c99a5523fb..9690913b71 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/serviceaccount.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/serviceaccount.go @@ -20,8 +20,8 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // ServiceAccountsGetter has a method to return a ServiceAccountInterface. @@ -45,7 +45,7 @@ type ServiceAccountInterface interface { // serviceAccounts implements ServiceAccountInterface type serviceAccounts struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/BUILD b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/BUILD index d5fd52fa0c..a9795f2eff 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/BUILD +++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/BUILD @@ -28,12 +28,12 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/apis/extensions:go_default_library", - "//pkg/client/restclient:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/meta", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/daemonset.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/daemonset.go index 98f6c2e327..c6ab08f065 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/daemonset.go +++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/daemonset.go @@ -20,9 +20,9 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" extensions "k8s.io/kubernetes/pkg/apis/extensions" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // DaemonSetsGetter has a method to return a DaemonSetInterface. @@ -47,7 +47,7 @@ type DaemonSetInterface interface { // daemonSets implements DaemonSetInterface type daemonSets struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/deployment.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/deployment.go index 0426b40c63..d48ea58051 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/deployment.go +++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/deployment.go @@ -20,9 +20,9 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" extensions "k8s.io/kubernetes/pkg/apis/extensions" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // DeploymentsGetter has a method to return a DeploymentInterface. @@ -47,7 +47,7 @@ type DeploymentInterface interface { // deployments implements DeploymentInterface type deployments struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/extensions_client.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/extensions_client.go index b3448f7d52..31a0fddeff 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/extensions_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/extensions_client.go @@ -17,12 +17,12 @@ limitations under the License. package internalversion import ( + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) type ExtensionsInterface interface { - RESTClient() restclient.Interface + RESTClient() rest.Interface DaemonSetsGetter DeploymentsGetter IngressesGetter @@ -35,7 +35,7 @@ type ExtensionsInterface interface { // ExtensionsClient is used to interact with features provided by the extensions group. type ExtensionsClient struct { - restClient restclient.Interface + restClient rest.Interface } func (c *ExtensionsClient) DaemonSets(namespace string) DaemonSetInterface { @@ -71,12 +71,12 @@ func (c *ExtensionsClient) ThirdPartyResources() ThirdPartyResourceInterface { } // NewForConfig creates a new ExtensionsClient for the given config. -func NewForConfig(c *restclient.Config) (*ExtensionsClient, error) { +func NewForConfig(c *rest.Config) (*ExtensionsClient, error) { config := *c if err := setConfigDefaults(&config); err != nil { return nil, err } - client, err := restclient.RESTClientFor(&config) + client, err := rest.RESTClientFor(&config) if err != nil { return nil, err } @@ -85,7 +85,7 @@ func NewForConfig(c *restclient.Config) (*ExtensionsClient, error) { // NewForConfigOrDie creates a new ExtensionsClient for the given config and // panics if there is an error in the config. -func NewForConfigOrDie(c *restclient.Config) *ExtensionsClient { +func NewForConfigOrDie(c *rest.Config) *ExtensionsClient { client, err := NewForConfig(c) if err != nil { panic(err) @@ -94,11 +94,11 @@ func NewForConfigOrDie(c *restclient.Config) *ExtensionsClient { } // New creates a new ExtensionsClient for the given RESTClient. -func New(c restclient.Interface) *ExtensionsClient { +func New(c rest.Interface) *ExtensionsClient { return &ExtensionsClient{c} } -func setConfigDefaults(config *restclient.Config) error { +func setConfigDefaults(config *rest.Config) error { // if extensions group is not registered, return an error g, err := api.Registry.Group("extensions") if err != nil { @@ -106,7 +106,7 @@ func setConfigDefaults(config *restclient.Config) error { } config.APIPath = "/apis" if config.UserAgent == "" { - config.UserAgent = restclient.DefaultKubernetesUserAgent() + config.UserAgent = rest.DefaultKubernetesUserAgent() } if config.GroupVersion == nil || config.GroupVersion.Group != g.GroupVersion.Group { copyGroupVersion := g.GroupVersion @@ -125,7 +125,7 @@ func setConfigDefaults(config *restclient.Config) error { // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *ExtensionsClient) RESTClient() restclient.Interface { +func (c *ExtensionsClient) RESTClient() rest.Interface { if c == nil { return nil } diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/BUILD b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/BUILD index 97279a0925..44925be268 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/BUILD +++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/BUILD @@ -28,13 +28,13 @@ go_library( "//pkg/api:go_default_library", "//pkg/apis/extensions:go_default_library", "//pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_extensions_client.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_extensions_client.go index d2805ef00c..b8577c43c7 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_extensions_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_extensions_client.go @@ -17,8 +17,8 @@ limitations under the License. package fake import ( + rest "k8s.io/client-go/rest" internalversion "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion" - restclient "k8s.io/kubernetes/pkg/client/restclient" core "k8s.io/kubernetes/pkg/client/testing/core" ) @@ -60,7 +60,7 @@ func (c *FakeExtensions) ThirdPartyResources() internalversion.ThirdPartyResourc // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeExtensions) RESTClient() restclient.Interface { - var ret *restclient.RESTClient +func (c *FakeExtensions) RESTClient() rest.Interface { + var ret *rest.RESTClient return ret } diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/ingress.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/ingress.go index bd99ec11ea..b026e2e33a 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/ingress.go +++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/ingress.go @@ -20,9 +20,9 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" extensions "k8s.io/kubernetes/pkg/apis/extensions" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // IngressesGetter has a method to return a IngressInterface. @@ -47,7 +47,7 @@ type IngressInterface interface { // ingresses implements IngressInterface type ingresses struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/networkpolicy.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/networkpolicy.go index de6d7c4b7e..ef939abbbf 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/networkpolicy.go +++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/networkpolicy.go @@ -20,9 +20,9 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" extensions "k8s.io/kubernetes/pkg/apis/extensions" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // NetworkPoliciesGetter has a method to return a NetworkPolicyInterface. @@ -46,7 +46,7 @@ type NetworkPolicyInterface interface { // networkPolicies implements NetworkPolicyInterface type networkPolicies struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/podsecuritypolicy.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/podsecuritypolicy.go index 4d284722d5..8670364377 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/podsecuritypolicy.go +++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/podsecuritypolicy.go @@ -20,9 +20,9 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" extensions "k8s.io/kubernetes/pkg/apis/extensions" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // PodSecurityPoliciesGetter has a method to return a PodSecurityPolicyInterface. @@ -46,7 +46,7 @@ type PodSecurityPolicyInterface interface { // podSecurityPolicies implements PodSecurityPolicyInterface type podSecurityPolicies struct { - client restclient.Interface + client rest.Interface } // newPodSecurityPolicies returns a PodSecurityPolicies diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/replicaset.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/replicaset.go index 1410821881..5de36beb0f 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/replicaset.go +++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/replicaset.go @@ -20,9 +20,9 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" extensions "k8s.io/kubernetes/pkg/apis/extensions" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // ReplicaSetsGetter has a method to return a ReplicaSetInterface. @@ -47,7 +47,7 @@ type ReplicaSetInterface interface { // replicaSets implements ReplicaSetInterface type replicaSets struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/scale.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/scale.go index 892a07e37b..ad1d91b015 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/scale.go +++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/scale.go @@ -17,7 +17,7 @@ limitations under the License. package internalversion import ( - restclient "k8s.io/kubernetes/pkg/client/restclient" + rest "k8s.io/client-go/rest" ) // ScalesGetter has a method to return a ScaleInterface. @@ -33,7 +33,7 @@ type ScaleInterface interface { // scales implements ScaleInterface type scales struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/thirdpartyresource.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/thirdpartyresource.go index 3746fe0b38..66777e7be0 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/thirdpartyresource.go +++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/thirdpartyresource.go @@ -20,9 +20,9 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" extensions "k8s.io/kubernetes/pkg/apis/extensions" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // ThirdPartyResourcesGetter has a method to return a ThirdPartyResourceInterface. @@ -46,7 +46,7 @@ type ThirdPartyResourceInterface interface { // thirdPartyResources implements ThirdPartyResourceInterface type thirdPartyResources struct { - client restclient.Interface + client rest.Interface } // newThirdPartyResources returns a ThirdPartyResources diff --git a/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/BUILD b/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/BUILD index 8db66b7a1f..d7b69bf29f 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/BUILD +++ b/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/BUILD @@ -21,10 +21,10 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/apis/policy:go_default_library", - "//pkg/client/restclient:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/eviction.go b/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/eviction.go index 012a67e167..a43dabbb19 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/eviction.go +++ b/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/eviction.go @@ -17,7 +17,7 @@ limitations under the License. package internalversion import ( - restclient "k8s.io/kubernetes/pkg/client/restclient" + rest "k8s.io/client-go/rest" ) // EvictionsGetter has a method to return a EvictionInterface. @@ -33,7 +33,7 @@ type EvictionInterface interface { // evictions implements EvictionInterface type evictions struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/fake/BUILD b/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/fake/BUILD index c60b6d6ab0..b8f32b8bd7 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/fake/BUILD +++ b/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/fake/BUILD @@ -21,13 +21,13 @@ go_library( "//pkg/api:go_default_library", "//pkg/apis/policy:go_default_library", "//pkg/client/clientset_generated/internalclientset/typed/policy/internalversion:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/fake/fake_policy_client.go b/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/fake/fake_policy_client.go index d8dd4c722f..7f8a472b69 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/fake/fake_policy_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/fake/fake_policy_client.go @@ -17,8 +17,8 @@ limitations under the License. package fake import ( + rest "k8s.io/client-go/rest" internalversion "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion" - restclient "k8s.io/kubernetes/pkg/client/restclient" core "k8s.io/kubernetes/pkg/client/testing/core" ) @@ -36,7 +36,7 @@ func (c *FakePolicy) PodDisruptionBudgets(namespace string) internalversion.PodD // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakePolicy) RESTClient() restclient.Interface { - var ret *restclient.RESTClient +func (c *FakePolicy) RESTClient() rest.Interface { + var ret *rest.RESTClient return ret } diff --git a/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/poddisruptionbudget.go b/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/poddisruptionbudget.go index 80c5e220bb..967b64c97b 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/poddisruptionbudget.go +++ b/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/poddisruptionbudget.go @@ -20,9 +20,9 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" policy "k8s.io/kubernetes/pkg/apis/policy" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // PodDisruptionBudgetsGetter has a method to return a PodDisruptionBudgetInterface. @@ -47,7 +47,7 @@ type PodDisruptionBudgetInterface interface { // podDisruptionBudgets implements PodDisruptionBudgetInterface type podDisruptionBudgets struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/policy_client.go b/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/policy_client.go index dab1b40e3e..7a0e00735f 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/policy_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/policy_client.go @@ -17,19 +17,19 @@ limitations under the License. package internalversion import ( + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) type PolicyInterface interface { - RESTClient() restclient.Interface + RESTClient() rest.Interface EvictionsGetter PodDisruptionBudgetsGetter } // PolicyClient is used to interact with features provided by the policy group. type PolicyClient struct { - restClient restclient.Interface + restClient rest.Interface } func (c *PolicyClient) Evictions(namespace string) EvictionInterface { @@ -41,12 +41,12 @@ func (c *PolicyClient) PodDisruptionBudgets(namespace string) PodDisruptionBudge } // NewForConfig creates a new PolicyClient for the given config. -func NewForConfig(c *restclient.Config) (*PolicyClient, error) { +func NewForConfig(c *rest.Config) (*PolicyClient, error) { config := *c if err := setConfigDefaults(&config); err != nil { return nil, err } - client, err := restclient.RESTClientFor(&config) + client, err := rest.RESTClientFor(&config) if err != nil { return nil, err } @@ -55,7 +55,7 @@ func NewForConfig(c *restclient.Config) (*PolicyClient, error) { // NewForConfigOrDie creates a new PolicyClient for the given config and // panics if there is an error in the config. -func NewForConfigOrDie(c *restclient.Config) *PolicyClient { +func NewForConfigOrDie(c *rest.Config) *PolicyClient { client, err := NewForConfig(c) if err != nil { panic(err) @@ -64,11 +64,11 @@ func NewForConfigOrDie(c *restclient.Config) *PolicyClient { } // New creates a new PolicyClient for the given RESTClient. -func New(c restclient.Interface) *PolicyClient { +func New(c rest.Interface) *PolicyClient { return &PolicyClient{c} } -func setConfigDefaults(config *restclient.Config) error { +func setConfigDefaults(config *rest.Config) error { // if policy group is not registered, return an error g, err := api.Registry.Group("policy") if err != nil { @@ -76,7 +76,7 @@ func setConfigDefaults(config *restclient.Config) error { } config.APIPath = "/apis" if config.UserAgent == "" { - config.UserAgent = restclient.DefaultKubernetesUserAgent() + config.UserAgent = rest.DefaultKubernetesUserAgent() } if config.GroupVersion == nil || config.GroupVersion.Group != g.GroupVersion.Group { copyGroupVersion := g.GroupVersion @@ -95,7 +95,7 @@ func setConfigDefaults(config *restclient.Config) error { // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *PolicyClient) RESTClient() restclient.Interface { +func (c *PolicyClient) RESTClient() rest.Interface { if c == nil { return nil } diff --git a/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/BUILD b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/BUILD index 176758bbe7..34142c085f 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/BUILD +++ b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/BUILD @@ -22,10 +22,10 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/apis/rbac:go_default_library", - "//pkg/client/restclient:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/clusterrole.go b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/clusterrole.go index 72afc5ca03..f573151d1d 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/clusterrole.go +++ b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/clusterrole.go @@ -20,9 +20,9 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" rbac "k8s.io/kubernetes/pkg/apis/rbac" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // ClusterRolesGetter has a method to return a ClusterRoleInterface. @@ -46,7 +46,7 @@ type ClusterRoleInterface interface { // clusterRoles implements ClusterRoleInterface type clusterRoles struct { - client restclient.Interface + client rest.Interface } // newClusterRoles returns a ClusterRoles diff --git a/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/clusterrolebinding.go b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/clusterrolebinding.go index 9493d239a7..01d425d32d 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/clusterrolebinding.go +++ b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/clusterrolebinding.go @@ -20,9 +20,9 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" rbac "k8s.io/kubernetes/pkg/apis/rbac" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // ClusterRoleBindingsGetter has a method to return a ClusterRoleBindingInterface. @@ -46,7 +46,7 @@ type ClusterRoleBindingInterface interface { // clusterRoleBindings implements ClusterRoleBindingInterface type clusterRoleBindings struct { - client restclient.Interface + client rest.Interface } // newClusterRoleBindings returns a ClusterRoleBindings diff --git a/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake/BUILD b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake/BUILD index d31b435a96..6d1c20aee4 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake/BUILD +++ b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake/BUILD @@ -22,13 +22,13 @@ go_library( "//pkg/api:go_default_library", "//pkg/apis/rbac:go_default_library", "//pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake/fake_rbac_client.go b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake/fake_rbac_client.go index a17bbf1fc3..0e94ed91fc 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake/fake_rbac_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake/fake_rbac_client.go @@ -17,8 +17,8 @@ limitations under the License. package fake import ( + rest "k8s.io/client-go/rest" internalversion "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion" - restclient "k8s.io/kubernetes/pkg/client/restclient" core "k8s.io/kubernetes/pkg/client/testing/core" ) @@ -44,7 +44,7 @@ func (c *FakeRbac) RoleBindings(namespace string) internalversion.RoleBindingInt // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeRbac) RESTClient() restclient.Interface { - var ret *restclient.RESTClient +func (c *FakeRbac) RESTClient() rest.Interface { + var ret *rest.RESTClient return ret } diff --git a/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/rbac_client.go b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/rbac_client.go index 25a6f01eb8..c5f6244bad 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/rbac_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/rbac_client.go @@ -17,12 +17,12 @@ limitations under the License. package internalversion import ( + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) type RbacInterface interface { - RESTClient() restclient.Interface + RESTClient() rest.Interface ClusterRolesGetter ClusterRoleBindingsGetter RolesGetter @@ -31,7 +31,7 @@ type RbacInterface interface { // RbacClient is used to interact with features provided by the rbac.authorization.k8s.io group. type RbacClient struct { - restClient restclient.Interface + restClient rest.Interface } func (c *RbacClient) ClusterRoles() ClusterRoleInterface { @@ -51,12 +51,12 @@ func (c *RbacClient) RoleBindings(namespace string) RoleBindingInterface { } // NewForConfig creates a new RbacClient for the given config. -func NewForConfig(c *restclient.Config) (*RbacClient, error) { +func NewForConfig(c *rest.Config) (*RbacClient, error) { config := *c if err := setConfigDefaults(&config); err != nil { return nil, err } - client, err := restclient.RESTClientFor(&config) + client, err := rest.RESTClientFor(&config) if err != nil { return nil, err } @@ -65,7 +65,7 @@ func NewForConfig(c *restclient.Config) (*RbacClient, error) { // NewForConfigOrDie creates a new RbacClient for the given config and // panics if there is an error in the config. -func NewForConfigOrDie(c *restclient.Config) *RbacClient { +func NewForConfigOrDie(c *rest.Config) *RbacClient { client, err := NewForConfig(c) if err != nil { panic(err) @@ -74,11 +74,11 @@ func NewForConfigOrDie(c *restclient.Config) *RbacClient { } // New creates a new RbacClient for the given RESTClient. -func New(c restclient.Interface) *RbacClient { +func New(c rest.Interface) *RbacClient { return &RbacClient{c} } -func setConfigDefaults(config *restclient.Config) error { +func setConfigDefaults(config *rest.Config) error { // if rbac group is not registered, return an error g, err := api.Registry.Group("rbac.authorization.k8s.io") if err != nil { @@ -86,7 +86,7 @@ func setConfigDefaults(config *restclient.Config) error { } config.APIPath = "/apis" if config.UserAgent == "" { - config.UserAgent = restclient.DefaultKubernetesUserAgent() + config.UserAgent = rest.DefaultKubernetesUserAgent() } if config.GroupVersion == nil || config.GroupVersion.Group != g.GroupVersion.Group { copyGroupVersion := g.GroupVersion @@ -105,7 +105,7 @@ func setConfigDefaults(config *restclient.Config) error { // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *RbacClient) RESTClient() restclient.Interface { +func (c *RbacClient) RESTClient() rest.Interface { if c == nil { return nil } diff --git a/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/role.go b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/role.go index c423d9385d..a395b16bf1 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/role.go +++ b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/role.go @@ -20,9 +20,9 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" rbac "k8s.io/kubernetes/pkg/apis/rbac" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // RolesGetter has a method to return a RoleInterface. @@ -46,7 +46,7 @@ type RoleInterface interface { // roles implements RoleInterface type roles struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/rolebinding.go b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/rolebinding.go index 5b80b1a9ce..b8ab5e7a54 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/rolebinding.go +++ b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/rolebinding.go @@ -20,9 +20,9 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" rbac "k8s.io/kubernetes/pkg/apis/rbac" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // RoleBindingsGetter has a method to return a RoleBindingInterface. @@ -46,7 +46,7 @@ type RoleBindingInterface interface { // roleBindings implements RoleBindingInterface type roleBindings struct { - client restclient.Interface + client rest.Interface ns string } diff --git a/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/BUILD b/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/BUILD index 8a26ad90e0..34ccef189b 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/BUILD +++ b/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/BUILD @@ -19,10 +19,10 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/apis/storage:go_default_library", - "//pkg/client/restclient:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/fake/BUILD b/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/fake/BUILD index dc5054863d..42b99661f7 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/fake/BUILD +++ b/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/fake/BUILD @@ -19,13 +19,13 @@ go_library( "//pkg/api:go_default_library", "//pkg/apis/storage:go_default_library", "//pkg/client/clientset_generated/internalclientset/typed/storage/internalversion:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/testing/core:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/client-go/rest", ], ) diff --git a/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/fake/fake_storage_client.go b/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/fake/fake_storage_client.go index e954f15299..7abe6f4f9b 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/fake/fake_storage_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/fake/fake_storage_client.go @@ -17,8 +17,8 @@ limitations under the License. package fake import ( + rest "k8s.io/client-go/rest" internalversion "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion" - restclient "k8s.io/kubernetes/pkg/client/restclient" core "k8s.io/kubernetes/pkg/client/testing/core" ) @@ -32,7 +32,7 @@ func (c *FakeStorage) StorageClasses() internalversion.StorageClassInterface { // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeStorage) RESTClient() restclient.Interface { - var ret *restclient.RESTClient +func (c *FakeStorage) RESTClient() rest.Interface { + var ret *rest.RESTClient return ret } diff --git a/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/storage_client.go b/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/storage_client.go index c96e84e2f0..2b4a06a449 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/storage_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/storage_client.go @@ -17,18 +17,18 @@ limitations under the License. package internalversion import ( + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) type StorageInterface interface { - RESTClient() restclient.Interface + RESTClient() rest.Interface StorageClassesGetter } // StorageClient is used to interact with features provided by the storage.k8s.io group. type StorageClient struct { - restClient restclient.Interface + restClient rest.Interface } func (c *StorageClient) StorageClasses() StorageClassInterface { @@ -36,12 +36,12 @@ func (c *StorageClient) StorageClasses() StorageClassInterface { } // NewForConfig creates a new StorageClient for the given config. -func NewForConfig(c *restclient.Config) (*StorageClient, error) { +func NewForConfig(c *rest.Config) (*StorageClient, error) { config := *c if err := setConfigDefaults(&config); err != nil { return nil, err } - client, err := restclient.RESTClientFor(&config) + client, err := rest.RESTClientFor(&config) if err != nil { return nil, err } @@ -50,7 +50,7 @@ func NewForConfig(c *restclient.Config) (*StorageClient, error) { // NewForConfigOrDie creates a new StorageClient for the given config and // panics if there is an error in the config. -func NewForConfigOrDie(c *restclient.Config) *StorageClient { +func NewForConfigOrDie(c *rest.Config) *StorageClient { client, err := NewForConfig(c) if err != nil { panic(err) @@ -59,11 +59,11 @@ func NewForConfigOrDie(c *restclient.Config) *StorageClient { } // New creates a new StorageClient for the given RESTClient. -func New(c restclient.Interface) *StorageClient { +func New(c rest.Interface) *StorageClient { return &StorageClient{c} } -func setConfigDefaults(config *restclient.Config) error { +func setConfigDefaults(config *rest.Config) error { // if storage group is not registered, return an error g, err := api.Registry.Group("storage.k8s.io") if err != nil { @@ -71,7 +71,7 @@ func setConfigDefaults(config *restclient.Config) error { } config.APIPath = "/apis" if config.UserAgent == "" { - config.UserAgent = restclient.DefaultKubernetesUserAgent() + config.UserAgent = rest.DefaultKubernetesUserAgent() } if config.GroupVersion == nil || config.GroupVersion.Group != g.GroupVersion.Group { copyGroupVersion := g.GroupVersion @@ -90,7 +90,7 @@ func setConfigDefaults(config *restclient.Config) error { // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *StorageClient) RESTClient() restclient.Interface { +func (c *StorageClient) RESTClient() rest.Interface { if c == nil { return nil } diff --git a/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/storageclass.go b/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/storageclass.go index fb5260bdae..ab5c618958 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/storageclass.go +++ b/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/storageclass.go @@ -20,9 +20,9 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" storage "k8s.io/kubernetes/pkg/apis/storage" - restclient "k8s.io/kubernetes/pkg/client/restclient" ) // StorageClassesGetter has a method to return a StorageClassInterface. @@ -46,7 +46,7 @@ type StorageClassInterface interface { // storageClasses implements StorageClassInterface type storageClasses struct { - client restclient.Interface + client rest.Interface } // newStorageClasses returns a StorageClasses diff --git a/pkg/client/record/BUILD b/pkg/client/record/BUILD index 9f2dca8de8..4e6d1779a3 100644 --- a/pkg/client/record/BUILD +++ b/pkg/client/record/BUILD @@ -19,7 +19,6 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api/v1:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/util/strategicpatch:go_default_library", "//vendor:github.com/golang/glog", "//vendor:github.com/golang/groupcache/lru", @@ -44,7 +43,6 @@ go_test( deps = [ "//pkg/api/install:go_default_library", "//pkg/api/v1:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/util/strategicpatch:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", diff --git a/pkg/client/restclient/fake/BUILD b/pkg/client/restclient/fake/BUILD index 324f19efc6..6c4c2e8cc8 100644 --- a/pkg/client/restclient/fake/BUILD +++ b/pkg/client/restclient/fake/BUILD @@ -14,7 +14,6 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/testapi:go_default_library", - "//pkg/client/restclient:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", diff --git a/pkg/client/testing/core/BUILD b/pkg/client/testing/core/BUILD index 1847b2d2f4..9e6b75ed4d 100644 --- a/pkg/client/testing/core/BUILD +++ b/pkg/client/testing/core/BUILD @@ -19,7 +19,6 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/v1:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/version:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/api/meta", diff --git a/pkg/client/typed/discovery/BUILD b/pkg/client/typed/discovery/BUILD index 088997062f..dd9e7e9664 100644 --- a/pkg/client/typed/discovery/BUILD +++ b/pkg/client/typed/discovery/BUILD @@ -20,7 +20,6 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/v1:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/version:go_default_library", "//plugin/pkg/client/auth:go_default_library", "//vendor:github.com/emicklei/go-restful/swagger", @@ -47,7 +46,6 @@ go_test( deps = [ "//pkg/api:go_default_library", "//pkg/api/v1:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/restclient/fake:go_default_library", "//vendor:github.com/emicklei/go-restful/swagger", "//vendor:github.com/stretchr/testify/assert", @@ -66,7 +64,6 @@ go_test( deps = [ "//pkg/api:go_default_library", "//pkg/api/testapi:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/restclient/fake:go_default_library", "//pkg/client/typed/discovery:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", diff --git a/pkg/client/typed/discovery/fake/BUILD b/pkg/client/typed/discovery/fake/BUILD index 2589898997..9d7817e887 100644 --- a/pkg/client/typed/discovery/fake/BUILD +++ b/pkg/client/typed/discovery/fake/BUILD @@ -13,7 +13,6 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api/v1:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/testing/core:go_default_library", "//pkg/version:go_default_library", "//vendor:github.com/emicklei/go-restful/swagger", diff --git a/pkg/client/typed/dynamic/BUILD b/pkg/client/typed/dynamic/BUILD index d88846e2e8..52027c59ad 100644 --- a/pkg/client/typed/dynamic/BUILD +++ b/pkg/client/typed/dynamic/BUILD @@ -19,7 +19,6 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/v1:go_default_library", - "//pkg/client/restclient:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/meta", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1/unstructured", @@ -43,7 +42,6 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api/v1:go_default_library", - "//pkg/client/restclient:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1/unstructured", "//vendor:k8s.io/apimachinery/pkg/runtime", diff --git a/pkg/client/unversioned/BUILD b/pkg/client/unversioned/BUILD index 574745ea39..868b5128a8 100644 --- a/pkg/client/unversioned/BUILD +++ b/pkg/client/unversioned/BUILD @@ -24,7 +24,6 @@ go_library( "//pkg/client/clientset_generated/internalclientset/typed/batch/internalversion:go_default_library", "//pkg/client/clientset_generated/internalclientset/typed/core/internalversion:go_default_library", "//pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion:go_default_library", - "//pkg/client/restclient:go_default_library", "//plugin/pkg/client/auth:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", @@ -42,7 +41,6 @@ go_test( deps = [ "//pkg/api:go_default_library", "//pkg/api/testapi:go_default_library", - "//pkg/client/restclient:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", diff --git a/pkg/client/unversioned/auth/BUILD b/pkg/client/unversioned/auth/BUILD index fca2177611..b500648671 100644 --- a/pkg/client/unversioned/auth/BUILD +++ b/pkg/client/unversioned/auth/BUILD @@ -12,7 +12,6 @@ go_library( name = "go_default_library", srcs = ["clientauth.go"], tags = ["automanaged"], - deps = ["//pkg/client/restclient:go_default_library"], ) go_test( diff --git a/pkg/client/unversioned/clientcmd/BUILD b/pkg/client/unversioned/clientcmd/BUILD index 324f62aedc..695370947a 100644 --- a/pkg/client/unversioned/clientcmd/BUILD +++ b/pkg/client/unversioned/clientcmd/BUILD @@ -24,7 +24,6 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/unversioned/auth:go_default_library", "//pkg/util/homedir:go_default_library", "//vendor:github.com/golang/glog", @@ -51,7 +50,6 @@ go_test( library = ":go_default_library", tags = ["automanaged"], deps = [ - "//pkg/client/restclient:go_default_library", "//vendor:github.com/ghodss/yaml", "//vendor:github.com/imdario/mergo", "//vendor:k8s.io/apimachinery/pkg/runtime", diff --git a/pkg/client/unversioned/portforward/BUILD b/pkg/client/unversioned/portforward/BUILD index 29cafd31d1..f96dab6e15 100644 --- a/pkg/client/unversioned/portforward/BUILD +++ b/pkg/client/unversioned/portforward/BUILD @@ -29,7 +29,6 @@ go_test( library = ":go_default_library", tags = ["automanaged"], deps = [ - "//pkg/client/restclient:go_default_library", "//pkg/client/unversioned/remotecommand:go_default_library", "//pkg/kubelet/server/portforward:go_default_library", "//pkg/util/httpstream:go_default_library", diff --git a/pkg/client/unversioned/remotecommand/BUILD b/pkg/client/unversioned/remotecommand/BUILD index 7cdd440e72..7992f3ecef 100644 --- a/pkg/client/unversioned/remotecommand/BUILD +++ b/pkg/client/unversioned/remotecommand/BUILD @@ -22,7 +22,6 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/kubelet/server/remotecommand:go_default_library", "//pkg/util/exec:go_default_library", "//pkg/util/httpstream:go_default_library", @@ -47,7 +46,6 @@ go_test( deps = [ "//pkg/api:go_default_library", "//pkg/api/testapi:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/kubelet/server/remotecommand:go_default_library", "//pkg/util/httpstream:go_default_library", "//pkg/util/term:go_default_library", diff --git a/pkg/client/unversioned/testclient/simple/BUILD b/pkg/client/unversioned/testclient/simple/BUILD index 2dc10e1e45..dfe8ab291a 100644 --- a/pkg/client/unversioned/testclient/simple/BUILD +++ b/pkg/client/unversioned/testclient/simple/BUILD @@ -15,7 +15,6 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/testapi:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/util/testing:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/fields", diff --git a/pkg/controller/BUILD b/pkg/controller/BUILD index 5a9af17bd9..e0525262b3 100644 --- a/pkg/controller/BUILD +++ b/pkg/controller/BUILD @@ -27,7 +27,6 @@ go_library( "//pkg/client/clientset_generated/clientset:go_default_library", "//pkg/client/clientset_generated/clientset/typed/core/v1:go_default_library", "//pkg/client/record:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/serviceaccount:go_default_library", "//pkg/util/hash:go_default_library", "//vendor:github.com/golang/glog", @@ -60,7 +59,6 @@ go_test( "//pkg/client/cache:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", "//pkg/client/record:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/securitycontext:go_default_library", "//pkg/util/testing:go_default_library", "//pkg/util/uuid:go_default_library", diff --git a/pkg/controller/endpoint/BUILD b/pkg/controller/endpoint/BUILD index 806803573c..46f0029ce4 100644 --- a/pkg/controller/endpoint/BUILD +++ b/pkg/controller/endpoint/BUILD @@ -49,7 +49,6 @@ go_test( "//pkg/api/v1/endpoints:go_default_library", "//pkg/client/cache:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/controller:go_default_library", "//pkg/util/intstr:go_default_library", "//pkg/util/testing:go_default_library", diff --git a/pkg/controller/garbagecollector/BUILD b/pkg/controller/garbagecollector/BUILD index c80addae2a..f116707070 100644 --- a/pkg/controller/garbagecollector/BUILD +++ b/pkg/controller/garbagecollector/BUILD @@ -52,7 +52,6 @@ go_test( "//pkg/api:go_default_library", "//pkg/api/install:go_default_library", "//pkg/api/v1:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/typed/dynamic:go_default_library", "//pkg/controller/garbagecollector/metaonly:go_default_library", "//pkg/util/workqueue:go_default_library", diff --git a/pkg/controller/job/BUILD b/pkg/controller/job/BUILD index b613f51d7c..5252747ba7 100644 --- a/pkg/controller/job/BUILD +++ b/pkg/controller/job/BUILD @@ -51,7 +51,6 @@ go_test( "//pkg/client/cache:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", "//pkg/client/clientset_generated/clientset/fake:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/testing/core:go_default_library", "//pkg/controller:go_default_library", "//pkg/controller/informers:go_default_library", diff --git a/pkg/controller/namespace/BUILD b/pkg/controller/namespace/BUILD index b9e6e96933..58adf5973e 100644 --- a/pkg/controller/namespace/BUILD +++ b/pkg/controller/namespace/BUILD @@ -48,7 +48,6 @@ go_test( "//pkg/api/v1:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", "//pkg/client/clientset_generated/clientset/fake:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/testing/core:go_default_library", "//pkg/client/typed/discovery:go_default_library", "//pkg/client/typed/dynamic:go_default_library", diff --git a/pkg/controller/podautoscaler/BUILD b/pkg/controller/podautoscaler/BUILD index b6034cb19c..cfb17821e6 100644 --- a/pkg/controller/podautoscaler/BUILD +++ b/pkg/controller/podautoscaler/BUILD @@ -54,7 +54,6 @@ go_test( "//pkg/client/clientset_generated/clientset/fake:go_default_library", "//pkg/client/clientset_generated/clientset/typed/core/v1:go_default_library", "//pkg/client/record:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/testing/core:go_default_library", "//pkg/controller/podautoscaler/metrics:go_default_library", "//vendor:github.com/stretchr/testify/assert", diff --git a/pkg/controller/podautoscaler/metrics/BUILD b/pkg/controller/podautoscaler/metrics/BUILD index 06e019aa87..a3a2fac099 100644 --- a/pkg/controller/podautoscaler/metrics/BUILD +++ b/pkg/controller/podautoscaler/metrics/BUILD @@ -36,7 +36,6 @@ go_test( "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/client/clientset_generated/clientset/fake:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/testing/core:go_default_library", "//vendor:github.com/stretchr/testify/assert", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", diff --git a/pkg/controller/replicaset/BUILD b/pkg/controller/replicaset/BUILD index 0510d6b838..1e2e579179 100644 --- a/pkg/controller/replicaset/BUILD +++ b/pkg/controller/replicaset/BUILD @@ -53,7 +53,6 @@ go_test( "//pkg/client/cache:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", "//pkg/client/clientset_generated/clientset/fake:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/testing/core:go_default_library", "//pkg/controller:go_default_library", "//pkg/controller/informers:go_default_library", diff --git a/pkg/controller/replication/BUILD b/pkg/controller/replication/BUILD index 0aa420b8fe..6b9777dc74 100644 --- a/pkg/controller/replication/BUILD +++ b/pkg/controller/replication/BUILD @@ -50,7 +50,6 @@ go_test( "//pkg/client/cache:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", "//pkg/client/clientset_generated/clientset/fake:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/testing/core:go_default_library", "//pkg/controller:go_default_library", "//pkg/controller/informers:go_default_library", diff --git a/pkg/controller/statefulset/BUILD b/pkg/controller/statefulset/BUILD index 566676670b..5c4d845373 100644 --- a/pkg/controller/statefulset/BUILD +++ b/pkg/controller/statefulset/BUILD @@ -66,7 +66,6 @@ go_test( "//pkg/client/clientset_generated/clientset/fake:go_default_library", "//pkg/client/clientset_generated/clientset/typed/apps/v1beta1:go_default_library", "//pkg/client/clientset_generated/clientset/typed/apps/v1beta1/fake:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/testing/core:go_default_library", "//pkg/controller:go_default_library", "//pkg/util/testing:go_default_library", diff --git a/pkg/genericapiserver/server/BUILD b/pkg/genericapiserver/server/BUILD index 1e8bc26af7..7950a9e0f5 100644 --- a/pkg/genericapiserver/server/BUILD +++ b/pkg/genericapiserver/server/BUILD @@ -67,7 +67,6 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/genericapiserver/authenticator:go_default_library", "//pkg/genericapiserver/authorizer:go_default_library", "//pkg/genericapiserver/endpoints:go_default_library", diff --git a/pkg/kubectl/BUILD b/pkg/kubectl/BUILD index b5f3d8ce27..9ad7bb3225 100644 --- a/pkg/kubectl/BUILD +++ b/pkg/kubectl/BUILD @@ -78,7 +78,6 @@ go_library( "//pkg/client/clientset_generated/internalclientset/typed/batch/internalversion:go_default_library", "//pkg/client/clientset_generated/internalclientset/typed/core/internalversion:go_default_library", "//pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/retry:go_default_library", "//pkg/client/unversioned:go_default_library", "//pkg/controller/deployment/util:go_default_library", @@ -165,7 +164,6 @@ go_test( "//pkg/client/clientset_generated/internalclientset/typed/batch/internalversion:go_default_library", "//pkg/client/clientset_generated/internalclientset/typed/core/internalversion:go_default_library", "//pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/restclient/fake:go_default_library", "//pkg/client/testing/core:go_default_library", "//pkg/controller/deployment/util:go_default_library", diff --git a/pkg/kubectl/cmd/BUILD b/pkg/kubectl/cmd/BUILD index 0bcb68dce2..3b9d065320 100644 --- a/pkg/kubectl/cmd/BUILD +++ b/pkg/kubectl/cmd/BUILD @@ -72,7 +72,6 @@ go_library( "//pkg/apis/policy:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library", "//pkg/client/clientset_generated/internalclientset/typed/core/internalversion:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/typed/discovery:go_default_library", "//pkg/client/unversioned:go_default_library", "//pkg/client/unversioned/clientcmd:go_default_library", @@ -181,7 +180,6 @@ go_test( "//pkg/apis/batch:go_default_library", "//pkg/apis/extensions:go_default_library", "//pkg/apis/policy:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/restclient/fake:go_default_library", "//pkg/client/typed/dynamic:go_default_library", "//pkg/kubectl:go_default_library", diff --git a/pkg/kubectl/cmd/set/BUILD b/pkg/kubectl/cmd/set/BUILD index 0b1cbd753f..f37be78d1a 100644 --- a/pkg/kubectl/cmd/set/BUILD +++ b/pkg/kubectl/cmd/set/BUILD @@ -52,7 +52,6 @@ go_test( "//pkg/api:go_default_library", "//pkg/apis/batch:go_default_library", "//pkg/apis/extensions:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/restclient/fake:go_default_library", "//pkg/kubectl/cmd/testing:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", diff --git a/pkg/kubectl/cmd/testing/BUILD b/pkg/kubectl/cmd/testing/BUILD index 86d1bca40b..df0a55b8dc 100644 --- a/pkg/kubectl/cmd/testing/BUILD +++ b/pkg/kubectl/cmd/testing/BUILD @@ -17,7 +17,6 @@ go_library( "//pkg/api/testapi:go_default_library", "//pkg/api/validation:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/restclient/fake:go_default_library", "//pkg/client/typed/discovery:go_default_library", "//pkg/kubectl:go_default_library", diff --git a/pkg/kubectl/cmd/util/BUILD b/pkg/kubectl/cmd/util/BUILD index fce01360ab..5277257ec0 100644 --- a/pkg/kubectl/cmd/util/BUILD +++ b/pkg/kubectl/cmd/util/BUILD @@ -34,7 +34,6 @@ go_library( "//pkg/apis/extensions:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library", "//pkg/client/clientset_generated/internalclientset/typed/core/internalversion:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/typed/discovery:go_default_library", "//pkg/client/typed/dynamic:go_default_library", "//pkg/client/unversioned:go_default_library", @@ -88,7 +87,6 @@ go_test( "//pkg/api/validation:go_default_library", "//pkg/apis/extensions:go_default_library", "//pkg/client/clientset_generated/internalclientset/fake:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/restclient/fake:go_default_library", "//pkg/client/testing/core:go_default_library", "//pkg/client/typed/discovery:go_default_library", diff --git a/pkg/kubectl/resource/BUILD b/pkg/kubectl/resource/BUILD index ceadd120fe..b25d27b79b 100644 --- a/pkg/kubectl/resource/BUILD +++ b/pkg/kubectl/resource/BUILD @@ -25,7 +25,6 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/validation:go_default_library", "//pkg/apis/extensions:go_default_library", - "//pkg/client/restclient:go_default_library", "//vendor:github.com/golang/glog", "//vendor:golang.org/x/text/encoding/unicode", "//vendor:golang.org/x/text/transform", diff --git a/pkg/kubelet/client/BUILD b/pkg/kubelet/client/BUILD index d6b57b7b65..6a8a33ba16 100644 --- a/pkg/kubelet/client/BUILD +++ b/pkg/kubelet/client/BUILD @@ -14,7 +14,6 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api/v1:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/util/node:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/types", @@ -31,10 +30,7 @@ go_test( tags = [ "automanaged", ], - deps = [ - "//pkg/client/clientset_generated/clientset/typed/core/v1:go_default_library", - "//pkg/client/restclient:go_default_library", - ], + deps = ["//pkg/client/clientset_generated/clientset/typed/core/v1:go_default_library"], ) filegroup( diff --git a/pkg/kubelet/server/streaming/BUILD b/pkg/kubelet/server/streaming/BUILD index 06a95fe96a..16a59cf215 100644 --- a/pkg/kubelet/server/streaming/BUILD +++ b/pkg/kubelet/server/streaming/BUILD @@ -38,7 +38,6 @@ go_test( library = ":go_default_library", tags = ["automanaged"], deps = [ - "//pkg/client/restclient:go_default_library", "//pkg/client/unversioned/remotecommand:go_default_library", "//pkg/kubelet/api/v1alpha1/runtime:go_default_library", "//pkg/kubelet/server/portforward:go_default_library", diff --git a/pkg/master/BUILD b/pkg/master/BUILD index 763433e2dc..8c1bbcb2b2 100644 --- a/pkg/master/BUILD +++ b/pkg/master/BUILD @@ -113,7 +113,6 @@ go_test( "//pkg/apis/rbac:go_default_library", "//pkg/client/clientset_generated/clientset/fake:go_default_library", "//pkg/client/clientset_generated/internalclientset/fake:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/testing/core:go_default_library", "//pkg/generated/openapi:go_default_library", "//pkg/genericapiserver/server:go_default_library", diff --git a/pkg/registry/core/rest/BUILD b/pkg/registry/core/rest/BUILD index eab805776a..0decae1776 100644 --- a/pkg/registry/core/rest/BUILD +++ b/pkg/registry/core/rest/BUILD @@ -26,7 +26,6 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/client/clientset_generated/internalclientset/typed/policy/internalversion:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/genericapiserver/registry/generic:go_default_library", "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/genericapiserver/server:go_default_library", diff --git a/plugin/cmd/kube-scheduler/app/BUILD b/plugin/cmd/kube-scheduler/app/BUILD index 32cdca5332..9973dcbd82 100644 --- a/plugin/cmd/kube-scheduler/app/BUILD +++ b/plugin/cmd/kube-scheduler/app/BUILD @@ -18,7 +18,6 @@ go_library( "//pkg/client/leaderelection:go_default_library", "//pkg/client/leaderelection/resourcelock:go_default_library", "//pkg/client/record:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/unversioned/clientcmd:go_default_library", "//pkg/util/configz:go_default_library", "//plugin/cmd/kube-scheduler/app/options:go_default_library", diff --git a/plugin/pkg/admission/initialresources/BUILD b/plugin/pkg/admission/initialresources/BUILD index 855b31eb6c..743fc59bf4 100644 --- a/plugin/pkg/admission/initialresources/BUILD +++ b/plugin/pkg/admission/initialresources/BUILD @@ -21,7 +21,6 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/resource:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/unversioned/clientcmd:go_default_library", "//vendor:cloud.google.com/go/compute/metadata", "//vendor:github.com/golang/glog", diff --git a/plugin/pkg/client/auth/gcp/BUILD b/plugin/pkg/client/auth/gcp/BUILD index 4524742343..75c3fd6e9c 100644 --- a/plugin/pkg/client/auth/gcp/BUILD +++ b/plugin/pkg/client/auth/gcp/BUILD @@ -13,7 +13,6 @@ go_library( srcs = ["gcp.go"], tags = ["automanaged"], deps = [ - "//pkg/client/restclient:go_default_library", "//pkg/util/jsonpath:go_default_library", "//vendor:github.com/golang/glog", "//vendor:golang.org/x/net/context", diff --git a/plugin/pkg/client/auth/oidc/BUILD b/plugin/pkg/client/auth/oidc/BUILD index fdac035a6d..c1c7059577 100644 --- a/plugin/pkg/client/auth/oidc/BUILD +++ b/plugin/pkg/client/auth/oidc/BUILD @@ -13,7 +13,6 @@ go_library( srcs = ["oidc.go"], tags = ["automanaged"], deps = [ - "//pkg/client/restclient:go_default_library", "//vendor:github.com/coreos/go-oidc/jose", "//vendor:github.com/coreos/go-oidc/oauth2", "//vendor:github.com/coreos/go-oidc/oidc", diff --git a/plugin/pkg/scheduler/BUILD b/plugin/pkg/scheduler/BUILD index 0535c94ac5..7b6c6ada2b 100644 --- a/plugin/pkg/scheduler/BUILD +++ b/plugin/pkg/scheduler/BUILD @@ -22,7 +22,6 @@ go_library( "//pkg/client/cache:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", "//pkg/client/record:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/util:go_default_library", "//pkg/util/hash:go_default_library", "//pkg/util/workqueue:go_default_library", diff --git a/plugin/pkg/scheduler/algorithmprovider/defaults/BUILD b/plugin/pkg/scheduler/algorithmprovider/defaults/BUILD index f76e56685c..6f8ff6a8aa 100644 --- a/plugin/pkg/scheduler/algorithmprovider/defaults/BUILD +++ b/plugin/pkg/scheduler/algorithmprovider/defaults/BUILD @@ -35,7 +35,6 @@ go_test( "//pkg/api:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/util/testing:go_default_library", "//plugin/pkg/scheduler/api:go_default_library", "//plugin/pkg/scheduler/api/latest:go_default_library", diff --git a/plugin/pkg/scheduler/api/BUILD b/plugin/pkg/scheduler/api/BUILD index 167b90d1b2..e6533d4f87 100644 --- a/plugin/pkg/scheduler/api/BUILD +++ b/plugin/pkg/scheduler/api/BUILD @@ -16,7 +16,6 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api/v1:go_default_library", - "//pkg/client/restclient:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", diff --git a/plugin/pkg/scheduler/api/v1/BUILD b/plugin/pkg/scheduler/api/v1/BUILD index 1a55ca6313..855b5a5a38 100644 --- a/plugin/pkg/scheduler/api/v1/BUILD +++ b/plugin/pkg/scheduler/api/v1/BUILD @@ -16,7 +16,6 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api/v1:go_default_library", - "//pkg/client/restclient:go_default_library", "//plugin/pkg/scheduler/api:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", diff --git a/plugin/pkg/scheduler/factory/BUILD b/plugin/pkg/scheduler/factory/BUILD index 24ba0d7c4e..751d6711b3 100644 --- a/plugin/pkg/scheduler/factory/BUILD +++ b/plugin/pkg/scheduler/factory/BUILD @@ -56,7 +56,6 @@ go_test( "//pkg/api/v1:go_default_library", "//pkg/client/cache:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/util/testing:go_default_library", "//plugin/pkg/scheduler/algorithm:go_default_library", "//plugin/pkg/scheduler/api:go_default_library", diff --git a/test/e2e/BUILD b/test/e2e/BUILD index 0b0c84ab76..63cc5f7056 100644 --- a/test/e2e/BUILD +++ b/test/e2e/BUILD @@ -120,7 +120,6 @@ go_library( "//pkg/client/clientset_generated/clientset/typed/core/v1:go_default_library", "//pkg/client/clientset_generated/clientset/typed/extensions/v1beta1:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/cloudprovider:go_default_library", "//pkg/cloudprovider/providers/aws:go_default_library", "//pkg/cloudprovider/providers/gce:go_default_library", diff --git a/test/e2e/framework/BUILD b/test/e2e/framework/BUILD index 5b4cf8c18d..3b564f6731 100644 --- a/test/e2e/framework/BUILD +++ b/test/e2e/framework/BUILD @@ -50,7 +50,6 @@ go_library( "//pkg/client/clientset_generated/clientset/typed/rbac/v1beta1:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library", "//pkg/client/conditions:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/typed/discovery:go_default_library", "//pkg/client/typed/dynamic:go_default_library", "//pkg/client/unversioned/clientcmd:go_default_library", diff --git a/test/e2e_federation/BUILD b/test/e2e_federation/BUILD index 50368e636d..250d7591cd 100644 --- a/test/e2e_federation/BUILD +++ b/test/e2e_federation/BUILD @@ -32,7 +32,6 @@ go_library( "//pkg/api/v1:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/unversioned/clientcmd:go_default_library", "//pkg/util/intstr:go_default_library", "//test/e2e/common:go_default_library", diff --git a/test/e2e_federation/framework/BUILD b/test/e2e_federation/framework/BUILD index ca7e9003fc..7ff540b449 100644 --- a/test/e2e_federation/framework/BUILD +++ b/test/e2e_federation/framework/BUILD @@ -21,7 +21,6 @@ go_library( "//pkg/api/v1:go_default_library", "//pkg/api/validation:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/unversioned/clientcmd:go_default_library", "//test/e2e/framework:go_default_library", "//vendor:github.com/onsi/ginkgo", diff --git a/test/e2e_node/services/BUILD b/test/e2e_node/services/BUILD index 254146bb83..905116de98 100644 --- a/test/e2e_node/services/BUILD +++ b/test/e2e_node/services/BUILD @@ -26,7 +26,6 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/typed/dynamic:go_default_library", "//pkg/controller/namespace:go_default_library", "//pkg/util/config:go_default_library", diff --git a/test/images/clusterapi-tester/BUILD b/test/images/clusterapi-tester/BUILD index 62a3729e27..969727beed 100644 --- a/test/images/clusterapi-tester/BUILD +++ b/test/images/clusterapi-tester/BUILD @@ -21,7 +21,6 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library", - "//pkg/client/restclient:go_default_library", "//vendor:k8s.io/apimachinery/pkg/fields", "//vendor:k8s.io/apimachinery/pkg/labels", ], diff --git a/test/images/network-tester/BUILD b/test/images/network-tester/BUILD index b5f3d58d2e..b0bad02aa7 100644 --- a/test/images/network-tester/BUILD +++ b/test/images/network-tester/BUILD @@ -20,7 +20,6 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/client/clientset_generated/internalclientset:go_default_library", - "//pkg/client/restclient:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/util/sets", ], diff --git a/test/integration/framework/BUILD b/test/integration/framework/BUILD index 9bb6f6cca2..bacca6506a 100644 --- a/test/integration/framework/BUILD +++ b/test/integration/framework/BUILD @@ -32,7 +32,6 @@ go_library( "//pkg/client/clientset_generated/clientset/typed/core/v1:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library", "//pkg/client/record:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/controller:go_default_library", "//pkg/controller/replication:go_default_library", "//pkg/generated/openapi:go_default_library", diff --git a/test/integration/objectmeta/BUILD b/test/integration/objectmeta/BUILD index 38712fde35..ebff894a17 100644 --- a/test/integration/objectmeta/BUILD +++ b/test/integration/objectmeta/BUILD @@ -15,7 +15,6 @@ go_test( "//pkg/api:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", - "//pkg/client/restclient:go_default_library", "//test/integration/framework:go_default_library", "//vendor:github.com/stretchr/testify/assert", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", diff --git a/test/integration/scheduler_perf/BUILD b/test/integration/scheduler_perf/BUILD index 06bdd784a7..a097424a81 100644 --- a/test/integration/scheduler_perf/BUILD +++ b/test/integration/scheduler_perf/BUILD @@ -18,7 +18,6 @@ go_library( "//pkg/client/clientset_generated/clientset:go_default_library", "//pkg/client/clientset_generated/clientset/typed/core/v1:go_default_library", "//pkg/client/record:go_default_library", - "//pkg/client/restclient:go_default_library", "//plugin/pkg/scheduler:go_default_library", "//plugin/pkg/scheduler/algorithmprovider:go_default_library", "//plugin/pkg/scheduler/factory:go_default_library", diff --git a/test/soak/cauldron/BUILD b/test/soak/cauldron/BUILD index 3d9d0739e0..3cb3110a93 100644 --- a/test/soak/cauldron/BUILD +++ b/test/soak/cauldron/BUILD @@ -21,7 +21,6 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/util/intstr:go_default_library", "//vendor:github.com/golang/glog", "//vendor:k8s.io/apimachinery/pkg/api/errors", diff --git a/test/soak/serve_hostnames/BUILD b/test/soak/serve_hostnames/BUILD index 1a3b5d7b8c..f8512fefed 100644 --- a/test/soak/serve_hostnames/BUILD +++ b/test/soak/serve_hostnames/BUILD @@ -22,7 +22,6 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", - "//pkg/client/restclient:go_default_library", "//pkg/client/unversioned/clientcmd:go_default_library", "//pkg/util/intstr:go_default_library", "//test/e2e/framework:go_default_library", diff --git a/vendor/BUILD b/vendor/BUILD index 55a7e056c4..fd5e454a8f 100644 --- a/vendor/BUILD +++ b/vendor/BUILD @@ -10290,7 +10290,10 @@ go_library( go_library( name = "k8s.io/client-go/_vendor/k8s.io/apimachinery/pkg/openapi", - srcs = ["k8s.io/client-go/_vendor/k8s.io/apimachinery/pkg/openapi/common.go"], + srcs = [ + "k8s.io/client-go/_vendor/k8s.io/apimachinery/pkg/openapi/common.go", + "k8s.io/client-go/_vendor/k8s.io/apimachinery/pkg/openapi/doc.go", + ], tags = ["automanaged"], deps = [ "//vendor:github.com/emicklei/go-restful", @@ -11147,6 +11150,7 @@ go_library( tags = ["automanaged"], deps = [ "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/fields", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", @@ -11156,7 +11160,6 @@ go_library( "//vendor:k8s.io/client-go/pkg/api", "//vendor:k8s.io/client-go/pkg/api/v1", "//vendor:k8s.io/client-go/pkg/apis/policy/v1beta1", - "//vendor:k8s.io/client-go/pkg/fields", "//vendor:k8s.io/client-go/rest", ], ) @@ -11191,6 +11194,7 @@ go_library( tags = ["automanaged"], deps = [ "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/fields", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", @@ -11200,7 +11204,6 @@ go_library( "//vendor:k8s.io/client-go/pkg/api", "//vendor:k8s.io/client-go/pkg/api/v1", "//vendor:k8s.io/client-go/pkg/apis/policy/v1beta1", - "//vendor:k8s.io/client-go/pkg/fields", "//vendor:k8s.io/client-go/rest", "//vendor:k8s.io/client-go/testing", ], @@ -11475,6 +11478,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/conversion", + "//vendor:k8s.io/apimachinery/pkg/fields", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", @@ -11484,7 +11488,6 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/client-go/pkg/api/resource", - "//vendor:k8s.io/client-go/pkg/fields", "//vendor:k8s.io/client-go/pkg/util/intstr", "//vendor:k8s.io/client-go/pkg/util/labels", ], @@ -11595,6 +11598,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/api/meta", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/conversion", + "//vendor:k8s.io/apimachinery/pkg/fields", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", @@ -11606,7 +11610,6 @@ go_library( "//vendor:k8s.io/client-go/pkg/api", "//vendor:k8s.io/client-go/pkg/api/resource", "//vendor:k8s.io/client-go/pkg/apis/extensions", - "//vendor:k8s.io/client-go/pkg/fields", "//vendor:k8s.io/client-go/pkg/util", "//vendor:k8s.io/client-go/pkg/util/intstr", "//vendor:k8s.io/client-go/pkg/util/parsers", @@ -12528,18 +12531,6 @@ go_library( ], ) -go_library( - name = "k8s.io/client-go/pkg/fields", - srcs = [ - "k8s.io/client-go/pkg/fields/doc.go", - "k8s.io/client-go/pkg/fields/fields.go", - "k8s.io/client-go/pkg/fields/requirements.go", - "k8s.io/client-go/pkg/fields/selector.go", - ], - tags = ["automanaged"], - deps = ["//vendor:k8s.io/apimachinery/pkg/selection"], -) - go_library( name = "k8s.io/client-go/pkg/kubelet/qos", srcs = [ @@ -12964,6 +12955,7 @@ go_library( "//vendor:github.com/golang/glog", "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/fields", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", @@ -12975,7 +12967,6 @@ go_library( "//vendor:k8s.io/client-go/pkg/api", "//vendor:k8s.io/client-go/pkg/api/v1", "//vendor:k8s.io/client-go/pkg/api/validation/path", - "//vendor:k8s.io/client-go/pkg/fields", "//vendor:k8s.io/client-go/pkg/util/cert", "//vendor:k8s.io/client-go/pkg/util/flowcontrol", "//vendor:k8s.io/client-go/pkg/version", @@ -13047,6 +13038,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/api/meta", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/fields", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", @@ -13054,7 +13046,6 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/client-go/pkg/api", "//vendor:k8s.io/client-go/pkg/api/v1", - "//vendor:k8s.io/client-go/pkg/fields", "//vendor:k8s.io/client-go/pkg/version", "//vendor:k8s.io/client-go/rest", ], @@ -13137,6 +13128,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/api/meta", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/fields", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", @@ -13155,7 +13147,6 @@ go_library( "//vendor:k8s.io/client-go/pkg/apis/rbac", "//vendor:k8s.io/client-go/pkg/apis/storage", "//vendor:k8s.io/client-go/pkg/apis/storage/v1beta1", - "//vendor:k8s.io/client-go/pkg/fields", "//vendor:k8s.io/client-go/pkg/util/clock", "//vendor:k8s.io/client-go/rest", ], @@ -13663,3 +13654,15 @@ go_library( tags = ["automanaged"], deps = ["//vendor:k8s.io/apimachinery/pkg/selection"], ) + +go_library( + name = "k8s.io/client-go/_vendor/k8s.io/apimachinery/pkg/fields", + srcs = [ + "k8s.io/client-go/_vendor/k8s.io/apimachinery/pkg/fields/doc.go", + "k8s.io/client-go/_vendor/k8s.io/apimachinery/pkg/fields/fields.go", + "k8s.io/client-go/_vendor/k8s.io/apimachinery/pkg/fields/requirements.go", + "k8s.io/client-go/_vendor/k8s.io/apimachinery/pkg/fields/selector.go", + ], + tags = ["automanaged"], + deps = ["//vendor:k8s.io/apimachinery/pkg/selection"], +)