From 30ff6e6667a8e887897359bfdc3ad5e39f637ea8 Mon Sep 17 00:00:00 2001 From: kimschles Date: Mon, 10 Jun 2019 13:34:09 -0600 Subject: [PATCH 1/2] [WIP] change GetConfigOrDie to GetConfig --- pkg/kube/resources.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/kube/resources.go b/pkg/kube/resources.go index d2410127..f84e2c26 100644 --- a/pkg/kube/resources.go +++ b/pkg/kube/resources.go @@ -126,7 +126,7 @@ func CreateResourceProviderFromPath(directory string) (*ResourceProvider, error) // CreateResourceProviderFromCluster creates a new ResourceProvider using live data from a cluster func CreateResourceProviderFromCluster() (*ResourceProvider, error) { - kubeConf := config.GetConfigOrDie() + kubeConf := config.GetConfig() api, err := kubernetes.NewForConfig(kubeConf) if err != nil { logrus.Errorf("Error creating Kubernetes client %v", err) From b32a7afa774d0be89c4427033c78a2b925ed4243 Mon Sep 17 00:00:00 2001 From: kimschles Date: Tue, 11 Jun 2019 13:46:12 -0600 Subject: [PATCH 2/2] update tests --- pkg/kube/resources.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkg/kube/resources.go b/pkg/kube/resources.go index f84e2c26..bfd27bba 100644 --- a/pkg/kube/resources.go +++ b/pkg/kube/resources.go @@ -126,7 +126,11 @@ func CreateResourceProviderFromPath(directory string) (*ResourceProvider, error) // CreateResourceProviderFromCluster creates a new ResourceProvider using live data from a cluster func CreateResourceProviderFromCluster() (*ResourceProvider, error) { - kubeConf := config.GetConfig() + kubeConf, configError := config.GetConfig() + if configError != nil { + logrus.Errorf("Error fetching KubeConfig %v", configError) + return nil, configError + } api, err := kubernetes.NewForConfig(kubeConf) if err != nil { logrus.Errorf("Error creating Kubernetes client %v", err)