test: fix flake in TestResourceGroupApplyStatus (#1877)

After adding the diff logging, it looks like the root cause for this
test flake is due to a watch event ordering issue. Namely, the test
begins waiting for the resourceVersion to not change before the r-g-c
has actually updated the status. The fix is to add a resourceVersion
check to the prior wait condition, such that it does not pass
prematurely on a stale watch event.

Author: sdowell

e2e/testcases/resource_group_controller_test.go

@@ -527,17 +527,20 @@ func TestResourceGroupApplyStatus(t *testing.T) {
 	rg = &v1alpha1.ResourceGroup{}
 	nt.Must(nt.KubeClient.Get(rgNN.Name, rgNN.Namespace, rg))
 	rg.Status.ResourceStatuses = nil
+	// track resourceVersion to make sure the watch doesn't accept a stale object
+	resourceVersion := rg.ResourceVersion
 	nt.Must(nt.KubeClient.UpdateStatus(rg))
 
 	nt.T.Log("Wait for the ResourceGroup controller to update the ResourceGroup status")
 	nt.Must(nt.Watcher.WatchObject(kinds.ResourceGroup(), rgNN.Name, rgNN.Namespace,
 		testwatcher.WatchPredicates(
 			testpredicates.ResourceGroupStatusEquals(expectedStatus),
+			testpredicates.ResourceVersionNotEquals(nt.Scheme, resourceVersion),
 		)))
 
 	rg = &v1alpha1.ResourceGroup{}
 	nt.Must(nt.KubeClient.Get(rgNN.Name, rgNN.Namespace, rg))
-	resourceVersion := rg.ResourceVersion
+	resourceVersion = rg.ResourceVersion
 
 	nt.T.Log("Wait 60s to validate that the ResourceGroup controller doesn't make any more updates (no resourceVersion change)")
 	err := nt.Watcher.WatchObject(kinds.ResourceGroup(), rgNN.Name, rgNN.Namespace,