[9.2] (backport #10946) Enrollment should not be infinite when triggered from action #11012
+115
−6
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
(cherry picked from commit be77084)
mergify
bot
requested review from
swiatekm and
ycombinator
and removed request for
a team
github-actions
bot
added
Team:Elastic-Agent-Control-Plane
|
Pinging @elastic/elastic-agent-control-plane (Team:Elastic-Agent-Control-Plane) |
|
Pinging @elastic/elastic-agent (Team:Elastic-Agent) |
💛 Build succeeded, but was flaky
Failed CI Steps |
michalpristas
approved these changes
Nov 4, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When enrollment fails it retries indefinitely. This is fine when triggered from CLI but when running from Action it can lead to confusing outcomes (e.g Migration never finishes)
This PR addresses this in 2 ways
First it sets 3 retries for action triggered enrollments
Second it handles 401 as something that we should not retry on.
Previously indefinitely in agent activity
With fix:
Fixes: #10909
This is an automatic backport of pull request #10946 done by Mergify.