This commit is contained in:
tianshapjq
2018-02-07 09:32:42 +08:00
parent d17f1ce5bf
commit 15c6df5d01
2 changed files with 10 additions and 13 deletions

View File

@@ -52,18 +52,12 @@ var NodeImageWhiteList = sets.NewString(
imageutils.GetE2EImage(imageutils.Netexec),
imageutils.GetE2EImage(imageutils.Nonewprivs),
imageutils.GetPauseImageNameForHostArch(),
framework.GetGPUDevicePluginImage(),
)
func init() {
// Union NodeImageWhiteList and CommonImageWhiteList into the framework image white list.
framework.ImageWhiteList = NodeImageWhiteList.Union(commontest.CommonImageWhiteList)
// parse the device plugin image from url
if image, err := framework.GetGPUDevicePluginImage(); err != nil {
glog.Errorf("Failed to parse the device plugin image: %v", err)
} else {
framework.ImageWhiteList.Insert(image)
}
}
// puller represents a generic image puller