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

Merge pull request #3610 from liggitt/kubelet_tls_client

Browse Source 
Build TLS client for kubelet correctly
This commit is contained in:
Joe Beda
2015-01-20 10:56:52 -08:00
parent aa2c04ecc2 888fe4b175
commit f90ad573cf
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/client/kubelet.go
View File

@@ -60,7 +60,9 @@ type HTTPKubeletClient struct {
func NewKubeletClient(config *KubeletConfig) (KubeletClient, error) { func NewKubeletClient(config *KubeletConfig) (KubeletClient, error) {
transport := http.DefaultTransport transport := http.DefaultTransport
if config.CertFile != "" { hasCA := len(config.CAFile) > 0 || len(config.CAData) > 0
hasCert := len(config.CertFile) > 0 || len(config.CertData) > 0
if hasCert {
var ( var (
certData, keyData, caData []byte certData, keyData, caData []byte
err error err error
@@ -77,7 +79,7 @@ func NewKubeletClient(config *KubeletConfig) (KubeletClient, error) {
if transport, err = NewClientCertTLSTransport(certData, keyData, caData); err != nil { if transport, err = NewClientCertTLSTransport(certData, keyData, caData); err != nil {
return nil, err return nil, err
} }
} else if config.CAFile != "" { } else if hasCA {
var ( var (
caData []byte caData []byte
err error err error