Merge pull request #11035 from nikhiljindal/nettest

Updating nettest image to latest code

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

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

@@ -22,7 +22,7 @@
         "containers": [
           {
             "name": "webserver",
-            "image": "gcr.io/google_containers/nettest:1.4",
+            "image": "gcr.io/google_containers/nettest:1.6",
             "imagePullPolicy": "Always",
             "args": [
               "-service=nettest",

test/e2e/networking.go

@@ -162,7 +162,7 @@ var _ = Describe("Networking", func() {
 				"Rerun it with at least two nodes to get complete coverage.")
 		}
 
-		podNames := LaunchNetTestPodPerNode(f, nodes, svcname, "1.4")
+		podNames := LaunchNetTestPodPerNode(f, nodes, svcname, "1.6")
 
 		// Clean up the pods
 		defer func() {

test/e2e/pre_stop.go

@@ -43,7 +43,7 @@ func testPreStop(c *client.Client, ns string) {
 			Containers: []api.Container{
 				{
 					Name:  "server",
-					Image: "gcr.io/google_containers/nettest:1.3",
+					Image: "gcr.io/google_containers/nettest:1.6",
 					Ports: []api.ContainerPort{{ContainerPort: 8080}},
 				},
 			},