github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #4003 from ghodss/handle-auth-path-failure 

Handle missing auth file gracefully in kubelet
pull/6/head
Brendan Burns 2015-02-02 10:55:15 -08:00
parent b05a4f603f b0dd0a8d0b
commit d9f7d39cdb
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/standalone/standalone.go
View File

@ -63,7 +63,11 @@ func (h *delegateHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
func GetAPIServerClient(authPath string, apiServerList util.StringList) (*client.Client, error) { func GetAPIServerClient(authPath string, apiServerList util.StringList) (*client.Client, error) {
authInfo, err := clientauth.LoadFromFile(authPath) authInfo, err := clientauth.LoadFromFile(authPath)
if err != nil { 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{}) clientConfig, err := authInfo.MergeWithConfig(client.Config{})
if err != nil { if err != nil {