github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 14:37:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #79012 from mgdevstack/master-service-errmsg

Browse Source 
Replace exec, pause pod with platform agnostic agnhost pause pod
This commit is contained in:
Kubernetes Prow Robot 2019-06-28 03:57:38 -07:00 committed by GitHub
commit 3bd11af6a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test/e2e/framework/pod/resource.go
View File

@ -506,9 +506,9 @@ func newExecPodSpec(ns, generateName string) *v1.Pod {
TerminationGracePeriodSeconds: &immediate,
Containers: []v1.Container{
{
Name: "exec",
Image: BusyBoxImage,
Command: []string{"sh", "-c", "trap exit TERM; while true; do sleep 5; done"},
Name: "agnhost-pause",
Image: imageutils.GetE2EImage(imageutils.Agnhost),
Args: []string{"pause"},
},
},
},
@ -553,7 +553,8 @@ func CreatePodOrFail(c clientset.Interface, ns, name string, labels map[string]s
Containers: []v1.Container{
{
Name: "pause",
Image: imageutils.GetPauseImageName(),
Image: imageutils.GetE2EImage(imageutils.Agnhost),
Args: []string{"pause"},
Ports: containerPorts,
// Add a dummy environment variable to work around a docker issue.
// https://github.com/docker/docker/issues/14203