Update to include watch tooling

test/e2e/common/configmap.go

@@ -20,12 +20,16 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"time"
 
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/uuid"
 	watch "k8s.io/apimachinery/pkg/watch"
+	"k8s.io/client-go/dynamic"
+	watchtools "k8s.io/client-go/tools/watch"
 	"k8s.io/kubernetes/test/e2e/framework"
 	imageutils "k8s.io/kubernetes/test/utils/image"
 
@@ -40,6 +44,12 @@ var (
 var _ = ginkgo.Describe("[sig-node] ConfigMap", func() {
 	f := framework.NewDefaultFramework("configmap")
 
+	var dc dynamic.Interface
+
+	ginkgo.BeforeEach(func() {
+		dc = f.DynamicClient
+	})
+
 	/*
 		Release : v1.9
 		Testname: ConfigMap, from environment field
@@ -167,8 +177,13 @@ var _ = ginkgo.Describe("[sig-node] ConfigMap", func() {
 		testNamespaceName := f.Namespace.Name
 		testConfigMapName := "test-configmap" + string(uuid.NewUUID())
 
-		ginkgo.By("creating a ConfigMap")
+		configMapResource := schema.GroupVersionResource{Group: "", Version: "v1", Resource: "configmaps"}
-		_, err := f.ClientSet.CoreV1().ConfigMaps(testNamespaceName).Create(context.TODO(), &v1.ConfigMap{
+		expectedWatchEvents := []watch.Event{
+			{Type: watch.Added},
+			{Type: watch.Modified},
+			{Type: watch.Deleted},
+		}
+		testConfigMap := v1.ConfigMap{
 			ObjectMeta: metav1.ObjectMeta{
 				Name: testConfigMapName,
 				Labels: map[string]string{
@@ -178,24 +193,25 @@ var _ = ginkgo.Describe("[sig-node] ConfigMap", func() {
 			Data: map[string]string{
 				"valueName": "value",
 			},
-		}, metav1.CreateOptions{})
+		}
+
+		framework.WatchEventSequenceVerifier(context.TODO(), dc, configMapResource, testNamespaceName, testConfigMapName, metav1.ListOptions{LabelSelector: "test-configmap-static=true"}, expectedWatchEvents, func(retryWatcher *watchtools.RetryWatcher) (actualWatchEvents []watch.Event) {
+			ginkgo.By("creating a ConfigMap")
+			_, err := f.ClientSet.CoreV1().ConfigMaps(testNamespaceName).Create(context.TODO(), &testConfigMap, metav1.CreateOptions{})
 			framework.ExpectNoError(err, "failed to create ConfigMap")
-
+			eventFound := false
-		ginkgo.By("setting a watch for the ConfigMap")
+			ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
-		// setup a watch for the ConfigMap
+			defer cancel()
-		resourceWatch, err := f.ClientSet.CoreV1().ConfigMaps(testNamespaceName).Watch(context.TODO(), metav1.ListOptions{LabelSelector: "test-configmap-static=true", TimeoutSeconds: &generalWatchTimeout})
+			_, err = framework.WatchUntilWithoutRetry(ctx, retryWatcher, func(watchEvent watch.Event) (bool, error) {
-		framework.ExpectNoError(err, "Failed to setup watch on newly created ConfigMap")
+				if watchEvent.Type != watch.Added {
-
+					return false, nil
-		resourceWatchChan := resourceWatch.ResultChan()
-		ginkgo.By("waiting for the ConfigMap to be added")
-		foundWatchEvent := false
-		for watchEvent := range resourceWatchChan {
-			if watchEvent.Type == watch.Added {
-				foundWatchEvent = true
-				break
 				}
-		}
+				actualWatchEvents = append(actualWatchEvents, watchEvent)
-		framework.ExpectEqual(true, foundWatchEvent, "expected to find a watch.Delete event configmap %s", testConfigMapName)
+				eventFound = true
+				return true, nil
+			})
+			framework.ExpectNoError(err, "Wait until condition with watch events should not return an error")
+			framework.ExpectEqual(eventFound, true, "failed to find ConfigMap %v event", watch.Added)
 
 			configMapPatchPayload, err := json.Marshal(v1.ConfigMap{
 				ObjectMeta: metav1.ObjectMeta{
@@ -213,14 +229,19 @@ var _ = ginkgo.Describe("[sig-node] ConfigMap", func() {
 			_, err = f.ClientSet.CoreV1().ConfigMaps(testNamespaceName).Patch(context.TODO(), testConfigMapName, types.StrategicMergePatchType, []byte(configMapPatchPayload), metav1.PatchOptions{})
 			framework.ExpectNoError(err, "failed to patch ConfigMap")
 			ginkgo.By("waiting for the ConfigMap to be modified")
-		foundWatchEvent = false
+			eventFound = false
-		for watchEvent := range resourceWatchChan {
+			ctx, cancel = context.WithTimeout(context.Background(), 30*time.Second)
-			if watchEvent.Type == watch.Modified {
+			defer cancel()
-				foundWatchEvent = true
+			_, err = framework.WatchUntilWithoutRetry(ctx, retryWatcher, func(watchEvent watch.Event) (bool, error) {
-				break
+				if watchEvent.Type != watch.Modified {
+					return false, nil
 				}
-		}
+				actualWatchEvents = append(actualWatchEvents, watchEvent)
-		framework.ExpectEqual(true, foundWatchEvent, "expected to find a watch.Modified event configmap %s", testConfigMapName)
+				eventFound = true
+				return true, nil
+			})
+			framework.ExpectNoError(err, "Wait until condition with watch events should not return an error")
+			framework.ExpectEqual(eventFound, true, "failed to find ConfigMap %v event", watch.Modified)
 
 			ginkgo.By("fetching the ConfigMap")
 			configMap, err := f.ClientSet.CoreV1().ConfigMaps(testNamespaceName).Get(context.TODO(), testConfigMapName, metav1.GetOptions{})
@@ -252,14 +273,22 @@ var _ = ginkgo.Describe("[sig-node] ConfigMap", func() {
 			})
 			framework.ExpectNoError(err, "failed to delete ConfigMap collection with LabelSelector")
 			ginkgo.By("waiting for the ConfigMap to be deleted")
-		foundWatchEvent = false
+			eventFound = false
-		for watchEvent := range resourceWatchChan {
+			ctx, cancel = context.WithTimeout(context.Background(), 30*time.Second)
-			if watchEvent.Type == watch.Deleted {
+			defer cancel()
-				foundWatchEvent = true
+			_, err = framework.WatchUntilWithoutRetry(ctx, retryWatcher, func(watchEvent watch.Event) (bool, error) {
-				break
+				if watchEvent.Type != watch.Deleted {
+					return false, nil
 				}
-		}
+				actualWatchEvents = append(actualWatchEvents, watchEvent)
-		framework.ExpectEqual(true, foundWatchEvent, "expected to find a watch.Deleted event configmap %s", testConfigMapName)
+				eventFound = true
+				return true, nil
+			})
+			framework.ExpectNoError(err, "Wait until condition with watch events should not return an error")
+			framework.ExpectEqual(eventFound, true, "failed to find ConfigMap %v event", watch.Deleted)
+
+			return actualWatchEvents
+		})
 	})
 })