From 90d371c98fc9ba586348b85bb1c369a1d63cd99c Mon Sep 17 00:00:00 2001
From: nikhiljindal <nikhiljindal@google.com>
Date: Thu, 9 Jul 2015 17:49:45 -0700
Subject: [PATCH] Updating nettest image to latest code

---
 contrib/for-tests/network-tester/Makefile | 2 +-
 contrib/for-tests/network-tester/rc.json  | 2 +-
 test/e2e/networking.go                    | 2 +-
 test/e2e/pre_stop.go                      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/contrib/for-tests/network-tester/Makefile b/contrib/for-tests/network-tester/Makefile
index 8f64b465eaa..4b919a7ff13 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.5
+TAG = 1.6
 
 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 1786893e08a..0e7375a5262 100644
--- a/contrib/for-tests/network-tester/rc.json
+++ b/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",
diff --git a/test/e2e/networking.go b/test/e2e/networking.go
index a7ca94e191f..915fd53af3b 100644
--- a/test/e2e/networking.go
+++ b/test/e2e/networking.go
@@ -164,7 +164,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() {
diff --git a/test/e2e/pre_stop.go b/test/e2e/pre_stop.go
index ddf12d7262d..43c009a41ee 100644
--- a/test/e2e/pre_stop.go
+++ b/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}},
 				},
 			},