chore: refactor custom location

README.md

@@ -25,11 +25,10 @@ func main() {
     }
 }
 ```
-To change the location of the kube config use the following:
+To change the location of the kube config use the following instead:
 
 ```go  
-    f.KubeConfigPath(kubeConfigPath)
-    f.KubeConfigFile(kubeConfigFile)
+    cfg, err := f.CreateKubeConfigFromCustomLocation(kubeConfigPath, kubeConfigFile)
 ```
 
 Part of Jenkins X shared libraries.

pkg/kubeclient/interface.go

@@ -9,6 +9,5 @@ import (
 type Factory interface {
 	// CreateKubeConfig creates the kubernetes configuration
 	CreateKubeConfig() (*rest.Config, error)
-	KubeConfigFile(string)
-	KubeConfigPath(string)
+	CreateKubeConfigFromCustomLocation(string, string) (*rest.Config, error)
 }

pkg/kubeclient/kube.go

@@ -27,30 +27,25 @@ const (
 )
 
 type factory struct {
-	kubeConfigCache *string
-	kubeConfigFile  string
-	kubeConfigPath  string
 }
 
 // NewFactory creates a factory with the default Kubernetes resources defined
 func NewFactory() Factory {
 	f := &factory{}
-	f.kubeConfigFile = DefaultKubeConfigFile
-	f.kubeConfigPath = DefaultKubeConfigPath
 	return f
 }
 
-func (f *factory) KubeConfigFile(fileName string) {
-	f.kubeConfigFile = fileName
+func (f *factory) CreateKubeConfigFromCustomLocation(kubeConfigPath, kubeConfigFile string) (*rest.Config, error) {
+	return f.createKubeConfig(kubeConfigPath, kubeConfigFile)
 }
 
-func (f *factory) KubeConfigPath(path string) {
-	f.kubeConfigPath = path
+func (f *factory) CreateKubeConfig() (*rest.Config, error) {
+	return f.createKubeConfig(DefaultKubeConfigPath, DefaultKubeConfigFile)
 }
 
 // CreateKubeConfig figures out the kubernetes config from environment variables or default locations whether in or out
 // of cluster
-func (f *factory) CreateKubeConfig() (*rest.Config, error) {
+func (f *factory) createKubeConfig(kubeConfigPath, kubeConfigFile string) (*rest.Config, error) {
 	masterURL := ""
 	kubeConfigEnv := os.Getenv("KUBECONFIG")
 	if kubeConfigEnv != "" {
@@ -59,7 +54,7 @@ func (f *factory) CreateKubeConfig() (*rest.Config, error) {
 			&clientcmd.ClientConfigLoadingRules{Precedence: pathList},
 			&clientcmd.ConfigOverrides{ClusterInfo: clientcmdapi.Cluster{Server: masterURL}}).ClientConfig()
 	}
-	kubeconfig := f.createKubeConfigText()
+	kubeconfig := f.createKubeConfigPath(kubeConfigPath, kubeConfigFile)
 	var config *rest.Config
 	var err error
 	if kubeconfig != nil {
@@ -89,18 +84,12 @@ func (f *factory) CreateKubeConfig() (*rest.Config, error) {
 	return config, nil
 }
 
-func (f *factory) createKubeConfigText() *string {
-	var kubeconfig *string
-	if f.kubeConfigCache != nil {
-		return f.kubeConfigCache
-	}
-	text := ""
+func (f *factory) createKubeConfigPath(kubeConfigPath, kubeConfigFile string) *string {
+	path := ""
 	if home := homeDir(); home != "" {
-		text = filepath.Join(home, f.kubeConfigPath, f.kubeConfigFile)
+		path = filepath.Join(home, kubeConfigPath, kubeConfigFile)
 	}
-	kubeconfig = &text
-	f.kubeConfigCache = kubeconfig
-	return kubeconfig
+	return &path
 }
 
 func fileExists(path string) (bool, error) {