Handle missing auth file gracefully in kubelet

This commit is contained in:
Sam Ghods 2015-01-30 18:07:07 -08:00
parent 8025d46cce
commit b0dd0a8d0b

View File

@ -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 {