Skip to content

Commit 303810c

Browse files
authored
Merge pull request kubernetes#94782 from adtac/SpreadServiceOrFail
ubernetes_lite.go: remove image argument from SpreadServiceOrFail
2 parents 9fdbf1c + 9970966 commit 303810c

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

test/e2e/scheduling/ubernetes_lite.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ var _ = SIGDescribe("Multi-AZ Clusters", func() {
4242
f := framework.NewDefaultFramework("multi-az")
4343
var zoneCount int
4444
var err error
45-
image := framework.ServeHostnameImage
4645
ginkgo.BeforeEach(func() {
4746
e2eskipper.SkipUnlessProviderIs("gce", "gke", "aws")
4847
if zoneCount <= 0 {
@@ -55,11 +54,11 @@ var _ = SIGDescribe("Multi-AZ Clusters", func() {
5554
// TODO: SkipUnlessDefaultScheduler() // Non-default schedulers might not spread
5655
})
5756
ginkgo.It("should spread the pods of a service across zones", func() {
58-
SpreadServiceOrFail(f, (2*zoneCount)+1, image)
57+
SpreadServiceOrFail(f, (2*zoneCount)+1, imageutils.GetPauseImageName())
5958
})
6059

6160
ginkgo.It("should spread the pods of a replication controller across zones", func() {
62-
SpreadRCOrFail(f, int32((2*zoneCount)+1), image, []string{"serve-hostname"})
61+
SpreadRCOrFail(f, int32((2*zoneCount)+1), framework.ServeHostnameImage, []string{"serve-hostname"})
6362
})
6463
})
6564

@@ -96,7 +95,7 @@ func SpreadServiceOrFail(f *framework.Framework, replicaCount int, image string)
9695
Containers: []v1.Container{
9796
{
9897
Name: "test",
99-
Image: imageutils.GetPauseImageName(),
98+
Image: image,
10099
},
101100
},
102101
},

0 commit comments

Comments
 (0)