From b0dd0a8d0b6202dc2c7bea53fc9a16363a49cd6d Mon Sep 17 00:00:00 2001 From: Sam Ghods Date: Fri, 30 Jan 2015 18:07:07 -0800 Subject: [PATCH] Handle missing auth file gracefully in kubelet --- pkg/standalone/standalone.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkg/standalone/standalone.go b/pkg/standalone/standalone.go index 4aa110090e5..f72c2d78d05 100644 --- a/pkg/standalone/standalone.go +++ b/pkg/standalone/standalone.go @@ -62,7 +62,11 @@ func (h *delegateHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) { func GetAPIServerClient(authPath string, apiServerList util.StringList) (*client.Client, error) { authInfo, err := clientauth.LoadFromFile(authPath) if err != nil { - return nil, err + glog.Warningf("Could not load kubernetes auth path: %v. Continuing with defaults.", err) + } + if authInfo == nil { + // authInfo didn't load correctly - continue with defaults. + authInfo = &clientauth.Info{} } clientConfig, err := authInfo.MergeWithConfig(client.Config{}) if err != nil {