diff --git a/cluster/saltbase/salt/e2e-image-puller/e2e-image-puller.manifest b/cluster/saltbase/salt/e2e-image-puller/e2e-image-puller.manifest index b0c2104b91b..277035bdee8 100644 --- a/cluster/saltbase/salt/e2e-image-puller/e2e-image-puller.manifest +++ b/cluster/saltbase/salt/e2e-image-puller/e2e-image-puller.manifest @@ -27,7 +27,7 @@ spec: command: - /bin/sh - -c - - "for i in gcr.io/google_containers/busybox gcr.io/google_containers/busybox:1.24 gcr.io/google_containers/dnsutils:e2e gcr.io/google_containers/eptest:0.1 gcr.io/google_containers/fakegitserver:0.1 gcr.io/google_containers/hostexec:1.2 gcr.io/google_containers/iperf:e2e gcr.io/google_containers/jessie-dnsutils:e2e gcr.io/google_containers/liveness:e2e gcr.io/google_containers/mounttest:0.7 gcr.io/google_containers/mounttest-user:0.3 gcr.io/google_containers/netexec:1.4 gcr.io/google_containers/netexec:1.5 gcr.io/google_containers/nettest:1.7 gcr.io/google_containers/nettest:1.8 gcr.io/google_containers/nginx-slim:0.7 gcr.io/google_containers/n-way-http:1.0 gcr.io/google_containers/pause:2.0 gcr.io/google_containers/pause-amd64:3.0 gcr.io/google_containers/porter:cd5cb5791ebaa8641955f0e8c2a9bed669b1eaab gcr.io/google_containers/portforwardtester:1.0 gcr.io/google_containers/redis:e2e gcr.io/google_containers/resource_consumer:beta4 gcr.io/google_containers/resource_consumer/controller:beta4 gcr.io/google_containers/serve_hostname:v1.4 gcr.io/google_containers/test-webserver:e2e gcr.io/google_containers/ubuntu:14.04 gcr.io/google_containers/update-demo:kitten gcr.io/google_containers/update-demo:nautilus gcr.io/google_containers/volume-ceph:0.1 gcr.io/google_containers/volume-gluster:0.2 gcr.io/google_containers/volume-iscsi:0.1 gcr.io/google_containers/volume-nfs:0.6 gcr.io/google_containers/volume-rbd:0.1 gcr.io/google_samples/gb-redisslave:v1 gcr.io/google_containers/redis:v1; do echo $(date '+%X') pulling $i; docker pull $i 1>/dev/null; done; exit 0;" + - "for i in gcr.io/google_containers/busybox gcr.io/google_containers/busybox:1.24 gcr.io/google_containers/dnsutils:e2e gcr.io/google_containers/eptest:0.1 gcr.io/google_containers/fakegitserver:0.1 gcr.io/google_containers/hostexec:1.2 gcr.io/google_containers/iperf:e2e gcr.io/google_containers/jessie-dnsutils:e2e gcr.io/google_containers/liveness:e2e gcr.io/google_containers/mounttest:0.7 gcr.io/google_containers/mounttest-user:0.3 gcr.io/google_containers/netexec:1.4 gcr.io/google_containers/netexec:1.7 gcr.io/google_containers/nettest:1.7 gcr.io/google_containers/nettest:1.8 gcr.io/google_containers/nginx-slim:0.7 gcr.io/google_containers/n-way-http:1.0 gcr.io/google_containers/pause:2.0 gcr.io/google_containers/pause-amd64:3.0 gcr.io/google_containers/porter:cd5cb5791ebaa8641955f0e8c2a9bed669b1eaab gcr.io/google_containers/portforwardtester:1.0 gcr.io/google_containers/redis:e2e gcr.io/google_containers/resource_consumer:beta4 gcr.io/google_containers/resource_consumer/controller:beta4 gcr.io/google_containers/serve_hostname:v1.4 gcr.io/google_containers/test-webserver:e2e gcr.io/google_containers/ubuntu:14.04 gcr.io/google_containers/update-demo:kitten gcr.io/google_containers/update-demo:nautilus gcr.io/google_containers/volume-ceph:0.1 gcr.io/google_containers/volume-gluster:0.2 gcr.io/google_containers/volume-iscsi:0.1 gcr.io/google_containers/volume-nfs:0.6 gcr.io/google_containers/volume-rbd:0.1 gcr.io/google_samples/gb-redisslave:v1 gcr.io/google_containers/redis:v1; do echo $(date '+%X') pulling $i; docker pull $i 1>/dev/null; done; exit 0;" securityContext: privileged: true volumeMounts: diff --git a/test/e2e/common/kubelet_etc_hosts.go b/test/e2e/common/kubelet_etc_hosts.go index 4bce13edf3b..48cac62e50d 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 1f68de866d2..a45d1c301de 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 cf2b56e3de3..a1c6f7fbc32 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 95967817a46..d3c6cc2fd76 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/e2e_node/image_list.go b/test/e2e_node/image_list.go index 5ffe193cc6e..a6031703661 100644 --- a/test/e2e_node/image_list.go +++ b/test/e2e_node/image_list.go @@ -43,6 +43,7 @@ var NodeImageWhiteList = sets.NewString( "gcr.io/google_containers/busybox:1.24", "gcr.io/google_containers/nginx-slim:0.7", "gcr.io/google_containers/serve_hostname:v1.4", + "gcr.io/google_containers/netexec:1.7", framework.GetPauseImageNameForHostArch(), ) diff --git a/test/images/netexec/Makefile b/test/images/netexec/Makefile index c2188a4356c..5ff38064774 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 9aae7fd1a52..a3b231a612f 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()) }