[release-1.11] 🐛 Add wait-resource-versions-{become,remain}-stable intervals to e2e config

[nojnhuh]

What this PR does / why we need it:

Manual cherry-pick of #13263:

The default wait intervals used during clusterctl upgrade tests to check for the stability of resource versions do not work when there is high latency between the test binary and the management clusters. This PR makes those timeouts configurable via new wait-resource-versions-become-stable and wait-resource-versions-remain-stable interval configurations.

Also includes changes from #12848.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Related to #13262

/area e2e-testing

[nojnhuh]

Resolved conflicts with #12848:

diff --cc test/e2e/cluster_upgrade_runtimesdk_test.go
index cfe322ba7,77718c87b..000000000
--- a/test/e2e/cluster_upgrade_runtimesdk_test.go
+++ b/test/e2e/cluster_upgrade_runtimesdk_test.go
diff --cc test/framework/resourceversion_helpers.go
index ee79889a8,262363074..000000000
--- a/test/framework/resourceversion_helpers.go
+++ b/test/framework/resourceversion_helpers.go
@@@ -38,8 -46,12 +46,12 @@@ func ValidateResourceVersionStable(ctx
        byf("Check resourceVersions are stable")
        var previousResourceVersions map[string]string
        var previousObjects map[string]client.Object
+       waitToBecomeStable := input.WaitToBecomeStable
+       if len(waitToBecomeStable) == 0 {
 -              waitToBecomeStable = []any{"2m", "15s"}
++              waitToBecomeStable = []any{"1m", "15s"}
+       }
        Eventually(func(g Gomega) {
-               objectsWithResourceVersion, objects, err := getObjectsWithResourceVersion(ctx, proxy, namespace, ownerGraphFilterFunction)
+               objectsWithResourceVersion, objects, err := getObjectsWithResourceVersion(ctx, input.ClusterProxy, input.Namespace, input.OwnerGraphFilterFunction)
                g.Expect(err).ToNot(HaveOccurred())

                defer func() {
@@@ -49,15 -61,19 +61,19 @@@
                }()
                // This is intentionally failing on the first run.
                g.Expect(objectsWithResourceVersion).To(BeComparableTo(previousResourceVersions))
-       }, 1*time.Minute, 15*time.Second).Should(Succeed(), "resourceVersions never became stable")
 -      }, waitToBecomeStable...).MustPassRepeatedly(4).Should(Succeed(), "resourceVersions never became stable")
++      }, waitToBecomeStable...).Should(Succeed(), "resourceVersions never became stable")

        // Verify resourceVersions are stable for a while.
        byf("Check resourceVersions remain stable")
+       waitToRemainStable := input.WaitToRemainStable
+       if len(waitToRemainStable) == 0 {
 -              waitToRemainStable = []any{"2m", "5s"}
++              waitToRemainStable = []any{"2m", "15s"}
+       }
        Consistently(func(g Gomega) {
-               objectsWithResourceVersion, objects, err := getObjectsWithResourceVersion(ctx, proxy, namespace, ownerGraphFilterFunction)
+               objectsWithResourceVersion, objects, err := getObjectsWithResourceVersion(ctx, input.ClusterProxy, input.Namespace, input.OwnerGraphFilterFunction)
                g.Expect(err).ToNot(HaveOccurred())
                g.Expect(previousResourceVersions).To(BeComparableTo(objectsWithResourceVersion), printObjectDiff(previousObjects, objects))
-       }, 2*time.Minute, 15*time.Second).Should(Succeed(), "resourceVersions didn't stay stable")
+       }, waitToRemainStable...).Should(Succeed(), "resourceVersions didn't stay stable")
  }

  func printObjectDiff(previousObjects, newObjects map[string]client.Object) func() string {
diff --git a/test/e2e/config/docker.yaml b/test/e2e/config/docker.yaml
index 1957704ac..70c48f2e2 100644
--- a/test/e2e/config/docker.yaml
+++ b/test/e2e/config/docker.yaml
@@ -412,8 +412,8 @@ intervals:
   default/wait-nodes-ready: ["10m", "10s"]
   default/wait-machine-remediation: ["5m", "10s"]
   default/wait-autoscaler: ["5m", "10s"]
-  default/wait-resource-versions-become-stable: ["2m", "15s"]
-  default/wait-resource-versions-remain-stable: ["2m", "5s"]
+  default/wait-resource-versions-become-stable: ["1m", "15s"]
+  default/wait-resource-versions-remain-stable: ["2m", "15s"]
   node-drain/wait-deployment-available: ["3m", "10s"]
   node-drain/wait-control-plane: ["15m", "10s"]
   node-drain/wait-machine-deleted: ["2m", "10s"]

/assign @sbueringer

[sbueringer]

/lgtm
/approve

[sbueringer]

Thx!

[k8s-ci-robot]

LGTM label has been added.

Details

Git tree hash: 780ff9dc55df77bbacbc7011cc555ad93a8d0169

[k8s-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sbueringer

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

• OWNERS [sbueringer]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment