Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(kuma-cp): don't let CA requests for other meshes block generation (backport #6282) #6284

Merged
merged 1 commit into from
Mar 16, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 16, 2023

This is an automatic backport of pull request #6282 done by Mergify.


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

…#6282)

This PR adds a default timeout of 10s to calls of GetRootCert for the case that the CA manager takes too long, so that it doesn't block generation, especially in the cross-mesh case.

Signed-off-by: Mike Beaumont <[email protected]>
(cherry picked from commit 463e6b2)
@mergify mergify bot requested review from a team, michaelbeaumont and Automaat and removed request for a team March 16, 2023 11:29
@michaelbeaumont michaelbeaumont enabled auto-merge (squash) March 16, 2023 11:35
@michaelbeaumont michaelbeaumont merged commit d18c0a1 into release-2.1 Mar 16, 2023
@michaelbeaumont michaelbeaumont deleted the mergify/bp/release-2.1/pr-6282 branch March 16, 2023 11:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant