diff --git a/pkg/k8sutil/client.go b/pkg/k8sutil/client.go index 991b346d4..4cd495e50 100644 --- a/pkg/k8sutil/client.go +++ b/pkg/k8sutil/client.go @@ -22,22 +22,6 @@ import ( "k8s.io/client-go/tools/clientcmd" ) -// NewClientsetFromFile creates a new Kubernetes Client set object from the given -// kubeconfig file path. -func NewClientsetFromFile(kubeconfigPath string) (*kubernetes.Clientset, error) { - c, err := clientcmd.BuildConfigFromFlags("", kubeconfigPath) - if err != nil { - return nil, err - } - - apiclientset, err := kubernetes.NewForConfig(c) - if err != nil { - return nil, err - } - - return apiclientset, nil -} - // NewClientset creates new Kubernetes Client set object from the contents // of the given kubeconfig file. func NewClientset(data []byte) (*kubernetes.Clientset, error) { diff --git a/pkg/k8sutil/client_test.go b/pkg/k8sutil/client_test.go index 77a2d52ec..c6a206454 100644 --- a/pkg/k8sutil/client_test.go +++ b/pkg/k8sutil/client_test.go @@ -15,8 +15,6 @@ package k8sutil_test import ( - "io/ioutil" - "os" "testing" "github.com/kinvolk/lokomotive/pkg/k8sutil" @@ -54,53 +52,3 @@ func TestNewClientsetInvalidKubeconfig(t *testing.T) { t.Fatalf("creating clientset from invalid kubeconfig should fail") } } - -func TestNewClientsetFromValidKubeconfigFile(t *testing.T) { - tmpFile, err := ioutil.TempFile("", "lokoctl-tests-") - if err != nil { - t.Fatalf("creating tmp file should succeed, got: %v", err) - } - - defer func() { - if err := os.Remove(tmpFile.Name()); err != nil { - t.Logf("failed to remove tmp file %q: %v", tmpFile.Name(), err) - } - }() - - if _, err := tmpFile.Write([]byte(validKubeconfig)); err != nil { - t.Fatalf("writing to tmp file %q should succeed, got: %v", tmpFile.Name(), err) - } - - if err := tmpFile.Close(); err != nil { - t.Fatalf("closing tmp file %q should succeed, got: %v", tmpFile.Name(), err) - } - - if _, err := k8sutil.NewClientsetFromFile(tmpFile.Name()); err != nil { - t.Fatalf("creating clientset from valid kubeconfig file should succeed, got: %v", err) - } -} - -func TestNewClientsetFromInvalidKubeconfigFile(t *testing.T) { - tmpFile, err := ioutil.TempFile("", "lokoctl-tests-") - if err != nil { - t.Fatalf("creating tmp file should succeed, got: %v", err) - } - - defer func() { - if err := os.Remove(tmpFile.Name()); err != nil { - t.Logf("failed to remove tmp file %q: %v", tmpFile.Name(), err) - } - }() - - if _, err := tmpFile.Write([]byte("foo")); err != nil { - t.Fatalf("writing to tmp file %q should succeed, got: %v", tmpFile.Name(), err) - } - - if err := tmpFile.Close(); err != nil { - t.Fatalf("closing tmp file %q should succeed, got: %v", tmpFile.Name(), err) - } - - if _, err := k8sutil.NewClientsetFromFile(tmpFile.Name()); err == nil { - t.Fatalf("creating clientset from invalid kubeconfig file should fail") - } -}