github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #9423 from mesosphere/create-api-server-client 

refactor createAPIServerClient for easier integration with 3rd party …
pull/6/head
Abhi Shah 2015-06-10 12:54:17 -07:00
parent c541b96e19 f54eeeb8d6
commit 0fbd4900d1
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cmd/kubelet/app/server.go
View File

@ -254,7 +254,11 @@ func (s *KubeletServer) Run(_ []string) error {
glog.Warning(err)
}
client, err := s.createAPIServerClient()
var apiclient *client.Client
clientConfig, err := s.CreateAPIServerClientConfig()
if err == nil {
apiclient, err = client.New(clientConfig)
}
if err != nil && len(s.APIServerList) > 0 {
glog.Warningf("No API client: %v", err)
}
@ -334,7 +338,7 @@ func (s *KubeletServer) Run(_ []string) error {
EnableServer: s.EnableServer,
EnableDebuggingHandlers: s.EnableDebuggingHandlers,
DockerClient: dockertools.ConnectToDockerOrDie(s.DockerEndpoint),
KubeClient: client,
KubeClient: apiclient,
MasterServiceNamespace: s.MasterServiceNamespace,
VolumePlugins: ProbeVolumePlugins(),
NetworkPlugins: ProbeNetworkPlugins(),
@ -454,7 +458,11 @@ func (s *KubeletServer) createClientConfig() (*client.Config, error) {
return clientConfig, nil
}
func (s *KubeletServer) createAPIServerClient() (*client.Client, error) {
// CreateAPIServerClientConfig generates a client.Config from command line flags,
// including api-server-list, via createClientConfig and then injects chaos into
// the configuration via addChaosToClientConfig. This func is exported to support
// integration with third party kubelet extensions (e.g. kubernetes-mesos).
func (s *KubeletServer) CreateAPIServerClientConfig() (*client.Config, error) {
if len(s.APIServerList) < 1 {
return nil, fmt.Errorf("no api servers specified")
}
@ -468,11 +476,7 @@ func (s *KubeletServer) createAPIServerClient() (*client.Client, error) {
return nil, err
}
s.addChaosToClientConfig(clientConfig)
client, err := client.New(clientConfig)
if err != nil {
return nil, err
}
return client, nil
return clientConfig, nil
}
// addChaosToClientConfig injects random errors into client connections if configured.