Use CAFile even if client certificate is not specified

This commit is contained in:
Jordan Liggitt
2015-01-12 16:38:48 -05:00
parent 6f43074143
commit 1f8a74626f
3 changed files with 33 additions and 2 deletions

View File

@@ -60,12 +60,18 @@ type HTTPKubeletClient struct {
func NewKubeletClient(config *KubeletConfig) (KubeletClient, error) {
transport := http.DefaultTransport
if config.CAFile != "" {
if config.CertFile != "" {
t, err := NewClientCertTLSTransport(config.CertFile, config.KeyFile, config.CAFile)
if err != nil {
return nil, err
}
transport = t
} else if config.CAFile != "" {
t, err := NewTLSTransport(config.CAFile)
if err != nil {
return nil, err
}
transport = t
}
c := &http.Client{Transport: transport}