Merge pull request #84 from rphillips/fixes/fix_kubeconfig

k8s-ci-robot · web-flow · commit 85b0c6be8150 · 2018-07-24T12:54:54.000-07:00
config: fix using the KUBECONFIG to build the client
diff --git a/pkg/client/config/config.go b/pkg/client/config/config.go
@@ -62,7 +62,7 @@ func GetConfig() (*rest.Config, error) {
 	}
 	// If an env variable is specified with the config locaiton, use that
 	if len(os.Getenv("KUBECONFIG")) > 0 {
-		return clientcmd.BuildConfigFromFlags(masterURL, kubeconfig)
+		return clientcmd.BuildConfigFromFlags(masterURL, os.Getenv("KUBECONFIG"))
 	}
 	// If no explicit location, try the in-cluster config
 	if c, err := rest.InClusterConfig(); err == nil {

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ func GetConfig() (*rest.Config, error) {`
`62`	`62`	`}`
`63`	`63`	`// If an env variable is specified with the config locaiton, use that`
`64`	`64`	`if len(os.Getenv("KUBECONFIG")) > 0 {`
`65`		`- return clientcmd.BuildConfigFromFlags(masterURL, kubeconfig)`
	`65`	`+ return clientcmd.BuildConfigFromFlags(masterURL, os.Getenv("KUBECONFIG"))`
`66`	`66`	`}`
`67`	`67`	`// If no explicit location, try the in-cluster config`
`68`	`68`	`if c, err := rest.InClusterConfig(); err == nil {`