mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 19:56:01 +00:00
Merge pull request #92359 from RobertKielty/92319
renames CommmonImageWhiteList to PrePulledImages in e2e/common/util
This commit is contained in:
commit
3a51aaf8b4
@ -57,11 +57,12 @@ var (
|
|||||||
// CurrentSuite represents current test suite.
|
// CurrentSuite represents current test suite.
|
||||||
var CurrentSuite Suite
|
var CurrentSuite Suite
|
||||||
|
|
||||||
// CommonImageWhiteList is the list of images used in common test. These images should be prepulled
|
// PrePulledImages are a list of images used in e2e/common tests. These images should be prepulled
|
||||||
// before a tests starts, so that the tests won't fail due image pulling flakes. Currently, this is
|
// before tests starts, so that the tests won't fail due image pulling flakes.
|
||||||
// only used by node e2e test.
|
// Currently, this is only used by node e2e test.
|
||||||
|
// See also updateImageWhiteList() in ../../e2e_node/image_list.go
|
||||||
// TODO(random-liu): Change the image puller pod to use similar mechanism.
|
// TODO(random-liu): Change the image puller pod to use similar mechanism.
|
||||||
var CommonImageWhiteList = sets.NewString(
|
var PrePulledImages = sets.NewString(
|
||||||
imageutils.GetE2EImage(imageutils.Agnhost),
|
imageutils.GetE2EImage(imageutils.Agnhost),
|
||||||
imageutils.GetE2EImage(imageutils.BusyBox),
|
imageutils.GetE2EImage(imageutils.BusyBox),
|
||||||
imageutils.GetE2EImage(imageutils.IpcUtils),
|
imageutils.GetE2EImage(imageutils.IpcUtils),
|
||||||
|
@ -67,7 +67,7 @@ var NodePrePullImageList = sets.NewString(
|
|||||||
// So this function needs to be called after the extra envs are applied.
|
// So this function needs to be called after the extra envs are applied.
|
||||||
func updateImageWhiteList() {
|
func updateImageWhiteList() {
|
||||||
// Union NodePrePullImageList and CommonImageWhiteList into the framework image pre-pull list.
|
// Union NodePrePullImageList and CommonImageWhiteList into the framework image pre-pull list.
|
||||||
framework.ImageWhiteList = NodePrePullImageList.Union(commontest.CommonImageWhiteList)
|
framework.ImageWhiteList = NodePrePullImageList.Union(commontest.PrePulledImages)
|
||||||
// Images from extra envs
|
// Images from extra envs
|
||||||
framework.ImageWhiteList.Insert(getNodeProblemDetectorImage())
|
framework.ImageWhiteList.Insert(getNodeProblemDetectorImage())
|
||||||
framework.ImageWhiteList.Insert(getSRIOVDevicePluginImage())
|
framework.ImageWhiteList.Insert(getSRIOVDevicePluginImage())
|
||||||
|
Loading…
Reference in New Issue
Block a user