Allow setup of port forwarder by passing custom PortForward struct

go.mod

@@ -15,7 +15,6 @@ require (
 	github.com/gophercloud/gophercloud v0.0.0-20180807015416-4ea085781bae // indirect
 	github.com/imdario/mergo v0.3.5 // indirect
 	github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be // indirect
-	github.com/justinbarrick/go-k8s-portforward v1.0.2
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 // indirect
 	github.com/pkg/errors v0.8.0

portforward.go

@@ -2,8 +2,11 @@ package portforward
 
 import (
 	"fmt"
-	"github.com/pkg/errors"
 	"io/ioutil"
+	"net"
+	"net/http"
+
+	"github.com/pkg/errors"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/fields"
@@ -14,8 +17,6 @@ import (
 	"k8s.io/client-go/tools/clientcmd"
 	"k8s.io/client-go/tools/portforward"
 	"k8s.io/client-go/transport/spdy"
-	"net"
-	"net/http"
 )
 
 // Used for creating a port forward into a Kubernetes pod
@@ -50,20 +51,63 @@ func NewPortForwarder(namespace string, labels metav1.LabelSelector, port int) (
 	}
 
 	var err error
-	pf.Config, err = clientcmd.NewNonInteractiveDeferredLoadingClientConfig(
+
+	pf.Config, err = getKubernetesConfig()
+	if err != nil {
+		return pf, err
+	}
+
+	pf.Clientset, err = getKubernetesClient(pf.Config)
+	if err != nil {
+		return pf, err
+	}
+
+	return pf, nil
+}
+
+//NewPortForwarderCustom initializes a port forwarder. This is different than the regular
+//NewPortForwarder in the sense that it allows you to customly build the PortForward
+//by hand and pass it as a parameter.
+//Useful if you want to query directly by pod name, for instance
+func NewPortForwarderCustom(pf *PortForward) (*PortForward, error) {
+	var err error
+
+	pf.Config, err = getKubernetesConfig()
+	if err != nil {
+		return pf, err
+	}
+
+	pf.Clientset, err = getKubernetesClient(pf.Config)
+	if err != nil {
+		return pf, err
+	}
+
+	return pf, nil
+}
+
+//GetKubernetesConfig loads the default k8s config in ~/.kube/config
+func getKubernetesConfig() (*rest.Config, error) {
+	config, err := clientcmd.NewNonInteractiveDeferredLoadingClientConfig(
 		clientcmd.NewDefaultClientConfigLoadingRules(),
 		&clientcmd.ConfigOverrides{},
 	).ClientConfig()
+
 	if err != nil {
-		return pf, errors.Wrap(err, "Could not load kubernetes configuration file")
+		return config, errors.Wrap(err, "Could not load kubernetes configuration file")
 	}
 
-	pf.Clientset, err = kubernetes.NewForConfig(pf.Config)
+	return config, nil
+}
+
+//GetKubernetesClient gets the initialized Kubernetes client
+func getKubernetesClient(config *rest.Config) (kubernetes.Interface, error) {
+	client, err := kubernetes.NewForConfig(config)
+
 	if err != nil {
-		return pf, errors.Wrap(err, "Could not create kubernetes client")
+		return client, errors.Wrap(err, "Could not create kubernetes client")
 	}
 
-	return pf, nil
+	return client, nil
 }
 
 // Start a port forward to a pod - blocks until the tunnel is ready for use.

portforward_test.go

@@ -1,11 +1,12 @@
 package portforward
 
 import (
+	"testing"
+
 	"github.com/stretchr/testify/assert"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	fakekubernetes "k8s.io/client-go/kubernetes/fake"
-	"testing"
 )
 
 func newPod(name string, labels map[string]string) *corev1.Pod {
@@ -58,7 +59,7 @@ func TestFindPodByLabelsNoneExist(t *testing.T) {
 
 	_, err := pf.findPodByLabels()
 	assert.NotNil(t, err)
-	assert.Equal(t, "Could not find pod for selector: labels \"name=flux\"", err.Error())
+	assert.Equal(t, "Could not find running pod for selector: labels \"name=flux\"", err.Error())
 }
 
 func TestFindPodByLabelsMultiple(t *testing.T) {
@@ -132,7 +133,7 @@ func TestFindPodByLabelsExpressionNotFound(t *testing.T) {
 
 	_, err := pf.findPodByLabels()
 	assert.NotNil(t, err)
-	assert.Equal(t, "Could not find pod for selector: labels \"name in (flux,fluxd)\"", err.Error())
+	assert.Equal(t, "Could not find running pod for selector: labels \"name in (flux,fluxd)\"", err.Error())
 }
 
 func TestGetPodNameNameSet(t *testing.T) {