github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renamed image "white lists" to pre-pull image lists in test

Browse Source 
Signed-off-by: alejandrox1 <alarcj137@gmail.com>
This commit is contained in:
alejandrox1
2020-07-01 13:48:47 -04:00
parent c53ce48d48
commit 4338053d8f
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
test/e2e_node/image_list.go
View File

@@ -61,16 +61,16 @@ var NodePrePullImageList = sets.NewString(
"gcr.io/kubernetes-e2e-test-images/node-perf/tf-wide-deep-amd64:1.0",
)
// updateImageWhiteList updates the framework.ImageWhiteList with
// updateImageAllowList updates the framework.ImagePrePullList with
// 1. the hard coded lists
// 2. the ones passed in from framework.TestContext.ExtraEnvs
// So this function needs to be called after the extra envs are applied.
func updateImageWhiteList() {
// Union NodePrePullImageList and CommonImageWhiteList into the framework image pre-pull list.
framework.ImageWhiteList = NodePrePullImageList.Union(commontest.PrePulledImages)
func updateImageAllowList() {
// Union NodePrePullImageList and PrePulledImages into the framework image pre-pull list.
framework.ImagePrePullList = NodePrePullImageList.Union(commontest.PrePulledImages)
// Images from extra envs
framework.ImageWhiteList.Insert(getNodeProblemDetectorImage())
framework.ImageWhiteList.Insert(getSRIOVDevicePluginImage())
framework.ImagePrePullList.Insert(getNodeProblemDetectorImage())
framework.ImagePrePullList.Insert(getSRIOVDevicePluginImage())
}
func getNodeProblemDetectorImage() string {
@@ -149,7 +149,7 @@ func PrePullAllImages() error {
if err != nil {
return err
}
images := framework.ImageWhiteList.List()
images := framework.ImagePrePullList.List()
klog.V(4).Infof("Pre-pulling images with %s %+v", puller.Name(), images)
for _, image := range images {
var (