Skip to content

K
k3s
Commit 22a40505 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #40170 from deads2k/client-10-restclient

Automatic merge from submit-queue (batch tested with PRs 36693, 40154, 40170, 39033) make client-go authoritative for pkg/client/restclient Moves client/restclient to client-go and a util/certs, util/testing as transitives.
parents 49cb10c8 9c6a5228
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 256 additions and 257 deletions
cluster/addons/fluentd-elasticsearch/es-image/elasticsearch_logging_discovery.go
View file @ 22a40505
......@@ -24,9 +24,9 @@ import (
"time"
"github.com/golang/glog"
restclient "k8s.io/client-go/rest"
"k8s.io/kubernetes/pkg/api"
clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
"k8s.io/kubernetes/pkg/client/restclient"
)
func flattenSubsets(subsets []api.EndpointSubset) []string {
......
cmd/cloud-controller-manager/app/BUILD
View file @ 22a40505
......@@ -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",
......@@ -35,6 +34,7 @@ go_library(
"//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
"//vendor:k8s.io/apimachinery/pkg/util/wait",
"//vendor:k8s.io/apiserver/pkg/server/healthz",
"//vendor:k8s.io/client-go/rest",
],
)
......
cmd/cloud-controller-manager/app/controllermanager.go
View file @ 22a40505
......@@ -28,6 +28,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/apiserver/pkg/server/healthz"
restclient "k8s.io/client-go/rest"
"k8s.io/kubernetes/cmd/cloud-controller-manager/app/options"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
......@@ -35,7 +36,6 @@ import (
"k8s.io/kubernetes/pkg/client/leaderelection"
"k8s.io/kubernetes/pkg/client/leaderelection/resourcelock"
"k8s.io/kubernetes/pkg/client/record"
"k8s.io/kubernetes/pkg/client/restclient"
"k8s.io/kubernetes/pkg/client/unversioned/clientcmd"
"k8s.io/kubernetes/pkg/cloudprovider"
"k8s.io/kubernetes/pkg/controller"
......
cmd/kube-aggregator/pkg/apiserver/BUILD
View file @ 22a40505
......@@ -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",
......@@ -75,6 +74,7 @@ go_library(
"//vendor:k8s.io/apimachinery/pkg/util/runtime",
"//vendor:k8s.io/apimachinery/pkg/util/wait",
"//vendor:k8s.io/apiserver/pkg/endpoints/request",
"//vendor:k8s.io/client-go/rest",
"//vendor:k8s.io/client-go/transport",
],
)
......
cmd/kube-aggregator/pkg/apiserver/handler_proxy.go
View file @ 22a40505
......@@ -23,8 +23,8 @@ import (
"k8s.io/apimachinery/pkg/runtime"
genericapirequest "k8s.io/apiserver/pkg/endpoints/request"
restclient "k8s.io/client-go/rest"
"k8s.io/client-go/transport"
"k8s.io/kubernetes/pkg/client/restclient"
"k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers/responsewriters"
genericrest "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/rest"
"k8s.io/kubernetes/pkg/util/httpstream/spdy"
......
cmd/kube-aggregator/pkg/client/clientset_generated/clientset/BUILD
View file @ 22a40505
......@@ -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/plugin/pkg/client/auth",
"//vendor:k8s.io/client-go/rest",
],
)
......
cmd/kube-aggregator/pkg/client/clientset_generated/clientset/clientset.go
View file @ 22a40505
......@@ -19,10 +19,10 @@ package clientset
import (
"github.com/golang/glog"
"k8s.io/client-go/pkg/util/flowcontrol"
_ "k8s.io/client-go/plugin/pkg/client/auth"
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"
)
type Interface interface {
......@@ -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)
......
cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/BUILD
View file @ 22a40505
......@@ -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",
],
)
......
cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/apiregistration_client.go
View file @ 22a40505
......@@ -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 = &copyGroupVersion
......@@ -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
}
......
cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/apiservice.go
View file @ 22a40505
......@@ -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
......
cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/BUILD
View file @ 22a40505
......@@ -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",
],
)
......
cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/fake_apiregistration_client.go
View file @ 22a40505
......@@ -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
}
cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/BUILD
View file @ 22a40505
......@@ -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/plugin/pkg/client/auth",
"//vendor:k8s.io/client-go/rest",
],
)
......
cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/clientset.go
View file @ 22a40505
......@@ -19,10 +19,10 @@ package internalclientset
import (
"github.com/golang/glog"
"k8s.io/client-go/pkg/util/flowcontrol"
_ "k8s.io/client-go/plugin/pkg/client/auth"
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"
)
type Interface interface {
......@@ -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)
......
cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/BUILD
View file @ 22a40505
......@@ -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",
],
)
......
cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/apiregistration_client.go
View file @ 22a40505
......@@ -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
}
......
cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/apiservice.go
View file @ 22a40505
......@@ -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
......
cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/BUILD
View file @ 22a40505
......@@ -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",
],
)
......
cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/fake_apiregistration_client.go
View file @ 22a40505
......@@ -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
}
cmd/kube-aggregator/pkg/cmd/server/BUILD
View file @ 22a40505
......@@ -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",
......@@ -30,6 +29,7 @@ go_library(
"//vendor:k8s.io/apimachinery/pkg/runtime/schema",
"//vendor:k8s.io/apimachinery/pkg/util/sets",
"//vendor:k8s.io/apimachinery/pkg/util/wait",
"//vendor:k8s.io/client-go/rest",
],
)
......
cmd/kube-aggregator/pkg/cmd/server/start.go
View file @ 22a40505
......@@ -27,11 +27,11 @@ import (
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/apimachinery/pkg/util/wait"
restclient "k8s.io/client-go/rest"
"k8s.io/kubernetes/cmd/kube-aggregator/pkg/apiserver"
"k8s.io/kubernetes/cmd/kube-aggregator/pkg/legacy"
"k8s.io/kubernetes/pkg/api"
kubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
"k8s.io/kubernetes/pkg/client/restclient"
"k8s.io/kubernetes/pkg/genericapiserver/registry/generic"
"k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry"
genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server"
......
cmd/kube-controller-manager/app/BUILD
View file @ 22a40505
......@@ -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",
......@@ -73,7 +72,6 @@ go_library(
"//pkg/controller/volume/persistentvolume:go_default_library",
"//pkg/quota/install:go_default_library",
"//pkg/serviceaccount:go_default_library",
"//pkg/util/cert:go_default_library",
"//pkg/util/config:go_default_library",
"//pkg/util/configz:go_default_library",
"//pkg/util/io:go_default_library",
......@@ -101,6 +99,8 @@ go_library(
"//vendor:k8s.io/apimachinery/pkg/util/sets",
"//vendor:k8s.io/apimachinery/pkg/util/wait",
"//vendor:k8s.io/apiserver/pkg/server/healthz",
"//vendor:k8s.io/client-go/pkg/util/cert",
"//vendor:k8s.io/client-go/rest",
],
)
......
cmd/kube-controller-manager/app/controllermanager.go
View file @ 22a40505
......@@ -36,6 +36,8 @@ import (
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/apiserver/pkg/server/healthz"
certutil "k8s.io/client-go/pkg/util/cert"
restclient "k8s.io/client-go/rest"
"k8s.io/kubernetes/cmd/kube-controller-manager/app/options"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
......@@ -43,7 +45,6 @@ import (
"k8s.io/kubernetes/pkg/client/leaderelection"
"k8s.io/kubernetes/pkg/client/leaderelection/resourcelock"
"k8s.io/kubernetes/pkg/client/record"
"k8s.io/kubernetes/pkg/client/restclient"
"k8s.io/kubernetes/pkg/client/typed/discovery"
"k8s.io/kubernetes/pkg/client/unversioned/clientcmd"
"k8s.io/kubernetes/pkg/cloudprovider"
......@@ -56,7 +57,6 @@ import (
"k8s.io/kubernetes/pkg/controller/volume/attachdetach"
persistentvolumecontroller "k8s.io/kubernetes/pkg/controller/volume/persistentvolume"
"k8s.io/kubernetes/pkg/serviceaccount"
certutil "k8s.io/kubernetes/pkg/util/cert"
"k8s.io/kubernetes/pkg/util/configz"
"github.com/golang/glog"
......
cmd/kubeadm/app/master/BUILD
View file @ 22a40505
......@@ -32,13 +32,13 @@ go_library(
"//pkg/client/unversioned/clientcmd:go_default_library",
"//pkg/kubectl/cmd/util:go_default_library",
"//pkg/registry/core/service/ipallocator:go_default_library",
"//pkg/util/cert:go_default_library",
"//pkg/util/intstr:go_default_library",
"//pkg/util/uuid:go_default_library",
"//vendor:github.com/blang/semver",
"//vendor:k8s.io/apimachinery/pkg/api/errors",
"//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
"//vendor:k8s.io/apimachinery/pkg/util/wait",
"//vendor:k8s.io/client-go/pkg/util/cert",
"//vendor:k8s.io/client-go/tools/clientcmd/api",
],
)
......
cmd/kubeadm/app/master/discovery.go
View file @ 22a40505
......@@ -24,6 +24,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/wait"
certutil "k8s.io/client-go/pkg/util/cert"
kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"
kubeadmapiext "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1alpha1"
kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util"
......@@ -31,7 +32,6 @@ import (
"k8s.io/kubernetes/pkg/api/v1"
extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
certutil "k8s.io/kubernetes/pkg/util/cert"
)
type kubeDiscovery struct {
......
cmd/kubeadm/app/node/BUILD
View file @ 22a40505
......@@ -24,12 +24,12 @@ go_library(
"//pkg/client/clientset_generated/clientset:go_default_library",
"//pkg/client/unversioned/clientcmd:go_default_library",
"//pkg/kubelet/util/csr:go_default_library",
"//pkg/util/cert:go_default_library",
"//vendor:github.com/square/go-jose",
"//vendor:k8s.io/apimachinery/pkg/api/errors",
"//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
"//vendor:k8s.io/apimachinery/pkg/types",
"//vendor:k8s.io/apimachinery/pkg/util/wait",
"//vendor:k8s.io/client-go/pkg/util/cert",
"//vendor:k8s.io/client-go/tools/clientcmd/api",
],
)
......@@ -45,10 +45,10 @@ 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",
"//vendor:k8s.io/client-go/rest",
],
)
......
cmd/kubeadm/app/node/bootstrap_test.go
View file @ 22a40505
......@@ -24,9 +24,9 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/version"
restclient "k8s.io/client-go/rest"
kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
"k8s.io/kubernetes/pkg/client/restclient"
"k8s.io/kubernetes/pkg/client/typed/discovery"
)
......
cmd/kubeadm/app/node/csr.go
View file @ 22a40505
......@@ -21,11 +21,11 @@ import (
"os"
"k8s.io/apimachinery/pkg/types"
certutil "k8s.io/client-go/pkg/util/cert"
clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
"k8s.io/kubernetes/pkg/client/unversioned/clientcmd"
"k8s.io/kubernetes/pkg/kubelet/util/csr"
certutil "k8s.io/kubernetes/pkg/util/cert"
)
// PerformTLSBootstrap executes a node certificate signing request.
......
cmd/kubeadm/app/phases/certs/BUILD
View file @ 22a40505
......@@ -18,7 +18,7 @@ go_test(
tags = ["automanaged"],
deps = [
"//cmd/kubeadm/app/apis/kubeadm:go_default_library",
"//pkg/util/cert:go_default_library",
"//vendor:k8s.io/client-go/pkg/util/cert",
],
)
......@@ -33,7 +33,7 @@ go_library(
deps = [
"//cmd/kubeadm/app/apis/kubeadm:go_default_library",
"//pkg/registry/core/service/ipallocator:go_default_library",
"//pkg/util/cert:go_default_library",
"//vendor:k8s.io/client-go/pkg/util/cert",
],
)
......
cmd/kubeadm/app/phases/certs/certs.go
View file @ 22a40505
......@@ -22,9 +22,9 @@ import (
"net"
"os"
certutil "k8s.io/client-go/pkg/util/cert"
kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"
"k8s.io/kubernetes/pkg/registry/core/service/ipallocator"
certutil "k8s.io/kubernetes/pkg/util/cert"
)
// CreatePKIAssets will create and write to disk all PKI assets necessary to establish the control plane.
......
cmd/kubeadm/app/phases/certs/pki_helpers.go
View file @ 22a40505
......@@ -22,7 +22,7 @@ import (
"fmt"
"path"
certutil "k8s.io/kubernetes/pkg/util/cert"
certutil "k8s.io/client-go/pkg/util/cert"
)
func newCertificateAuthority() (*rsa.PrivateKey, *x509.Certificate, error) {
......
cmd/kubeadm/app/phases/certs/pki_helpers_test.go
View file @ 22a40505
......@@ -24,7 +24,7 @@ import (
"os"
"testing"
certutil "k8s.io/kubernetes/pkg/util/cert"
certutil "k8s.io/client-go/pkg/util/cert"
)
func TestNewCertificateAuthority(t *testing.T) {
......
cmd/kubeadm/app/phases/kubeconfig/BUILD
View file @ 22a40505
......@@ -26,7 +26,7 @@ go_library(
deps = [
"//cmd/kubeadm/app/phases/certs:go_default_library",
"//pkg/client/unversioned/clientcmd:go_default_library",
"//pkg/util/cert:go_default_library",
"//vendor:k8s.io/client-go/pkg/util/cert",
"//vendor:k8s.io/client-go/tools/clientcmd/api",
],
)
......
cmd/kubeadm/app/phases/kubeconfig/kubeconfig.go
View file @ 22a40505
......@@ -24,10 +24,10 @@ import (
"os"
"path"
certutil "k8s.io/client-go/pkg/util/cert"
clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
certphase "k8s.io/kubernetes/cmd/kubeadm/app/phases/certs"
"k8s.io/kubernetes/pkg/client/unversioned/clientcmd"
certutil "k8s.io/kubernetes/pkg/util/cert"
)
const (
......
cmd/kubelet/app/BUILD
View file @ 22a40505
......@@ -17,10 +17,10 @@ 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",
"//vendor:k8s.io/client-go/rest",
],
)
......@@ -47,7 +47,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",
......@@ -70,7 +69,6 @@ go_library(
"//pkg/kubelet/server:go_default_library",
"//pkg/kubelet/types:go_default_library",
"//pkg/kubelet/util/csr:go_default_library",
"//pkg/util/cert:go_default_library",
"//pkg/util/config:go_default_library",
"//pkg/util/configz:go_default_library",
"//pkg/util/flock:go_default_library",
......@@ -118,6 +116,7 @@ go_library(
"//vendor:k8s.io/client-go/kubernetes",
"//vendor:k8s.io/client-go/kubernetes/typed/authentication/v1beta1",
"//vendor:k8s.io/client-go/kubernetes/typed/authorization/v1beta1",
"//vendor:k8s.io/client-go/pkg/util/cert",
"//vendor:k8s.io/client-go/rest",
"//vendor:k8s.io/client-go/tools/auth",
"//vendor:k8s.io/client-go/tools/clientcmd",
......
cmd/kubelet/app/bootstrap.go
View file @ 22a40505
......@@ -26,12 +26,12 @@ import (
"github.com/golang/glog"
"k8s.io/apimachinery/pkg/types"
certutil "k8s.io/client-go/pkg/util/cert"
restclient "k8s.io/client-go/rest"
clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
certificates "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1"
"k8s.io/kubernetes/pkg/client/restclient"
"k8s.io/kubernetes/pkg/client/unversioned/clientcmd"
"k8s.io/kubernetes/pkg/kubelet/util/csr"
certutil "k8s.io/kubernetes/pkg/util/cert"
)
const (
......
cmd/kubelet/app/bootstrap_test.go
View file @ 22a40505
......@@ -23,7 +23,7 @@ import (
"testing"
"k8s.io/apimachinery/pkg/util/diff"
"k8s.io/kubernetes/pkg/client/restclient"
restclient "k8s.io/client-go/rest"
)
func TestLoadRESTClientConfig(t *testing.T) {
......
cmd/kubelet/app/server.go
View file @ 22a40505
......@@ -44,6 +44,9 @@ import (
"k8s.io/apimachinery/pkg/types"
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/client-go/pkg/util/cert"
certutil "k8s.io/client-go/pkg/util/cert"
restclient "k8s.io/client-go/rest"
clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
"k8s.io/kubernetes/cmd/kubelet/app/options"
"k8s.io/kubernetes/pkg/api"
......@@ -55,7 +58,6 @@ import (
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
v1core "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/core/v1"
"k8s.io/kubernetes/pkg/client/record"
"k8s.io/kubernetes/pkg/client/restclient"
clientauth "k8s.io/kubernetes/pkg/client/unversioned/auth"
"k8s.io/kubernetes/pkg/client/unversioned/clientcmd"
"k8s.io/kubernetes/pkg/cloudprovider"
......@@ -68,8 +70,6 @@ import (
"k8s.io/kubernetes/pkg/kubelet/dockertools"
"k8s.io/kubernetes/pkg/kubelet/server"
kubetypes "k8s.io/kubernetes/pkg/kubelet/types"
"k8s.io/kubernetes/pkg/util/cert"
certutil "k8s.io/kubernetes/pkg/util/cert"
utilconfig "k8s.io/kubernetes/pkg/util/config"
"k8s.io/kubernetes/pkg/util/configz"
"k8s.io/kubernetes/pkg/util/flock"
......
cmd/kubemark/BUILD
View file @ 22a40505
......@@ -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",
......@@ -37,6 +36,7 @@ go_library(
"//vendor:github.com/golang/glog",
"//vendor:github.com/spf13/pflag",
"//vendor:k8s.io/apimachinery/pkg/util/sets",
"//vendor:k8s.io/client-go/rest",
],
)
......
cmd/kubemark/hollow-node.go
View file @ 22a40505
......@@ -20,12 +20,12 @@ import (
"fmt"
"k8s.io/apimachinery/pkg/util/sets"
restclient "k8s.io/client-go/rest"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
_ "k8s.io/kubernetes/pkg/client/metrics/prometheus" // for client metric registration
"k8s.io/kubernetes/pkg/client/record"
"k8s.io/kubernetes/pkg/client/restclient"
"k8s.io/kubernetes/pkg/client/unversioned/clientcmd"
cadvisortest "k8s.io/kubernetes/pkg/kubelet/cadvisor/testing"
"k8s.io/kubernetes/pkg/kubelet/cm"
......
cmd/libs/go2idl/client-gen/generators/fake/generator_fake_for_group.go
View file @ 22a40505
......@@ -60,7 +60,7 @@ func (g *genFakeForGroup) Imports(c *generator.Context) (imports []string) {
func (g *genFakeForGroup) GenerateType(c *generator.Context, t *types.Type, w io.Writer) error {
sw := generator.NewSnippetWriter(w, c, "$", "$")
const pkgTestingCore = "k8s.io/kubernetes/pkg/client/testing/core"
const pkgRESTClient = "k8s.io/kubernetes/pkg/client/restclient"
const pkgRESTClient = "k8s.io/client-go/rest"
m := map[string]interface{}{
"group": g.group,
"GroupVersion": namer.IC(g.group) + namer.IC(g.version),
......
cmd/libs/go2idl/client-gen/generators/generator_for_clientset.go
View file @ 22a40505
......@@ -64,7 +64,7 @@ func (g *genClientset) Imports(c *generator.Context) (imports []string) {
imports = append(imports, "github.com/golang/glog")
imports = append(imports, "k8s.io/client-go/pkg/util/flowcontrol")
// import solely to initialize client auth plugins.
imports = append(imports, "_ \"k8s.io/kubernetes/plugin/pkg/client/auth\"")
imports = append(imports, "_ \"k8s.io/client-go/plugin/pkg/client/auth\"")
return
}
......@@ -73,7 +73,7 @@ func (g *genClientset) GenerateType(c *generator.Context, t *types.Type, w io.Wr
// perhaps we can adapt the go2ild framework to this kind of usage.
sw := generator.NewSnippetWriter(w, c, "$", "$")
const pkgDiscovery = "k8s.io/kubernetes/pkg/client/typed/discovery"
const pkgRESTClient = "k8s.io/kubernetes/pkg/client/restclient"
const pkgRESTClient = "k8s.io/client-go/rest"
allGroups := clientgentypes.ToGroupVersionPackages(g.groups)
......
cmd/libs/go2idl/client-gen/generators/generator_for_group.go
View file @ 22a40505
......@@ -57,7 +57,7 @@ func (g *genGroup) Imports(c *generator.Context) (imports []string) {
func (g *genGroup) GenerateType(c *generator.Context, t *types.Type, w io.Writer) error {
sw := generator.NewSnippetWriter(w, c, "$", "$")
const pkgRESTClient = "k8s.io/kubernetes/pkg/client/restclient"
const pkgRESTClient = "k8s.io/client-go/rest"
const pkgAPI = "k8s.io/kubernetes/pkg/api"
const pkgSerializer = "k8s.io/apimachinery/pkg/runtime/serializer"
const pkgUnversioned = "k8s.io/kubernetes/pkg/api/unversioned"
......
cmd/libs/go2idl/client-gen/generators/generator_for_type.go
View file @ 22a40505
......@@ -84,7 +84,7 @@ func (g *genClientForType) GenerateType(c *generator.Context, t *types.Type, w i
"Group": namer.IC(g.group),
"GroupVersion": namer.IC(g.group) + namer.IC(g.version),
"watchInterface": c.Universe.Type(types.Name{Package: "k8s.io/apimachinery/pkg/watch", Name: "Interface"}),
"RESTClientInterface": c.Universe.Type(types.Name{Package: "k8s.io/kubernetes/pkg/client/restclient", Name: "Interface"}),
"RESTClientInterface": c.Universe.Type(types.Name{Package: "k8s.io/client-go/rest", Name: "Interface"}),
"apiParameterCodec": c.Universe.Type(types.Name{Package: "k8s.io/kubernetes/pkg/api", Name: "ParameterCodec"}),
"PatchType": c.Universe.Type(types.Name{Package: "k8s.io/apimachinery/pkg/types", Name: "PatchType"}),
"namespaced": namespaced,
......
cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/BUILD
View file @ 22a40505
......@@ -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/plugin/pkg/client/auth",
"//vendor:k8s.io/client-go/rest",
],
)
......@@ -31,8 +31,8 @@ go_test(
library = ":go_default_library",
tags = ["automanaged"],
deps = [
"//pkg/client/restclient:go_default_library",
"//vendor:k8s.io/client-go/pkg/util/flowcontrol",
"//vendor:k8s.io/client-go/rest",
],
)
......
cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/clientset.go
View file @ 22a40505
......@@ -19,10 +19,10 @@ package test_internalclientset
import (
"github.com/golang/glog"
"k8s.io/client-go/pkg/util/flowcontrol"
_ "k8s.io/client-go/plugin/pkg/client/auth"
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"
)
type Interface interface {
......@@ -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)
......
cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/clientset_test.go
View file @ 22a40505
......@@ -20,7 +20,7 @@ import (
"testing"
"k8s.io/client-go/pkg/util/flowcontrol"
restclient "k8s.io/kubernetes/pkg/client/restclient"
restclient "k8s.io/client-go/rest"
)
func ClientSetRateLimiterTest(t *testing.T) {
......
cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/BUILD
View file @ 22a40505
......@@ -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",
],
)
......
cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake/BUILD
View file @ 22a40505
......@@ -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",
],
)
......
cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake/fake_testgroup_client.go
View file @ 22a40505
......@@ -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
}
cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/testgroup_client.go
View file @ 22a40505
......@@ -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
}
......
cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/testtype.go
View file @ 22a40505
......@@ -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
}
......
federation/client/clientset_generated/federation_clientset/BUILD
View file @ 22a40505
......@@ -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/plugin/pkg/client/auth",
"//vendor:k8s.io/client-go/rest",
],
)
......
federation/client/clientset_generated/federation_clientset/clientset.go
View file @ 22a40505
......@@ -19,13 +19,13 @@ package federation_clientset
import (
"github.com/golang/glog"
"k8s.io/client-go/pkg/util/flowcontrol"
_ "k8s.io/client-go/plugin/pkg/client/auth"
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"
)
type Interface interface {
......@@ -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)
......
federation/client/clientset_generated/federation_clientset/typed/batch/v1/BUILD
View file @ 22a40505
......@@ -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",
],
)
......
federation/client/clientset_generated/federation_clientset/typed/batch/v1/batch_client.go
View file @ 22a40505
......@@ -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 = &copyGroupVersion
......@@ -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
}
......
federation/client/clientset_generated/federation_clientset/typed/batch/v1/fake/BUILD
View file @ 22a40505
......@@ -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",
],
)
......
federation/client/clientset_generated/federation_clientset/typed/batch/v1/fake/fake_batch_client.go
View file @ 22a40505
......@@ -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
}
federation/client/clientset_generated/federation_clientset/typed/batch/v1/job.go
View file @ 22a40505
......@@ -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
}
......
federation/client/clientset_generated/federation_clientset/typed/core/v1/BUILD
View file @ 22a40505
......@@ -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",
],
)
......
federation/client/clientset_generated/federation_clientset/typed/core/v1/configmap.go
View file @ 22a40505
......@@ -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
}
......
federation/client/clientset_generated/federation_clientset/typed/core/v1/core_client.go
View file @ 22a40505
......@@ -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 = &copyGroupVersion
......@@ -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
}
......
federation/client/clientset_generated/federation_clientset/typed/core/v1/event.go
View file @ 22a40505
......@@ -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
}
......
federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/BUILD
View file @ 22a40505
......@@ -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",
],
)
......
federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_core_client.go
View file @ 22a40505
......@@ -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
}
federation/client/clientset_generated/federation_clientset/typed/core/v1/namespace.go
View file @ 22a40505
......@@ -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
......
federation/client/clientset_generated/federation_clientset/typed/core/v1/secret.go
View file @ 22a40505
......@@ -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
}
......
federation/client/clientset_generated/federation_clientset/typed/core/v1/service.go
View file @ 22a40505
......@@ -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
}
......
federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/BUILD
View file @ 22a40505
......@@ -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",
],
)
......
federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/daemonset.go
View file @ 22a40505
......@@ -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
}
......
federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/deployment.go
View file @ 22a40505
......@@ -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
}
......
federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/extensions_client.go
View file @ 22a40505
......@@ -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 = &copyGroupVersion
......@@ -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
}
......
federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/BUILD
View file @ 22a40505
......@@ -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",
],
)
......
federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_extensions_client.go
View file @ 22a40505
......@@ -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
}
federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/ingress.go
View file @ 22a40505
......@@ -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
}
......
federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/replicaset.go
View file @ 22a40505
......@@ -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
}
......
federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/BUILD
View file @ 22a40505
......@@ -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",
],
)
......
federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/cluster.go
View file @ 22a40505
......@@ -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
......
federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/fake/BUILD
View file @ 22a40505
......@@ -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",
],
)
......
federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/fake/fake_federation_client.go
View file @ 22a40505
......@@ -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
}
federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/federation_client.go
View file @ 22a40505
......@@ -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 = &copyGroupVersion
......@@ -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
}
......
federation/client/clientset_generated/federation_internalclientset/BUILD
View file @ 22a40505
......@@ -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/plugin/pkg/client/auth",
"//vendor:k8s.io/client-go/rest",
],
)
......
federation/client/clientset_generated/federation_internalclientset/clientset.go
View file @ 22a40505
......@@ -19,13 +19,13 @@ package federation_internalclientset
import (
"github.com/golang/glog"
"k8s.io/client-go/pkg/util/flowcontrol"
_ "k8s.io/client-go/plugin/pkg/client/auth"
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"
)
type Interface interface {
......@@ -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)
......
federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion/BUILD
View file @ 22a40505
......@@ -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",
],
)
......
federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion/batch_client.go
View file @ 22a40505
......@@ -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
}
......
federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion/fake/BUILD
View file @ 22a40505
......@@ -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",
],
)
......
federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion/fake/fake_batch_client.go
View file @ 22a40505
......@@ -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
}
federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion/job.go
View file @ 22a40505
......@@ -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
}
......
federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/BUILD
View file @ 22a40505
......@@ -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",
],
)
......
federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/configmap.go
View file @ 22a40505
......@@ -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
}
......
federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/core_client.go
View file @ 22a40505
......@@ -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
}
......
federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/event.go
View file @ 22a40505
......@@ -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
}
......
federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/BUILD
View file @ 22a40505
......@@ -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",
],
)
......
federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/fake_core_client.go
View file @ 22a40505
......@@ -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
}
federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/namespace.go
View file @ 22a40505
......@@ -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
......
federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/secret.go
View file @ 22a40505
......@@ -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
}
......
federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/service.go
View file @ 22a40505
......@@ -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
}
......
federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/BUILD
View file @ 22a40505
......@@ -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",
],
)
......
federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/daemonset.go
View file @ 22a40505
......@@ -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
}
......
federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/deployment.go
View file @ 22a40505
......@@ -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
}
......
staging/src/k8s.io/client-go/pkg/api/v1/generated.pb.go
View file @ 22a40505
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment