fix:e2e test flake: Probing container should mark readiness on pods to false

test/e2e/common/node/container_probe.go

@@ -25,12 +25,16 @@ import (
 	"strings"
 	"time"
 
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/watch"
+	clientset "k8s.io/client-go/kubernetes"
+	"k8s.io/client-go/tools/cache"
+
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/fields"
 	"k8s.io/apimachinery/pkg/util/intstr"
 	"k8s.io/apimachinery/pkg/util/uuid"
-	"k8s.io/apimachinery/pkg/util/wait"
 	podutil "k8s.io/kubernetes/pkg/api/v1/pod"
 	"k8s.io/kubernetes/pkg/kubelet/events"
 	"k8s.io/kubernetes/test/e2e/framework"
@@ -609,13 +613,12 @@ done
 
 		// Shutdown pod. Readiness should change to false
 		podClient.Delete(context.Background(), podName, metav1.DeleteOptions{})
-		err = wait.PollImmediate(framework.Poll, f.Timeouts.PodDelete, func() (bool, error) {
+		err = waitForPodStatusByInformer(f.ClientSet, f.Namespace.Name, podName, f.Timeouts.PodDelete, func(pod *v1.Pod) (bool, error) {
-			pod, err := podClient.Get(context.Background(), podName, metav1.GetOptions{})
+			if !podutil.IsPodReady(pod) {
-			if err != nil {
+				return true, nil
-				return false, err
 			}
-			// verify the pod ready status has reported not ready
+			framework.Logf("pod %s/%s is still ready, waiting until is not ready", pod.Namespace, pod.Name)
-			return !podutil.IsPodReady(pod), nil
+			return false, nil
 		})
 		framework.ExpectNoError(err)
 	})
@@ -692,13 +695,12 @@ done
 		podClient.Delete(context.Background(), podName, metav1.DeleteOptions{})
 
 		// Wait for pod to go unready
-		err = wait.PollImmediate(framework.Poll, f.Timeouts.PodDelete, func() (bool, error) {
+		err = waitForPodStatusByInformer(f.ClientSet, f.Namespace.Name, podName, f.Timeouts.PodDelete, func(pod *v1.Pod) (bool, error) {
-			pod, err := podClient.Get(context.Background(), podName, metav1.GetOptions{})
+			if !podutil.IsPodReady(pod) {
-			if err != nil {
+				return true, nil
-				return false, err
 			}
-			// verify the pod ready status has reported not ready
+			framework.Logf("pod %s/%s is still ready, waiting until is not ready", pod.Namespace, pod.Name)
-			return !podutil.IsPodReady(pod), nil
+			return false, nil
 		})
 		framework.ExpectNoError(err)
 
@@ -721,6 +723,66 @@ done
 	})
 })
 
+// waitForPodStatusByInformer waits pod status change by informer
+func waitForPodStatusByInformer(c clientset.Interface, podNamespace, podName string, timeout time.Duration, condition func(pod *v1.Pod) (bool, error)) error {
+	stopCh := make(chan struct{})
+	checkPodStatusFunc := func(pod *v1.Pod) {
+		if ok, _ := condition(pod); ok {
+			close(stopCh)
+		}
+	}
+	controller := newInformerWatchPod(c, podNamespace, podName, checkPodStatusFunc)
+	go controller.Run(stopCh)
+	after := time.After(timeout)
+	select {
+	case <-stopCh:
+		return nil
+	case <-after:
+		defer close(stopCh)
+		return fmt.Errorf("timeout to wait pod status ready")
+	}
+}
+
+// newInformerWatchPod creates a informer for given pod
+func newInformerWatchPod(c clientset.Interface, podNamespace, podName string, checkPodStatusFunc func(p *v1.Pod)) cache.Controller {
+	_, controller := cache.NewInformer(
+		&cache.ListWatch{
+			ListFunc: func(options metav1.ListOptions) (runtime.Object, error) {
+				options.FieldSelector = fields.SelectorFromSet(fields.Set{"metadata.name": podName}).String()
+				obj, err := c.CoreV1().Pods(podNamespace).List(context.TODO(), options)
+				return runtime.Object(obj), err
+			},
+			WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) {
+				options.FieldSelector = fields.SelectorFromSet(fields.Set{"metadata.name": podName}).String()
+				return c.CoreV1().Pods(podNamespace).Watch(context.TODO(), options)
+			},
+		},
+		&v1.Pod{},
+		0,
+		cache.ResourceEventHandlerFuncs{
+			AddFunc: func(obj interface{}) {
+				p, ok := obj.(*v1.Pod)
+				if ok {
+					checkPodStatusFunc(p)
+				}
+			},
+			UpdateFunc: func(oldObj, newObj interface{}) {
+				p, ok := newObj.(*v1.Pod)
+				if ok {
+					checkPodStatusFunc(p)
+				}
+			},
+			DeleteFunc: func(obj interface{}) {
+				p, ok := obj.(*v1.Pod)
+				if ok {
+					checkPodStatusFunc(p)
+				}
+			},
+		},
+	)
+	return controller
+}
+
 // GetContainerStartedTime returns the time when the given container started and error if any
 func GetContainerStartedTime(p *v1.Pod, containerName string) (time.Time, error) {
 	for _, status := range p.Status.ContainerStatuses {