Merge pull request #8889 from GoogleCloudPlatform/revert-8829-no-ro-nettest

Revert "Revert "Revert "Fix networking test"""

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.5
+TAG = 1.4
 
 webserver: webserver.go
 	CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-w' ./webserver.go

contrib/for-tests/network-tester/rc.json

@@ -8,7 +8,7 @@
     }
   },
   "spec": {
-    "replicas": 2,
+    "replicas": 8,
     "selector": {
       "name": "nettest"
     },
@@ -22,13 +22,9 @@
         "containers": [
           {
             "name": "webserver",
-            "image": "gcr.io/google_containers/nettest:1.4",
+            "image": "gcr.io/google_containers/nettest:1.1",
-            "imagePullPolicy": "Always",
+            "command": [
-            "args": [
+              "-service=nettest"
-              "-service=nettest",
-              "-port=8080",
-              "-namespace=default",
-              "-peers=2"
             ],
             "ports": [
               {

contrib/for-tests/network-tester/webserver.go

@@ -37,12 +37,13 @@ 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"
 )
@@ -202,25 +203,12 @@ func main() {
 // Find all sibling pods in the service and post to their /write handler.
 func contactOthers(state *State) {
 	defer state.doneContactingPeers()
-	token, err := ioutil.ReadFile("/var/run/secrets/kubernetes.io/serviceaccount/token")
+	masterRO := url.URL{
-	if err != nil {
+		Scheme: "http",
-		log.Fatalf("Unable to read service account token: %v", err)
+		Host:   os.Getenv("KUBERNETES_RO_SERVICE_HOST") + ":" + os.Getenv("KUBERNETES_RO_SERVICE_PORT"),
-	}
+		Path:   "/api/" + latest.Version,
-	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.

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.4",
+						Image: "gcr.io/google_containers/nettest:1.3",
 						Args: []string{
 							"-service=" + name,
 							//peers >= totalPods should be asserted by the container.