github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #34905 from ingvagabund/client-to-clientset

Browse Source 
Automatic merge from submit-queue

Replace client with clientset

Replace client with clientset in some places

Fixes: #34637
This commit is contained in:
Kubernetes Submit Queue
2016-10-24 05:38:43 -07:00
committed by GitHub
parent c615e094b8 4fde09d308
commit 33ebe1f18b
137 changed files with 1762 additions and 1794 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/integration/framework/master_utils.go
View File

@@ -49,7 +49,6 @@ import (
coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/core/v1"
"k8s.io/kubernetes/pkg/client/record"
"k8s.io/kubernetes/pkg/client/restclient"
client "k8s.io/kubernetes/pkg/client/unversioned"
"k8s.io/kubernetes/pkg/controller"
replicationcontroller "k8s.io/kubernetes/pkg/controller/replication"
"k8s.io/kubernetes/pkg/generated/openapi"
@@ -90,7 +89,7 @@ type MasterComponents struct {
// Kubernetes master, contains an embedded etcd storage
KubeMaster *master.Master
// Restclient used to talk to the kubernetes master
RestClient *client.Client
ClientSet clientset.Interface
// Replication controller manager
ControllerManager *replicationcontroller.ReplicationManager
// Channel for stop signals to rc manager
@@ -117,7 +116,6 @@ func NewMasterComponents(c *Config) *MasterComponents {
// TODO: Allow callers to pipe through a different master url and create a client/start components using it.
glog.Infof("Master %+v", s.URL)
// TODO: caesarxuchao: remove this client when the refactoring of client libraray is done.
restClient := client.NewOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &registered.GroupOrDie(api.GroupName).GroupVersion}, QPS: c.QPS, Burst: c.Burst})
clientset := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &registered.GroupOrDie(api.GroupName).GroupVersion}, QPS: c.QPS, Burst: c.Burst})
rcStopCh := make(chan struct{})
controllerManager := replicationcontroller.NewReplicationManagerFromClient(clientset, controller.NoResyncPeriodFunc, c.Burst, 4096)
@@ -130,7 +128,7 @@ func NewMasterComponents(c *Config) *MasterComponents {
return &MasterComponents{
ApiServer: s,
KubeMaster: m,
RestClient: restClient,
ClientSet: clientset,
ControllerManager: controllerManager,
rcStopCh: rcStopCh,
}