From 776ed3fa0f045d06f5d04dc733ec5baa7a395c47 Mon Sep 17 00:00:00 2001
From: Oleksii Kliukin <oleksii.kliukin@zalando.de>
Date: Tue, 7 Mar 2017 14:39:41 +0100
Subject: [PATCH] Simplify getting configuration.

---
 pkg/util/k8sutil/k8sutil.go | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/pkg/util/k8sutil/k8sutil.go b/pkg/util/k8sutil/k8sutil.go
index e797c4282..924bf569e 100644
--- a/pkg/util/k8sutil/k8sutil.go
+++ b/pkg/util/k8sutil/k8sutil.go
@@ -14,19 +14,11 @@ import (
 	"github.bus.zalan.do/acid/postgres-operator/pkg/util/constants"
 )
 
-func RestConfig(kubeConfig string, outOfCluster bool) (config *rest.Config, err error) {
+func RestConfig(kubeConfig string, outOfCluster bool) (*rest.Config, error) {
 	if outOfCluster {
-		/* out-of-cluster process */
-		rules := clientcmd.NewDefaultClientConfigLoadingRules()
-		overrides := &clientcmd.ConfigOverrides{}
-		rules.ExplicitPath = kubeConfig
-		config, err = clientcmd.NewNonInteractiveDeferredLoadingClientConfig(rules, overrides).ClientConfig()
-	} else {
-		/* in-cluster pod */
-		config, err = rest.InClusterConfig()
+		return clientcmd.BuildConfigFromFlags("", kubeConfig)
 	}
-
-	return
+	return rest.InClusterConfig()
 }
 
 func KubernetesClient(config *rest.Config) (client *kubernetes.Clientset, err error) {