github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Rename NodeImageWhiteList to NodePrePullImageList

Browse Source
This commit is contained in:
Warren Fernandes 2020-06-19 14:55:18 -06:00
parent 403716626d
commit 296f50365b
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/e2e/common/runtime.go
View File

@ -265,9 +265,9 @@ while true; do sleep 1; done
ginkgo.Context("when running a container with a new image", func() { ginkgo.Context("when running a container with a new image", func() {
// Images used for ConformanceContainer are not added into NodeImageWhiteList, because this test is // Images used for ConformanceContainer are not added into NodePrePullImageList, because this test is
// testing image pulling, these images don't need to be prepulled. The ImagePullPolicy // testing image pulling, these images don't need to be prepulled. The ImagePullPolicy
// is v1.PullAlways, so it won't be blocked by framework image white list check. // is v1.PullAlways, so it won't be blocked by framework image pre-pull list check.
imagePullTest := func(image string, hasSecret bool, expectedPhase v1.PodPhase, expectedPullStatus bool, windowsImage bool) { imagePullTest := func(image string, hasSecret bool, expectedPhase v1.PodPhase, expectedPullStatus bool, windowsImage bool) {
command := []string{"/bin/sh", "-c", "while true; do sleep 1; done"} command := []string{"/bin/sh", "-c", "while true; do sleep 1; done"}
if windowsImage { if windowsImage {

6
test/e2e/framework/pods.go
View File

@ -185,10 +185,10 @@ func (c *PodClient) mungeSpec(pod *v1.Pod) {
// in the test anyway. // in the test anyway.
continue continue
} }
// If the image policy is not PullAlways, the image must be in the white list and // If the image policy is not PullAlways, the image must be in the pre-pull list and
// pre-pulled. // pre-pulled.
gomega.Expect(ImageWhiteList.Has(c.Image)).To(gomega.BeTrue(), "Image %q is not in the white list, consider adding it to CommonImageWhiteList in test/e2e/common/util.go or NodeImageWhiteList in test/e2e_node/image_list.go", c.Image) gomega.Expect(ImageWhiteList.Has(c.Image)).To(gomega.BeTrue(), "Image %q is not in the white list, consider adding it to CommonImageWhiteList in test/e2e/common/util.go or NodePrePullImageList in test/e2e_node/image_list.go", c.Image)
// Do not pull images during the tests because the images in white list should have // Do not pull images during the tests because the images in pre-pull list should have
// been prepulled. // been prepulled.
c.ImagePullPolicy = v1.PullNever c.ImagePullPolicy = v1.PullNever
} }

8
test/e2e_node/image_list.go
View File

@ -43,9 +43,9 @@ const (
imagePullRetryDelay = time.Second imagePullRetryDelay = time.Second
) )
// NodeImageWhiteList is a list of images used in node e2e test. These images will be prepulled // NodePrePullImageList is a list of images used in node e2e test. These images will be prepulled
// before test running so that the image pulling won't fail in actual test. // before test running so that the image pulling won't fail in actual test.
var NodeImageWhiteList = sets.NewString( var NodePrePullImageList = sets.NewString(
imageutils.GetE2EImage(imageutils.Agnhost), imageutils.GetE2EImage(imageutils.Agnhost),
"google/cadvisor:latest", "google/cadvisor:latest",
"k8s.gcr.io/stress:v1", "k8s.gcr.io/stress:v1",
@ -66,8 +66,8 @@ var NodeImageWhiteList = sets.NewString(
// 2. the ones passed in from framework.TestContext.ExtraEnvs // 2. the ones passed in from framework.TestContext.ExtraEnvs
// 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 NodeImageWhiteList and CommonImageWhiteList into the framework image white list. // Union NodePrePullImageList and CommonImageWhiteList into the framework image pre-pull list.
framework.ImageWhiteList = NodeImageWhiteList.Union(commontest.CommonImageWhiteList) framework.ImageWhiteList = NodePrePullImageList.Union(commontest.CommonImageWhiteList)
// Images from extra envs // Images from extra envs
framework.ImageWhiteList.Insert(getNodeProblemDetectorImage()) framework.ImageWhiteList.Insert(getNodeProblemDetectorImage())
framework.ImageWhiteList.Insert(getSRIOVDevicePluginImage()) framework.ImageWhiteList.Insert(getSRIOVDevicePluginImage())

4
test/e2e_node/runtime_conformance_test.go
View File

@ -48,9 +48,9 @@ var _ = framework.KubeDescribe("Container Runtime Conformance Test", func() {
} }
} }
}` }`
// The following images are not added into NodeImageWhiteList, because this test is // The following images are not added into NodePrePullImageList, because this test is
// testing image pulling, these images don't need to be prepulled. The ImagePullPolicy // testing image pulling, these images don't need to be prepulled. The ImagePullPolicy
// is v1.PullAlways, so it won't be blocked by framework image white list check. // is v1.PullAlways, so it won't be blocked by framework image pre-pull list check.
for _, testCase := range []struct { for _, testCase := range []struct {
description string description string
image string image string