Merge pull request #888 from dsbrng25b/master

k8s-ci-robot · web-flow · commit c3c6cffe79e7 · 2020-04-06T13:15:47.000-07:00
🐛 Return original error from GetConfig
diff --git a/pkg/client/config/config.go b/pkg/client/config/config.go
@@ -133,11 +133,8 @@ func loadConfig(context string) (*rest.Config, error) {
 		}
 		loadingRules.Precedence = append(loadingRules.Precedence, path.Join(u.HomeDir, clientcmd.RecommendedHomeDir, clientcmd.RecommendedFileName))
 	}
-	if c, err := loadConfigWithContext(apiServerURL, loadingRules, context); err == nil {
-		return c, nil
-	}
 
-	return nil, fmt.Errorf("could not locate a kubeconfig")
+	return loadConfigWithContext(apiServerURL, loadingRules, context)
 }
 
 func loadConfigWithContext(apiServerURL string, loader clientcmd.ClientConfigLoader, context string) (*rest.Config, error) {

Original file line number	Diff line number	Diff line change
`@@ -133,11 +133,8 @@ func loadConfig(context string) (*rest.Config, error) {`
`133`	`133`	`}`
`134`	`134`	`loadingRules.Precedence = append(loadingRules.Precedence, path.Join(u.HomeDir, clientcmd.RecommendedHomeDir, clientcmd.RecommendedFileName))`
`135`	`135`	`}`
`136`		`- if c, err := loadConfigWithContext(apiServerURL, loadingRules, context); err == nil {`
`137`		`- return c, nil`
`138`		`- }`
`139`	`136`
`140`		`- return nil, fmt.Errorf("could not locate a kubeconfig")`
	`137`	`+ return loadConfigWithContext(apiServerURL, loadingRules, context)`
`141`	`138`	`}`
`142`	`139`
`143`	`140`	`func loadConfigWithContext(apiServerURL string, loader clientcmd.ClientConfigLoader, context string) (*rest.Config, error) {`