Fix issue with e2e tests

Signed-off-by: Pavol Loffay <[email protected]>

Gopkg.toml

@@ -72,6 +72,6 @@ required = [
     non-go = false
     unused-packages = false
 
-[[constraint]]
+[[override]]
   name = "github.com/pkg/errors"
   version = "0.8.0"

test/e2e/cassandra.go

@@ -66,18 +66,16 @@ func cassandraTest(t *testing.T, f *framework.Framework, ctx *framework.TestCtx)
 		return err
 	}
 
-	jaegerPod, err := GetPod(namespace, "with-cassandra", "with-cassandra", f.KubeClient)
+	jaegerPod, err := GetPod(namespace, "with-cassandra", "jaegertracing/all-in-one", f.KubeClient)
 	if err != nil {
 		return err
 	}
-	portForw, closeChan, err := CreatePortForward(namespace, jaegerPod.Name, []string{"16686:16686", "14268:14268"}, f.KubeConfig)
+	portForw, closeChan, err := CreatePortForward(namespace, jaegerPod.Name, []string{"16686", "14268"}, f.KubeConfig)
 	if err != nil {
 		return err
 	}
 	defer portForw.Close()
 	defer close(closeChan)
-	go func() { portForw.ForwardPorts() }()
-	<- portForw.Ready
 	return SmokeTest("http://localhost:16686/api/traces", "http://localhost:14268/api/traces", "foobar", retryInterval, timeout)
 }
 

test/e2e/port_forward.go

@@ -3,8 +3,8 @@ package e2e
 import (
 	"bytes"
 	"fmt"
-	"net/url"
 	"net/http"
+	"net/url"
 	"strings"
 
 	"k8s.io/client-go/rest"
@@ -39,5 +39,11 @@ func CreatePortForward(namespace, pod string, ports []string, kConfig *rest.Conf
 			fmt.Println(out.String())
 		}
 	}()
+	go func() {
+		if err := forwarder.ForwardPorts(); err != nil {
+			panic(err)
+		}
+	}()
+	<- forwarder.Ready
 	return forwarder, stopChan, nil
 }

test/e2e/production_test.go

@@ -68,29 +68,25 @@ func simpleProd(t *testing.T, f *framework.Framework, ctx *framework.TestCtx) er
 	if err != nil {
 		return err
 	}
-	queryPod, err := GetPod(namespace, "simple-prod-query","simple-prod", f.KubeClient)
+	queryPod, err := GetPod(namespace, "simple-prod-query","jaegertracing/jaeger-query", f.KubeClient)
 	if err != nil {
 		return err
 	}
-	collectorPod, err := GetPod(namespace, "simple-prod-collector","simple-prod", f.KubeClient)
+	collectorPod, err := GetPod(namespace, "simple-prod-collector","jaegertracing/jaeger-collector", f.KubeClient)
 	if err != nil {
 		return err
 	}
-	portForw, closeChan, err := CreatePortForward(namespace, queryPod.Name, []string{"16686:16686"}, f.KubeConfig)
+	portForw, closeChan, err := CreatePortForward(namespace, queryPod.Name, []string{"16686"}, f.KubeConfig)
 	if err != nil {
 		return err
 	}
 	defer portForw.Close()
 	defer close(closeChan)
-	go func() { portForw.ForwardPorts() }()
-	<- portForw.Ready
-	portForwColl, closeChanColl, err := CreatePortForward(namespace, collectorPod.Name, []string{"14268:14268"}, f.KubeConfig)
+	portForwColl, closeChanColl, err := CreatePortForward(namespace, collectorPod.Name, []string{"14268"}, f.KubeConfig)
 	if err != nil {
 		return err
 	}
 	defer portForwColl.Close()
 	defer close(closeChanColl)
-	go func() { portForwColl.ForwardPorts() }()
-	<- portForwColl.Ready
 	return SmokeTest("http://localhost:16686/api/traces", "http://localhost:14268/api/traces", "foobar", retryInterval, timeout)
 }

test/e2e/utils.go

@@ -11,19 +11,19 @@ import (
 )
 
 // GetPod returns pod name
-func GetPod(namespace, namePrefix, ownerNamePrefix string, kubeclient kubernetes.Interface) (v1.Pod, error) {
-	pods, err := kubeclient.CoreV1().Pods(namespace).List(metav1.ListOptions{IncludeUninitialized:true})
+func GetPod(namespace, namePrefix, containsImage string, kubeclient kubernetes.Interface) (v1.Pod, error) {
+	pods, err := kubeclient.CoreV1().Pods(namespace).List(metav1.ListOptions{})
 	if err != nil {
 		return v1.Pod{}, err
 	}
 	for _, pod := range pods.Items {
 		if strings.HasPrefix(pod.Name, namePrefix) {
-			for _, or := range pod.OwnerReferences {
-				if strings.HasPrefix(or.Name, ownerNamePrefix) {
+			for _, c := range pod.Spec.Containers {
+				if strings.Contains(c.Image, containsImage) {
 					return pod, nil
 				}
 			}
 		}
 	}
-	return v1.Pod{}, errors.New(fmt.Sprintf("could not find pod of owner %s", ownerNamePrefix))
+	return v1.Pod{}, errors.New(fmt.Sprintf("could not find pod with image %s", containsImage))
 }