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

Merge pull request #34474 from liggitt/connection-info-refactor

Browse Source 
Automatic merge from submit-queue

Remove static kubelet client, refactor ConnectionInfoGetter

Follow up to https://github.com/kubernetes/kubernetes/pull/33718

* Collapses the multi-valued return to a `ConnectionInfo` struct
* Removes the "raw" connection info method and interface, since it was only used in a single non-test location (by the "real" connection info method)
* Disentangles the node REST object from being a ConnectionInfoProvider itself by extracting an implementation of ConnectionInfoProvider that takes a node (using a provided NodeGetter) and determines ConnectionInfo
* Plumbs the KubeletClientConfig to the point where we construct the helper object that combines the config and the node lookup. I anticipate adding a preference order for choosing an address type in https://github.com/kubernetes/kubernetes/pull/34259
This commit is contained in:
Kubernetes Submit Queue
2016-10-18 13:20:25 -07:00
committed by GitHub
parent 97525c0c7d a082a2e749
commit f39e86c0a5
11 changed files with 170 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -357,7 +357,7 @@ func NewMasterConfig() *master.Config {
StorageFactory: storageFactory,
EnableCoreControllers: true,
EnableWatchCache: true,
KubeletClient: kubeletclient.FakeKubeletClient{},
KubeletClientConfig: kubeletclient.KubeletClientConfig{Port: 10250},
}
}