mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-29 22:46:12 +00:00
Replace buzybox and pause pod image with agnhost
This commit is contained in:
parent
85aaf7ea36
commit
49cc8ef60f
@ -506,9 +506,9 @@ func newExecPodSpec(ns, generateName string) *v1.Pod {
|
|||||||
TerminationGracePeriodSeconds: &immediate,
|
TerminationGracePeriodSeconds: &immediate,
|
||||||
Containers: []v1.Container{
|
Containers: []v1.Container{
|
||||||
{
|
{
|
||||||
Name: "exec",
|
Name: "agnhost-pause",
|
||||||
Image: BusyBoxImage,
|
Image: imageutils.GetE2EImage(imageutils.Agnhost),
|
||||||
Command: []string{"sh", "-c", "trap exit TERM; while true; do sleep 5; done"},
|
Args: []string{"pause"},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@ -553,7 +553,8 @@ func CreatePodOrFail(c clientset.Interface, ns, name string, labels map[string]s
|
|||||||
Containers: []v1.Container{
|
Containers: []v1.Container{
|
||||||
{
|
{
|
||||||
Name: "pause",
|
Name: "pause",
|
||||||
Image: imageutils.GetPauseImageName(),
|
Image: imageutils.GetE2EImage(imageutils.Agnhost),
|
||||||
|
Args: []string{"pause"},
|
||||||
Ports: containerPorts,
|
Ports: containerPorts,
|
||||||
// Add a dummy environment variable to work around a docker issue.
|
// Add a dummy environment variable to work around a docker issue.
|
||||||
// https://github.com/docker/docker/issues/14203
|
// https://github.com/docker/docker/issues/14203
|
||||||
|
Loading…
Reference in New Issue
Block a user