github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 03:41:45 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #58184 from yguo0905/hostexec

Browse Source 
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

e2e test: use sleep to wait in hostexec

**What this PR does / why we need it**:

The test image hostexec waits forever by reading a named pipe that nobody writes.
09cf6c9776/test/images/hostexec/Dockerfile (L25)

Because of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=c6c70f4455d1eda91065e93cc4f7eddf4499b105, on OS images with kernel 4.11+, the wait will be interrupted unexpectedly.

```
ygg@ubuntu-gke-1604-xenial-v20171222-vm:~$ sudo docker run -d gcr.io/kubernetes-e2e-test-images/hostexec-amd64:1.0
a428c06ebd3b9a13504e453107d3fb69e859f731cae3ca0fdf898a646e394632
ygg@ubuntu-gke-1604-xenial-v20171222-vm:~$ sudo docker exec -it a428c06ebd /bin/sh
/ # timeout -t 1 cat
Terminated
ygg@ubuntu-gke-1604-xenial-v20171222-vm:~$ sudo docker logs a428c06ebd        
/bin/sh: can't open /fifo: Interrupted system call
```

Changed to use `sleep` to avoid this issue.

**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:

This PR fixes the test failure in https://k8s-gubernator.appspot.com/build/kubernetes-jenkins/logs/ci-kubernetes-e2e-gke-ubuntustable1-k8sstable1-reboot/3140

**Special notes for your reviewer**:

**Release note**:

```
None
```
This commit is contained in:
Kubernetes Submit Queue 2018-02-05 13:15:33 -08:00 committed by GitHub
commit c0c74918c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/gce/manifests/e2e-image-puller.manifest
View File

@ -38,7 +38,6 @@ spec:
gcr.io/google_containers/eptest:0.1
gcr.io/google_containers/fakegitserver:0.1
gcr.io/google_containers/galera-install:0.1
gcr.io/google_containers/hostexec:1.2
gcr.io/google_containers/invalid-image:invalid-tag
gcr.io/google_containers/iperf:e2e
gcr.io/google_containers/jessie-dnsutils:e2e
@ -65,6 +64,7 @@ spec:
gcr.io/google_containers/resource_consumer:beta4
gcr.io/google_containers/resource_consumer/controller:beta4
gcr.io/kubernetes-e2e-test-images/serve-hostname-amd64:1.1
gcr.io/kubernetes-e2e-test-images/hostexec-amd64:1.1
gcr.io/google_containers/servicelb:0.1
gcr.io/google_containers/test-webserver:e2e
gcr.io/google_containers/update-demo:kitten

2
test/images/hostexec/Dockerfile
View File

@ -22,4 +22,4 @@ CROSS_BUILD_COPY qemu-QEMUARCH-static /usr/bin/
RUN apk --update add curl netcat-openbsd iproute2 && rm -rf /var/cache/apk/*
# wait forever
CMD rm -f /fifo && mkfifo /fifo && exec cat </fifo
CMD while true; do sleep 1d; done

2
test/images/hostexec/VERSION
View File

@ -1 +1 @@
1.0
1.1

2
test/images/hostexec/pod.yaml
View File

@ -7,6 +7,6 @@ metadata:
spec:
containers:
- name: hostexec
image: gcr.io/kubernetes-e2e-test-images/hostexec-amd64:1.0
image: gcr.io/kubernetes-e2e-test-images/hostexec-amd64:1.1
securityContext:
hostNetwork: true

2
test/utils/image/manifest.go
View File

@ -64,7 +64,7 @@ var (
GBFrontend = ImageConfig{sampleRegistry, "gb-frontend", "v5", true}
GBRedisSlave = ImageConfig{sampleRegistry, "gb-redisslave", "v2", true}
Goproxy = ImageConfig{e2eRegistry, "goproxy", "1.0", true}
Hostexec = ImageConfig{e2eRegistry, "hostexec", "1.0", true}
Hostexec = ImageConfig{e2eRegistry, "hostexec", "1.1", true}
IpcUtils = ImageConfig{e2eRegistry, "ipc-utils", "1.0", true}
Iperf = ImageConfig{e2eRegistry, "iperf", "1.0", true}
JessieDnsutils = ImageConfig{e2eRegistry, "jessie-dnsutils", "1.0", true}