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

Handle missing auth file gracefully in kubelet

Browse Source
This commit is contained in:
Sam Ghods 2015-01-30 18:07:07 -08:00
parent 8025d46cce
commit b0dd0a8d0b
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

@ -62,7 +62,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 {