github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 22:17:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #15101 from liggitt/kubelet_bearer_token

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-10-06 04:51:32 -07:00
commit f0fdfd96a0
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/client/unversioned/helper.go
View File

@ -100,6 +100,9 @@ type KubeletConfig struct {
// TLSClientConfig contains settings to enable transport layer security // TLSClientConfig contains settings to enable transport layer security
TLSClientConfig TLSClientConfig
// Server requires Bearer authentication
BearerToken string
// HTTPTimeout is used by the client to timeout http requests to Kubelet. // HTTPTimeout is used by the client to timeout http requests to Kubelet.
HTTPTimeout time.Duration HTTPTimeout time.Duration

14
pkg/client/unversioned/kubelet.go
View File

@ -50,14 +50,20 @@ func MakeTransport(config *KubeletConfig) (http.RoundTripper, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
transport := http.DefaultTransport
if config.Dial != nil || tlsConfig != nil { if config.Dial != nil || tlsConfig != nil {
return util.SetTransportDefaults(&http.Transport{ transport = util.SetTransportDefaults(&http.Transport{
Dial: config.Dial, Dial: config.Dial,
TLSClientConfig: tlsConfig, TLSClientConfig: tlsConfig,
}), nil })
} else {
return http.DefaultTransport, nil
} }
if len(config.BearerToken) > 0 {
transport = NewBearerAuthRoundTripper(config.BearerToken, transport)
}
return transport, nil
} }
// TODO: this structure is questionable, it should be using client.Config and overriding defaults. // TODO: this structure is questionable, it should be using client.Config and overriding defaults.