Merge pull request #84238 from danwinship/affinity-slower

Make e2eservice.CheckAffinity wait longer, to avoid flakes

test/e2e/framework/service/affinity_checker.go

@@ -34,7 +34,7 @@ import (
 func CheckAffinity(execPod *v1.Pod, serviceIP string, servicePort int, shouldHold bool) bool {
 	serviceIPPort := net.JoinHostPort(serviceIP, strconv.Itoa(servicePort))
 	cmd := fmt.Sprintf(`curl -q -s --connect-timeout 2 http://%s/`, serviceIPPort)
-	timeout := TestTimeout
+	timeout := AffinityTimeout
 	if execPod == nil {
 		timeout = LoadBalancerPollTimeout
 	}

test/e2e/framework/service/const.go

@@ -76,6 +76,12 @@ const (
 	// TestTimeout is used for most polling/waiting activities
 	TestTimeout = 60 * time.Second
 
+	// AffinityTimeout is the maximum time that CheckAffinity is allowed to take; this
+	// needs to be more than long enough for AffinityConfirmCount HTTP requests to
+	// complete in a busy CI cluster, but shouldn't be too long since we will end up
+	// waiting the entire time in the tests where affinity is not expected.
+	AffinityTimeout = 2 * time.Minute
+
 	// AffinityConfirmCount is the number of needed continuous requests to confirm that
 	// affinity is enabled.
 	AffinityConfirmCount = 15