From d647d0ee8bea552310472021370da933052319d3 Mon Sep 17 00:00:00 2001 From: "Dr. Stefan Schimanski" Date: Fri, 2 Dec 2016 21:07:16 +0100 Subject: [PATCH] Make failed secure loopback client non-fatal if insecure port is open --- pkg/genericapiserver/config_selfclient.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkg/genericapiserver/config_selfclient.go b/pkg/genericapiserver/config_selfclient.go index 17ab5d3da3b..6a1d86df377 100644 --- a/pkg/genericapiserver/config_selfclient.go +++ b/pkg/genericapiserver/config_selfclient.go @@ -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