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

Merge pull request #92745 from hakman/disruption-image-busybox

Browse Source 
Use Pause image for DisruptionController tests
This commit is contained in:
Kubernetes Prow Robot 2020-07-09 09:10:00 -07:00 committed by GitHub
commit 1b4e904183
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/e2e/apps/disruption.go
View File

@ -461,8 +461,8 @@ func createPodsOrDie(cs kubernetes.Interface, ns string, n int) {
Spec: v1.PodSpec{ Spec: v1.PodSpec{
Containers: []v1.Container{ Containers: []v1.Container{
{ {
Name: "busybox", Name: "donothing",
Image: imageutils.GetE2EImage(imageutils.EchoServer), Image: imageutils.GetPauseImageName(),
}, },
}, },
RestartPolicy: v1.RestartPolicyAlways, RestartPolicy: v1.RestartPolicyAlways,
@ -506,8 +506,8 @@ func waitForPodsOrDie(cs kubernetes.Interface, ns string, n int) {
func createReplicaSetOrDie(cs kubernetes.Interface, ns string, size int32, exclusive bool) { func createReplicaSetOrDie(cs kubernetes.Interface, ns string, size int32, exclusive bool) {
container := v1.Container{ container := v1.Container{
Name: "busybox", Name: "donothing",
Image: imageutils.GetE2EImage(imageutils.EchoServer), Image: imageutils.GetPauseImageName(),
} }
if exclusive { if exclusive {
container.Ports = []v1.ContainerPort{ container.Ports = []v1.ContainerPort{