Commit d647d0ee authored by Dr. Stefan Schimanski's avatar Dr. Stefan Schimanski Committed by Dr. Stefan Schimanski

Make failed secure loopback client non-fatal if insecure port is open

parent 5b1d45bc
......@@ -25,12 +25,19 @@ import (
"net"
"k8s.io/kubernetes/pkg/client/restclient"
"github.com/golang/glog"
)
// NewSelfClientConfig returns a clientconfig which can be used to talk to this apiserver.
func NewSelfClientConfig(secureServingInfo *SecureServingInfo, insecureServingInfo *ServingInfo, token string) (*restclient.Config, error) {
if cfg, err := secureServingInfo.NewSelfClientConfig(token); err != nil || cfg != nil {
return cfg, err
if insecureServingInfo == nil {
// be fatal if insecure port is not available
return cfg, err
} else {
glog.Warningf("Failed to create secure local client, falling back to insecure local connection: %v", err)
}
}
if cfg, err := insecureServingInfo.NewSelfClientConfig(token); err != nil || cfg != nil {
return cfg, err
......
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