Remove redundant watch of leader pod + increase e2e test timeout (#791)

* Remove redundant watch of leader pod

* Increase e2e test timeout to 2m

Author: adinilfeld

pkg/controllers/leaderworkerset_controller.go

@@ -211,31 +211,16 @@ func (r *LeaderWorkerSetReconciler) SetupWithManager(mgr ctrl.Manager) error {
 		Owns(&corev1.Service{}).
 		Watches(&appsv1.StatefulSet{},
 			handler.EnqueueRequestsFromMapFunc(func(ctx context.Context, a client.Object) []reconcile.Request {
-				return enqueueLWSRequests(a)
-			})).
-		Watches(&corev1.Pod{},
-			handler.EnqueueRequestsFromMapFunc(func(ctx context.Context, a client.Object) []reconcile.Request {
-				if a.GetLabels()[leaderworkerset.WorkerIndexLabelKey] != "0" {
-					return nil
+				return []reconcile.Request{
+					{NamespacedName: types.NamespacedName{
+						Name:      a.GetLabels()[leaderworkerset.SetNameLabelKey],
+						Namespace: a.GetNamespace(),
+					}},
 				}
-				return enqueueLWSRequests(a)
 			})).
 		Complete(r)
 }
 
-func enqueueLWSRequests(a client.Object) []reconcile.Request {
-	name := a.GetLabels()[leaderworkerset.SetNameLabelKey]
-	if name == "" {
-		return nil
-	}
-	return []reconcile.Request{
-		{NamespacedName: types.NamespacedName{
-			Name:      name,
-			Namespace: a.GetNamespace(),
-		}},
-	}
-}
-
 func SetupIndexes(indexer client.FieldIndexer) error {
 	return indexer.IndexField(context.Background(), &appsv1.StatefulSet{}, lwsOwnerKey, func(rawObj client.Object) []string {
 		// grab the statefulSet object, extract the owner...

test/e2e/suite_test.go

@@ -43,7 +43,7 @@ import (
 )
 
 const (
-	timeout  = 30 * time.Second
+	timeout  = 2 * time.Minute
 	interval = time.Millisecond * 250
 )
 

test/testutils/validators.go

@@ -38,7 +38,7 @@ import (
 )
 
 const (
-	Timeout  = 30 * time.Second
+	Timeout  = 2 * time.Minute
 	Interval = time.Millisecond * 250
 )