[release-3.11] UPSTREAM: 68678: tighten maximum retry loop for aggregate api availability

[openshift-cherrypick-robot]

This is an automated cherry-pick of #20999

/assign deads2k

[sdodson]

/retest

[derekwaynecarr]

we can queue this up for first z release.

[sdodson]

we can queue this up for first z release.

Multiple other bugs are suspected of being tied back to this. Even if this doesn't resolve the issue it leads to upgrades stalling for up to 1000s. Other non aggregated APIs are unresponsive around the same time, could this potentially cause a wider API degradation?

[deads2k]

Multiple other bugs are suspected of being tied back to this. Even if this doesn't resolve the issue it leads to upgrades stalling for up to 1000s. Other non aggregated APIs are unresponsive around the same time, could this potentially cause a wider API degradation?

No. It is strictly related to remote servers.

[knobunc]

That e2e test failure is https://bugzilla.redhat.com/show_bug.cgi?id=1630537

[derekwaynecarr]

@sdodson @deads2k is there a bz that we can link to this change?

[sdodson]

This is poorly tracked because it's one of many problems in the constellation of upgrade issues where the API becomes unreliable.

https://bugzilla.redhat.com/show_bug.cgi?id=1623571
https://bugzilla.redhat.com/show_bug.cgi?id=1628961
Are bugs where storage migration fails on aggregated APIs, bugs where David and I sorted through adding the discovery and waits for aggregated api availability.

https://bugzilla.redhat.com/show_bug.cgi?id=1628881 is a bug assigned to the networking team where @squeed suggests that it now looks like it's failing due to api aggregation.

There are probably others but I've lost track of them.

[derekwaynecarr]

thanks @sdodson

since we have had to take some other prs, i am going to take this now as well.

/approve
/lgtm

[openshift-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: derekwaynecarr, openshift-cherrypick-robot

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

The pull request process is described here

Needs approval from an approver in each of these files:

• vendor/k8s.io/kubernetes/staging/src/k8s.io/kube-aggregator/OWNERS [derekwaynecarr]

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

[dmage]

/retest