Skip to content

Commit

Permalink
Merge pull request #2051 from maciej-karas-form3/patch-1
Browse files Browse the repository at this point in the history
🐛 Missing error log for in-cluster config
  • Loading branch information
k8s-ci-robot committed Nov 28, 2022
2 parents 007d240 + ebda1ad commit 9489eb5
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions pkg/client/config/config.go
Expand Up @@ -113,7 +113,7 @@ func GetConfigWithContext(context string) (*rest.Config, error) {
var loadInClusterConfig = rest.InClusterConfig

// loadConfig loads a REST Config as per the rules specified in GetConfig.
func loadConfig(context string) (*rest.Config, error) {
func loadConfig(context string) (config *rest.Config, configErr error) {
// If a flag is specified with the config location, use that
if len(kubeconfig) > 0 {
return loadConfigWithContext("", &clientcmd.ClientConfigLoadingRules{ExplicitPath: kubeconfig}, context)
Expand All @@ -123,9 +123,16 @@ func loadConfig(context string) (*rest.Config, error) {
// try the in-cluster config.
kubeconfigPath := os.Getenv(clientcmd.RecommendedConfigPathEnvVar)
if len(kubeconfigPath) == 0 {
if c, err := loadInClusterConfig(); err == nil {
c, err := loadInClusterConfig()
if err == nil {
return c, nil
}

defer func() {
if configErr != nil {
log.Error(err, "unable to load in-cluster config")
}
}()
}

// If the recommended kubeconfig env variable is set, or there
Expand Down

0 comments on commit 9489eb5

Please sign in to comment.