github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 01:40:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #33006 from bprashanth/netexec

Browse Source 
Automatic merge from submit-queue

Cleanup netexec image and usage.

Get tests onto 1.7 and fix a bug in netexec's http handler
This commit is contained in:
Kubernetes Submit Queue 2016-10-04 18:27:36 -07:00 committed by GitHub
commit 5d271dc486
8 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/saltbase/salt/e2e-image-puller/e2e-image-puller.manifest
View File

@ -27,7 +27,7 @@ spec:
command: command:
- /bin/sh - /bin/sh
- -c - -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: securityContext:
privileged: true privileged: true
volumeMounts: volumeMounts:

2
test/e2e/common/kubelet_etc_hosts.go
View File

@ -25,7 +25,7 @@ import (
) )
const ( const (
kubeletEtcHostsImageName = "gcr.io/google_containers/netexec:1.4" kubeletEtcHostsImageName = "gcr.io/google_containers/netexec:1.7"
kubeletEtcHostsPodName = "test-pod" kubeletEtcHostsPodName = "test-pod"
kubeletEtcHostsHostNetworkPodName = "test-host-network-pod" kubeletEtcHostsHostNetworkPodName = "test-host-network-pod"
etcHostsPartialContent = "# Kubernetes-managed hosts file." etcHostsPartialContent = "# Kubernetes-managed hosts file."

2
test/e2e/common/privileged.go
View File

@ -35,7 +35,7 @@ const (
notPrivilegedHttpPort = 9090 notPrivilegedHttpPort = 9090
notPrivilegedUdpPort = 9091 notPrivilegedUdpPort = 9091
notPrivilegedContainerName = "not-privileged-container" 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" privilegedCommand = "ip link add dummy1 type dummy"
) )

2
test/e2e/networking_utils.go
View File

@ -43,7 +43,7 @@ const (
testContainerHttpPort = 8080 testContainerHttpPort = 8080
clusterHttpPort = 80 clusterHttpPort = 80
clusterUdpPort = 90 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" hostexecImageName = "gcr.io/google_containers/hostexec:1.2"
testPodName = "test-container-pod" testPodName = "test-container-pod"
hostTestPodName = "host-test-container-pod" hostTestPodName = "host-test-container-pod"

2
test/e2e/service.go
View File

@ -2073,7 +2073,7 @@ func (j *ServiceTestJig) newRCTemplate(namespace string) *api.ReplicationControl
Containers: []api.Container{ Containers: []api.Container{
{ {
Name: "netexec", 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"}, Args: []string{"--http-port=80", "--udp-port=80"},
ReadinessProbe: &api.Probe{ ReadinessProbe: &api.Probe{
PeriodSeconds: 3, PeriodSeconds: 3,

1
test/e2e_node/image_list.go
View File

@ -43,6 +43,7 @@ var NodeImageWhiteList = sets.NewString(
"gcr.io/google_containers/busybox:1.24", "gcr.io/google_containers/busybox:1.24",
"gcr.io/google_containers/nginx-slim:0.7", "gcr.io/google_containers/nginx-slim:0.7",
"gcr.io/google_containers/serve_hostname:v1.4", "gcr.io/google_containers/serve_hostname:v1.4",
"gcr.io/google_containers/netexec:1.7",
framework.GetPauseImageNameForHostArch(), framework.GetPauseImageNameForHostArch(),
) )

2
test/images/netexec/Makefile
View File

@ -14,7 +14,7 @@
.PHONY: all netexec image push clean .PHONY: all netexec image push clean
TAG = 1.6 TAG = 1.7
PREFIX = gcr.io/google_containers PREFIX = gcr.io/google_containers

5
test/images/netexec/netexec.go
View File

@ -87,6 +87,7 @@ func startHTTPServer(httpPort int) {
http.HandleFunc("/shell", shellHandler) http.HandleFunc("/shell", shellHandler)
http.HandleFunc("/upload", uploadHandler) http.HandleFunc("/upload", uploadHandler)
http.HandleFunc("/dial", dialHandler) http.HandleFunc("/dial", dialHandler)
http.HandleFunc("/healthz", healthzHandler)
// older handlers // older handlers
http.HandleFunc("/hostName", hostNameHandler) http.HandleFunc("/hostName", hostNameHandler)
http.HandleFunc("/shutdown", shutdownHandler) http.HandleFunc("/shutdown", shutdownHandler)
@ -120,13 +121,12 @@ func exitHandler(w http.ResponseWriter, r *http.Request) {
func hostnameHandler(w http.ResponseWriter, r *http.Request) { func hostnameHandler(w http.ResponseWriter, r *http.Request) {
log.Printf("GET /hostname") log.Printf("GET /hostname")
fmt.Fprintf(w, getHostName()) 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 // 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. // as a health check of the HTTP server by virtue of being a HTTP handler.
func healthzHandler(w http.ResponseWriter, r *http.Request) { func healthzHandler(w http.ResponseWriter, r *http.Request) {
log.Printf("GET /healthz")
if serverReady.get() { if serverReady.get() {
w.WriteHeader(200) w.WriteHeader(200)
return return
@ -348,6 +348,7 @@ func uploadHandler(w http.ResponseWriter, r *http.Request) {
} }
func hostNameHandler(w http.ResponseWriter, r *http.Request) { func hostNameHandler(w http.ResponseWriter, r *http.Request) {
log.Printf("GET /hostName")
fmt.Fprintf(w, getHostName()) fmt.Fprintf(w, getHostName())
} }