From 5357a3104305ed6330c79f10a66023a67bffcf8c Mon Sep 17 00:00:00 2001 From: Yang Guo Date: Thu, 11 Jan 2018 17:27:14 -0800 Subject: [PATCH 1/2] e2e test: use sleep to wait in hostexec --- test/images/hostexec/Dockerfile | 2 +- test/images/hostexec/VERSION | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/images/hostexec/Dockerfile b/test/images/hostexec/Dockerfile index af6a4cb6181..f7edf8391a3 100644 --- a/test/images/hostexec/Dockerfile +++ b/test/images/hostexec/Dockerfile @@ -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 Date: Mon, 22 Jan 2018 14:53:53 -0800 Subject: [PATCH 2/2] Update tests to use the hostexec:1.1 image --- cluster/gce/manifests/e2e-image-puller.manifest | 2 +- test/images/hostexec/pod.yaml | 2 +- test/utils/image/manifest.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cluster/gce/manifests/e2e-image-puller.manifest b/cluster/gce/manifests/e2e-image-puller.manifest index d7d5a430642..52665085004 100644 --- a/cluster/gce/manifests/e2e-image-puller.manifest +++ b/cluster/gce/manifests/e2e-image-puller.manifest @@ -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 diff --git a/test/images/hostexec/pod.yaml b/test/images/hostexec/pod.yaml index 69a6e974f21..733d4273f75 100644 --- a/test/images/hostexec/pod.yaml +++ b/test/images/hostexec/pod.yaml @@ -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 diff --git a/test/utils/image/manifest.go b/test/utils/image/manifest.go index 3e9ebdadd9b..f9e89933818 100644 --- a/test/utils/image/manifest.go +++ b/test/utils/image/manifest.go @@ -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}