From f87c712790dd5f42b3280628f08f303db4296d77 Mon Sep 17 00:00:00 2001
From: Steve Kuznetsov <skuznets@redhat.com>
Date: Wed, 20 Oct 2021 22:08:20 -0500
Subject: [PATCH] e2e: conformance: correctly produce MODIFIED events

The previous implementaton called Update() without changing anything
about the object, so no MODIFIED events were ever generated. This change
ensures that all calls to Update() cause mutations, thereby ensuring
that MODIFIED events happen in the watch stream.

Signed-off-by: Steve Kuznetsov <skuznets@redhat.com>
---
 test/e2e/apimachinery/watch.go | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/test/e2e/apimachinery/watch.go b/test/e2e/apimachinery/watch.go
index c922489b4ce..ade79817a0c 100644
--- a/test/e2e/apimachinery/watch.go
+++ b/test/e2e/apimachinery/watch.go
@@ -20,6 +20,7 @@ import (
 	"context"
 	"fmt"
 	"math/rand"
+	"strconv"
 	"time"
 
 	v1 "k8s.io/api/core/v1"
@@ -476,25 +477,37 @@ func produceConfigMapEvents(f *framework.Framework, stopc <-chan struct{}, minWa
 	tc := time.NewTicker(minWaitBetweenEvents)
 	defer tc.Stop()
 	i := 0
+	updates := 0
 	for range tc.C {
 		op := rand.Intn(3)
 		if len(existing) == 0 {
 			op = createEvent
 		}
 
-		cm := &v1.ConfigMap{}
 		switch op {
 		case createEvent:
-			cm.Name = name(i)
+			cm := &v1.ConfigMap{
+				ObjectMeta: metav1.ObjectMeta{
+					Name: name(i),
+				},
+			}
 			_, err := c.CoreV1().ConfigMaps(ns).Create(context.TODO(), cm, metav1.CreateOptions{})
 			framework.ExpectNoError(err, "Failed to create configmap %s in namespace %s", cm.Name, ns)
 			existing = append(existing, i)
 			i++
 		case updateEvent:
 			idx := rand.Intn(len(existing))
-			cm.Name = name(existing[idx])
+			cm := &v1.ConfigMap{
+				ObjectMeta: metav1.ObjectMeta{
+					Name: name(existing[idx]),
+					Labels: map[string]string{
+						"mutated": strconv.Itoa(updates),
+					},
+				},
+			}
 			_, err := c.CoreV1().ConfigMaps(ns).Update(context.TODO(), cm, metav1.UpdateOptions{})
 			framework.ExpectNoError(err, "Failed to update configmap %s in namespace %s", cm.Name, ns)
+			updates++
 		case deleteEvent:
 			idx := rand.Intn(len(existing))
 			err := c.CoreV1().ConfigMaps(ns).Delete(context.TODO(), name(existing[idx]), metav1.DeleteOptions{})