Skip to content

K
k3s
Commit f90ad573 authored by Joe Beda's avatar Joe Beda
Browse files
Options

Merge pull request #3610 from liggitt/kubelet_tls_client

Build TLS client for kubelet correctly
parents aa2c04ec 888fe4b1
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
pkg/client/kubelet.go
View file @ f90ad573
...@@ -60,7 +60,9 @@ type HTTPKubeletClient struct { ...@@ -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) { ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment