Skip to content
This repository has been archived by the owner on Jun 29, 2022. It is now read-only.

Commit

Permalink
pkg/k8sutil: remove unused NewClientsetFromFile
Browse files Browse the repository at this point in the history
Signed-off-by: Mateusz Gozdek <mateusz@kinvolk.io>
  • Loading branch information
invidian committed Jul 1, 2020
1 parent 48721f3 commit 2ba8cef
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 68 deletions.
16 changes: 0 additions & 16 deletions pkg/k8sutil/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
52 changes: 0 additions & 52 deletions pkg/k8sutil/client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
package k8sutil_test

import (
"io/ioutil"
"os"
"testing"

"github.com/kinvolk/lokomotive/pkg/k8sutil"
Expand Down Expand Up @@ -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")
}
}

0 comments on commit 2ba8cef

Please sign in to comment.