Skip to content

Commit 3a51aaf

Browse files
authored
Merge pull request kubernetes#92359 from RobertKielty/92319
renames CommmonImageWhiteList to PrePulledImages in e2e/common/util
2 parents 83a1586 + 5c27c7e commit 3a51aaf

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

test/e2e/common/util.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,12 @@ var (
5757
// CurrentSuite represents current test suite.
5858
var CurrentSuite Suite
5959

60-
// CommonImageWhiteList is the list of images used in common test. These images should be prepulled
61-
// before a tests starts, so that the tests won't fail due image pulling flakes. Currently, this is
62-
// only used by node e2e test.
60+
// PrePulledImages are a list of images used in e2e/common tests. These images should be prepulled
61+
// before tests starts, so that the tests won't fail due image pulling flakes.
62+
// Currently, this is only used by node e2e test.
63+
// See also updateImageWhiteList() in ../../e2e_node/image_list.go
6364
// TODO(random-liu): Change the image puller pod to use similar mechanism.
64-
var CommonImageWhiteList = sets.NewString(
65+
var PrePulledImages = sets.NewString(
6566
imageutils.GetE2EImage(imageutils.Agnhost),
6667
imageutils.GetE2EImage(imageutils.BusyBox),
6768
imageutils.GetE2EImage(imageutils.IpcUtils),

test/e2e_node/image_list.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ var NodePrePullImageList = sets.NewString(
6767
// So this function needs to be called after the extra envs are applied.
6868
func updateImageWhiteList() {
6969
// Union NodePrePullImageList and CommonImageWhiteList into the framework image pre-pull list.
70-
framework.ImageWhiteList = NodePrePullImageList.Union(commontest.CommonImageWhiteList)
70+
framework.ImageWhiteList = NodePrePullImageList.Union(commontest.PrePulledImages)
7171
// Images from extra envs
7272
framework.ImageWhiteList.Insert(getNodeProblemDetectorImage())
7373
framework.ImageWhiteList.Insert(getSRIOVDevicePluginImage())

0 commit comments

Comments
 (0)