github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-07-18 13:57:38 +00:00
Code Issues Projects Releases Wiki Activity

Allow IfNotPresent to be used in node e2e tests

Browse Source 
Currently the node e2e tests overrides the image pull policy to PullNever,
if the policy is not PullAlways.
This commit is contained in:
Cheng Gu
2025-08-11 22:28:20 +00:00
parent b4b973c237
commit ddffd8e389
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
test/e2e/framework/pod/pod_client.go
View File

@@ -271,18 +271,13 @@ func (c *PodClient) mungeSpec(pod *v1.Pod) {
// during the test.
for i := range pod.Spec.Containers {
c := &pod.Spec.Containers[i]
if c.ImagePullPolicy == v1.PullAlways {
// If the image pull policy is PullAlways, the image doesn't need to be in
// the allow list or pre-pulled, because the image is expected to be pulled
// in the test anyway.
continue
if c.ImagePullPolicy == v1.PullNever {
// If the image pull policy is PullNever, make sure it is in the pre-pull list.
gomega.Expect(ImagePrePullList.Has(c.Image)).To(gomega.BeTrueBecause("Image %q is not in the pre-pull list, consider adding it to PrePulledImages in test/e2e/common/util.go or NodePrePullImageList in test/e2e_node/image_list.go", c.Image))
}
// If the image policy is not PullAlways, the image must be in the pre-pull list and
// pre-pulled.
gomega.Expect(ImagePrePullList.Has(c.Image)).To(gomega.BeTrueBecause("Image %q is not in the pre-pull list, consider adding it to PrePulledImages 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 pre-pull list should have
// been prepulled.
c.ImagePullPolicy = v1.PullNever
// If the image pull policy is PullAlways or PullIfNotPresent, the image doesn't need
// to be in the allow list or pre-pulled, because the image is expected to be pulled
// in the test anyway.
}
}