github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-04 18:52:38 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #100759 from jsturtevant/replica-set-flake-issue-100725

Browse Source 
Fix for Flaky test ReplicaSet Replace and Patch tests [Conformance]
This commit is contained in:
Kubernetes Prow Robot
2021-04-02 05:12:12 -07:00
committed by GitHub
parent a651804427 dab1325c29
commit 5ad79eae2d
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e/apps/replica_set.go
View File

@@ -502,7 +502,7 @@ func testRSLifeCycle(f *framework.Framework) {
_, err = f.ClientSet.AppsV1().ReplicaSets(ns).Patch(context.TODO(), rsName, types.StrategicMergePatchType, []byte(rsPatch), metav1.PatchOptions{})
framework.ExpectNoError(err, "failed to patch ReplicaSet")
ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Minute)
defer cancel()
_, err = watchtools.Until(ctx, rsList.ResourceVersion, w, func(event watch.Event) (bool, error) {
if rset, ok := event.Object.(*appsv1.ReplicaSet); ok {