change the way of getting the restConfig

Signed-off-by: Yannis Zarkadas <yanniszark@arrikto.com>
kubeflow · Sep 19, 2019 · d22854b · d22854b
1 parent 9d15c2b
commit d22854b
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 15 deletions.
diff --git a/bootstrap/pkg/apis/apps/group.go b/bootstrap/pkg/apis/apps/group.go
@@ -19,6 +19,7 @@ import (
 	"fmt"
 	"io"
 	"io/ioutil"
+	"k8s.io/cli-runtime/pkg/genericclioptions"
 	"os"
 	"path"
 	"path/filepath"
@@ -281,15 +282,9 @@ func KubeConfigPath() string {
 }
 
 // GetConfig returns rest.Config using $HOME/.kube/config
-func GetConfig() *rest.Config {
-	loadingRules := clientcmd.NewDefaultClientConfigLoadingRules()
-	loadingRules.ExplicitPath = KubeConfigPath()
-	overrides := &clientcmd.ConfigOverrides{}
-	config, err := clientcmd.NewNonInteractiveDeferredLoadingClientConfig(loadingRules, overrides).ClientConfig()
-	if err != nil {
-		log.Warnf("could not open %v Error %v", loadingRules.ExplicitPath, err)
-	}
-	return config
+func GetConfig() (*rest.Config, error) {
+	config, err := genericclioptions.NewConfigFlags().ToRESTConfig()
+	return config, err
 }
 
 // GetServerVersion returns the verison of the k8 api server

diff --git a/bootstrap/pkg/kfapp/existing_arrikto/existing.go b/bootstrap/pkg/kfapp/existing_arrikto/existing.go
@@ -108,7 +108,10 @@ func (existing *Existing) Generate(resources kftypesv3.ResourceEnum) error {
 
 func (existing *Existing) Apply(resources kftypesv3.ResourceEnum) error {
 	// Apply extra components
-	config := kftypesv3.GetConfig()
+	config, err := kftypesv3.GetConfig()
+	if err != nil {
+		return internalError(errors.WithStack(err))
+	}
 
 	// Create namespace
 	// Get a K8s client
@@ -204,7 +207,11 @@ func (existing *Existing) Apply(resources kftypesv3.ResourceEnum) error {
 
 func (existing *Existing) Delete(resources kftypesv3.ResourceEnum) error {
 
-	config := kftypesv3.GetConfig()
+	config, err := kftypesv3.GetConfig()
+	if err != nil {
+		return internalError(errors.WithStack(err))
+	}
+
 	kubeclient, err := client.New(config, client.Options{})
 	if err != nil {
 		return internalError(errors.WithStack(err))
@@ -445,7 +452,11 @@ func getLBAddress(kubeclient client.Client) (string, error) {
 }
 
 func applyManifests(manifests []manifest) error {
-	config := kftypesv3.GetConfig()
+	config, err := kftypesv3.GetConfig()
+	if err != nil {
+		return err
+	}
+
 	for _, m := range manifests {
 		log.Infof("Installing %s...", m.name)
 		err := utils.CreateResourceFromFile(
@@ -461,7 +472,11 @@ func applyManifests(manifests []manifest) error {
 }
 
 func deleteManifests(manifests []manifest) error {
-	config := kftypesv3.GetConfig()
+	config, err := kftypesv3.GetConfig()
+	if err != nil {
+		return err
+	}
+
 	for _, m := range manifests {
 		log.Infof("Deleting %s...", m.name)
 		if _, err := os.Stat(m.path); os.IsNotExist(err) {

diff --git a/bootstrap/pkg/kfapp/kustomize/kustomize.go b/bootstrap/pkg/kfapp/kustomize/kustomize.go
@@ -238,12 +238,13 @@ func (kustomize *kustomize) backfillApplications() error {
 // initK8sClients initializes the K8s clients if they haven't already been initialized.
 // it is a null op otherwise.
 func (kustomize *kustomize) initK8sClients() error {
+	var err error = nil
 	if kustomize.restConfig == nil {
 		log.Infof("Initializing a default restConfig for Kubernetes")
-		kustomize.restConfig = kftypesv3.GetConfig()
+		kustomize.restConfig, err = kftypesv3.GetConfig()
 	}
 
-	return nil
+	return err
 }
 
 // Apply deploys kustomize generated resources to the kubenetes api server