Skip to content

Commit 851e33d

Browse files
Merge pull request #30027 from bitoku/image-volume-fix
OCPNODE-3004: Accept ErrImagePull for non-existent image volume test.
2 parents 82cfbea + 06b218f commit 851e33d

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

test/extended/node/image_volume.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,12 @@ var _ = g.Describe("[sig-node] [FeatureGate:ImageVolume] ImageVolume", func() {
5656
_, err := oc.AdminKubeClient().CoreV1().Pods(f.Namespace.Name).Create(ctx, pod, metav1.CreateOptions{})
5757
o.Expect(err).NotTo(o.HaveOccurred())
5858

59-
g.By("Waiting for pod to be ImagePullBackOff")
59+
g.By("Waiting for pod to be ErrImagePull or ImagePullBackOff")
6060
err = e2epod.WaitForPodCondition(ctx, oc.AdminKubeClient(), pod.Namespace, pod.Name, "ImagePullBackOff", 60*time.Second, func(pod *v1.Pod) (bool, error) {
6161
return len(pod.Status.ContainerStatuses) > 0 &&
62-
pod.Status.ContainerStatuses[0].State.Waiting != nil &&
63-
pod.Status.ContainerStatuses[0].State.Waiting.Reason == "ImagePullBackOff", nil
62+
pod.Status.ContainerStatuses[0].State.Waiting != nil &&
63+
(pod.Status.ContainerStatuses[0].State.Waiting.Reason == "ImagePullBackOff" || pod.Status.ContainerStatuses[0].State.Waiting.Reason == "ErrImagePull"),
64+
nil
6465
})
6566
o.Expect(err).NotTo(o.HaveOccurred())
6667
})

0 commit comments

Comments
 (0)