github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-06 10:43:56 +00:00
Code Issues Projects Releases Wiki Activity

Build TLS client for kubelet correctly

Browse Source
This commit is contained in:
Jordan Liggitt 2015-01-19 12:25:52 -05:00
parent fbd4722094
commit 888fe4b175
1 changed files with 4 additions and 2 deletions
Show Stats 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