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

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

Browse Source
This commit is contained in:
Dr. Stefan Schimanski 2016-12-02 21:07:16 +01:00 committed by Dr. Stefan Schimanski
parent 5b1d45bc15
commit d647d0ee8b
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/genericapiserver/config_selfclient.go
View File

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