From 1d7cdffebccff877b0792010930a97c19b79da71 Mon Sep 17 00:00:00 2001
From: bprashanth <beeps@google.com>
Date: Sun, 18 Sep 2016 16:26:07 -0700
Subject: [PATCH] Cleanup netexec image and usage.

---
 test/e2e/common/kubelet_etc_hosts.go | 2 +-
 test/e2e/common/privileged.go        | 2 +-
 test/e2e/networking_utils.go         | 2 +-
 test/e2e/service.go                  | 2 +-
 test/images/netexec/Makefile         | 2 +-
 test/images/netexec/netexec.go       | 5 +++--
 6 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/test/e2e/common/kubelet_etc_hosts.go b/test/e2e/common/kubelet_etc_hosts.go
index 4bce13edf3..48cac62e50 100644
--- a/test/e2e/common/kubelet_etc_hosts.go
+++ b/test/e2e/common/kubelet_etc_hosts.go
@@ -25,7 +25,7 @@ import (
 )
 
 const (
-	kubeletEtcHostsImageName          = "gcr.io/google_containers/netexec:1.4"
+	kubeletEtcHostsImageName          = "gcr.io/google_containers/netexec:1.7"
 	kubeletEtcHostsPodName            = "test-pod"
 	kubeletEtcHostsHostNetworkPodName = "test-host-network-pod"
 	etcHostsPartialContent            = "# Kubernetes-managed hosts file."
diff --git a/test/e2e/common/privileged.go b/test/e2e/common/privileged.go
index 1f68de866d..a45d1c301d 100644
--- a/test/e2e/common/privileged.go
+++ b/test/e2e/common/privileged.go
@@ -35,7 +35,7 @@ const (
 	notPrivilegedHttpPort      = 9090
 	notPrivilegedUdpPort       = 9091
 	notPrivilegedContainerName = "not-privileged-container"
-	privilegedContainerImage   = "gcr.io/google_containers/netexec:1.4"
+	privilegedContainerImage   = "gcr.io/google_containers/netexec:1.7"
 	privilegedCommand          = "ip link add dummy1 type dummy"
 )
 
diff --git a/test/e2e/networking_utils.go b/test/e2e/networking_utils.go
index cf2b56e3de..a1c6f7fbc3 100644
--- a/test/e2e/networking_utils.go
+++ b/test/e2e/networking_utils.go
@@ -43,7 +43,7 @@ const (
 	testContainerHttpPort = 8080
 	clusterHttpPort       = 80
 	clusterUdpPort        = 90
-	netexecImageName      = "gcr.io/google_containers/netexec:1.5"
+	netexecImageName      = "gcr.io/google_containers/netexec:1.7"
 	hostexecImageName     = "gcr.io/google_containers/hostexec:1.2"
 	testPodName           = "test-container-pod"
 	hostTestPodName       = "host-test-container-pod"
diff --git a/test/e2e/service.go b/test/e2e/service.go
index 95967817a4..d3c6cc2fd7 100644
--- a/test/e2e/service.go
+++ b/test/e2e/service.go
@@ -2073,7 +2073,7 @@ func (j *ServiceTestJig) newRCTemplate(namespace string) *api.ReplicationControl
 					Containers: []api.Container{
 						{
 							Name:  "netexec",
-							Image: "gcr.io/google_containers/netexec:1.6",
+							Image: "gcr.io/google_containers/netexec:1.7",
 							Args:  []string{"--http-port=80", "--udp-port=80"},
 							ReadinessProbe: &api.Probe{
 								PeriodSeconds: 3,
diff --git a/test/images/netexec/Makefile b/test/images/netexec/Makefile
index c2188a4356..5ff3806477 100644
--- a/test/images/netexec/Makefile
+++ b/test/images/netexec/Makefile
@@ -14,7 +14,7 @@
 
 .PHONY: all netexec image push clean
 
-TAG = 1.6
+TAG = 1.7
 PREFIX = gcr.io/google_containers
 
 
diff --git a/test/images/netexec/netexec.go b/test/images/netexec/netexec.go
index 9aae7fd1a5..a3b231a612 100644
--- a/test/images/netexec/netexec.go
+++ b/test/images/netexec/netexec.go
@@ -87,6 +87,7 @@ func startHTTPServer(httpPort int) {
 	http.HandleFunc("/shell", shellHandler)
 	http.HandleFunc("/upload", uploadHandler)
 	http.HandleFunc("/dial", dialHandler)
+	http.HandleFunc("/healthz", healthzHandler)
 	// older handlers
 	http.HandleFunc("/hostName", hostNameHandler)
 	http.HandleFunc("/shutdown", shutdownHandler)
@@ -120,13 +121,12 @@ func exitHandler(w http.ResponseWriter, r *http.Request) {
 func hostnameHandler(w http.ResponseWriter, r *http.Request) {
 	log.Printf("GET /hostname")
 	fmt.Fprintf(w, getHostName())
-	http.HandleFunc("/healthz", healthzHandler)
-	log.Fatal(http.ListenAndServe(fmt.Sprintf(":%d", httpPort), nil))
 }
 
 // healthHandler response with a 200 if the UDP server is ready. It also serves
 // as a health check of the HTTP server by virtue of being a HTTP handler.
 func healthzHandler(w http.ResponseWriter, r *http.Request) {
+	log.Printf("GET /healthz")
 	if serverReady.get() {
 		w.WriteHeader(200)
 		return
@@ -348,6 +348,7 @@ func uploadHandler(w http.ResponseWriter, r *http.Request) {
 }
 
 func hostNameHandler(w http.ResponseWriter, r *http.Request) {
+	log.Printf("GET /hostName")
 	fmt.Fprintf(w, getHostName())
 }