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

Fix logic in loopback client creation

Browse Source
This commit is contained in:
Dr. Stefan Schimanski 2016-12-06 09:38:55 +01:00
parent 527d502b9a
commit ec3b2c44f6
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/genericapiserver/config_selfclient.go
View File

@ -31,13 +31,17 @@ import (
// 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 { cfg, err := secureServingInfo.NewSelfClientConfig(token)
if cfg != nil && err == nil {
return cfg, nil
}
if err != nil {
if insecureServingInfo == nil { if insecureServingInfo == nil {
// be fatal if insecure port is not available // be fatal if insecure port is not available
return cfg, err return nil, err
} else {
glog.Warningf("Failed to create secure local client, falling back to insecure local connection: %v", err)
} }
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