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

Merge pull request #12655 from gmarek/api_ports

Browse Source 
Add information about ports opened by Kubelet to API
This commit is contained in:
Jeff Lowdermilk
2015-09-15 17:54:31 -07:00
parent 20e127028f 4b8ddf3d7e
commit 9ed2d842bc
11 changed files with 227 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
contrib/mesos/pkg/executor/service/service.go
View File

@@ -132,7 +132,7 @@ func (s *KubeletExecutorServer) Run(hks hyperkube.Interface, _ []string) error {
return err
}
cadvisorInterface, err := cadvisor.New(s.CadvisorPort)
cAdvisorInterface, err := cadvisor.New(s.CAdvisorPort)
if err != nil {
return err
}
@@ -203,7 +203,7 @@ func (s *KubeletExecutorServer) Run(hks hyperkube.Interface, _ []string) error {
Runonce: s.RunOnce,
Port: s.Port,
ReadOnlyPort: s.ReadOnlyPort,
CadvisorInterface: cadvisorInterface,
CAdvisorInterface: cAdvisorInterface,
EnableServer: s.EnableServer,
EnableDebuggingHandlers: s.EnableDebuggingHandlers,
DockerClient: dockertools.ConnectToDockerOrDie(s.DockerEndpoint),
@@ -315,7 +315,7 @@ func (ks *KubeletExecutorServer) createAndInitKubelet(
kc.NetworkPluginName,
kc.StreamingConnectionIdleTimeout,
kc.Recorder,
kc.CadvisorInterface,
kc.CAdvisorInterface,
kc.ImageGCPolicy,
kc.DiskSpacePolicy,
kc.Cloud,
@@ -335,6 +335,9 @@ func (ks *KubeletExecutorServer) createAndInitKubelet(
kc.DockerExecHandler,
kc.ResolverConfig,
kc.CPUCFSQuota,
&api.NodeDaemonEndpoints{
KubeletEndpoint: api.DaemonEndpoint{Port: int(kc.Port)},
},
)
if err != nil {
return nil, nil, err