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

Merge pull request #10148 from mikedanese/log-service-account 

log a message when we fall back to service account
pull/6/head
Jeff Lowdermilk 2015-06-22 13:20:43 -07:00
parent d206ab2c78 0da17683f0
commit 7002ce2336
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/client/clientcmd/merged_client_builder.go
View File

@ -20,6 +20,8 @@ import (
"io" "io"
"reflect" "reflect"
"github.com/golang/glog"
"github.com/GoogleCloudPlatform/kubernetes/pkg/client" "github.com/GoogleCloudPlatform/kubernetes/pkg/client"
clientcmdapi "github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd/api" clientcmdapi "github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd/api"
) )
@ -84,6 +86,7 @@ func (config DeferredLoadingClientConfig) ClientConfig() (*client.Config, error)
icc := inClusterClientConfig{} icc := inClusterClientConfig{}
defaultConfig, err := DefaultClientConfig.ClientConfig() defaultConfig, err := DefaultClientConfig.ClientConfig()
if icc.Possible() && err == nil && reflect.DeepEqual(mergedConfig, defaultConfig) { if icc.Possible() && err == nil && reflect.DeepEqual(mergedConfig, defaultConfig) {
glog.V(2).Info("no kubeconfig could be created, falling back to service account.")
return icc.ClientConfig() return icc.ClientConfig()
} }