From ea4035d08c0f2e53c7c940952ac68746ad9d97ce Mon Sep 17 00:00:00 2001
From: Daniel Smith <dbsmith@google.com>
Date: Mon, 18 May 2015 16:22:13 -0700
Subject: [PATCH] Revert "Revert "Fix networking test""

This reverts commit a2d24d3e076108e77df8fe6133cc29a66a871f9d.
---
 contrib/for-tests/network-tester/Makefile     |  2 +-
 contrib/for-tests/network-tester/rc.json      | 12 ++++++---
 contrib/for-tests/network-tester/webserver.go | 26 ++++++++++++++-----
 test/e2e/networking.go                        |  2 +-
 4 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/contrib/for-tests/network-tester/Makefile b/contrib/for-tests/network-tester/Makefile
index 4834679d471..e456904d60e 100644
--- a/contrib/for-tests/network-tester/Makefile
+++ b/contrib/for-tests/network-tester/Makefile
@@ -1,7 +1,7 @@
 all: push
 
 # Set this to the *next* version to prevent accidentally overwriting the existing image.
-TAG = 1.4
+TAG = 1.5
 
 webserver: webserver.go
 	CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-w' ./webserver.go
diff --git a/contrib/for-tests/network-tester/rc.json b/contrib/for-tests/network-tester/rc.json
index d52f4343b34..f108cd36eaa 100644
--- a/contrib/for-tests/network-tester/rc.json
+++ b/contrib/for-tests/network-tester/rc.json
@@ -8,7 +8,7 @@
     }
   },
   "spec": {
-    "replicas": 8,
+    "replicas": 2,
     "selector": {
       "name": "nettest"
     },
@@ -22,9 +22,13 @@
         "containers": [
           {
             "name": "webserver",
-            "image": "gcr.io/google_containers/nettest:1.1",
-            "command": [
-              "-service=nettest"
+            "image": "gcr.io/google_containers/nettest:1.4",
+            "imagePullPolicy": "Always",
+            "args": [
+              "-service=nettest",
+              "-port=8080",
+              "-namespace=default",
+              "-peers=2"
             ],
             "ports": [
               {
diff --git a/contrib/for-tests/network-tester/webserver.go b/contrib/for-tests/network-tester/webserver.go
index 384cc9ab9b0..937abc8b633 100644
--- a/contrib/for-tests/network-tester/webserver.go
+++ b/contrib/for-tests/network-tester/webserver.go
@@ -37,13 +37,12 @@ import (
 	"io/ioutil"
 	"log"
 	"math/rand"
+	"net"
 	"net/http"
-	"net/url"
 	"os"
 	"sync"
 	"time"
 
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/client"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
 )
@@ -203,12 +202,25 @@ func main() {
 // Find all sibling pods in the service and post to their /write handler.
 func contactOthers(state *State) {
 	defer state.doneContactingPeers()
-	masterRO := url.URL{
-		Scheme: "http",
-		Host:   os.Getenv("KUBERNETES_RO_SERVICE_HOST") + ":" + os.Getenv("KUBERNETES_RO_SERVICE_PORT"),
-		Path:   "/api/" + latest.Version,
+	token, err := ioutil.ReadFile("/var/run/secrets/kubernetes.io/serviceaccount/token")
+	if err != nil {
+		log.Fatalf("Unable to read service account token: %v", err)
+	}
+	cc := client.Config{
+		Host:        "https://" + net.JoinHostPort(os.Getenv("KUBERNETES_SERVICE_HOST"), os.Getenv("KUBERNETES_SERVICE_PORT")),
+		Version:     "v1beta3",
+		BearerToken: string(token),
+		Insecure:    true, // TOOD: package certs along with the token
+	}
+	client, err := client.New(&cc)
+	if err != nil {
+		log.Fatalf("Unable to create client:\nconfig: %#v\nerror: %v\n", err)
+	}
+	if v, err := client.ServerVersion(); err != nil {
+		log.Fatalf("Unable to get server version: %v\n", err)
+	} else {
+		log.Printf("Server version: %#v\n", v)
 	}
-	client := &client.Client{client.NewRESTClient(&masterRO, latest.Version, latest.Codec, false, 5, 10)}
 
 	// Do this repeatedly, in case there's some propagation delay with getting
 	// newly started pods into the endpoints list.
diff --git a/test/e2e/networking.go b/test/e2e/networking.go
index b507eff7a24..84d62324f50 100644
--- a/test/e2e/networking.go
+++ b/test/e2e/networking.go
@@ -50,7 +50,7 @@ func LaunchNetTestPodPerNode(f *Framework, nodes *api.NodeList, name string) []s
 				Containers: []api.Container{
 					{
 						Name:  "webserver",
-						Image: "gcr.io/google_containers/nettest:1.3",
+						Image: "gcr.io/google_containers/nettest:1.4",
 						Args: []string{
 							"-service=" + name,
 							//peers >= totalPods should be asserted by the container.