[v18] EC2 auto discovery: allow usage of pre-defined AWS-RunShellScript SSM Document#60434
Merged
marcoandredinis merged 3 commits intobranch/v18from Oct 24, 2025
Merged
Conversation
Contributor
Author
|
Marked with cc @smallinsky |
marcoandredinis
force-pushed
the
bot/backport-60224-branch/v18
branch
from
fb23cec to
aa4630c
Compare
juliaogris
approved these changes
Oct 23, 2025
marcoandredinis
force-pushed
the
bot/backport-60224-branch/v18
branch
from
aa4630c to
c986079
Compare
Contributor
Author
|
@smallinsky can you please take a look when you get a chance? |
smallinsky
approved these changes
Oct 24, 2025
If teleport is started with just Auth and Discovery in the same host, the Public Proxy Addr is not available. Even tho this means that Discovery will not be able to enroll Servers, this is a valid set up. When the Proxy becomes available, the next Discovery iteration will correctly enroll servers.
marcoandredinis
force-pushed
the
bot/backport-60224-branch/v18
branch
from
c986079 to
0f101fa
Compare
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
Merged
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Backport #60224 and #60457 to branch/v18
changelog: Adapts EC2 Server auto discovery to send the correct parameters when using the
AWS-RunShellScriptpre-defined SSM Document.