[v17] Fix discover reporting for static matchers #48424
Merged
Conversation
This file contains 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
Discovery Service now reports the status of the auto enrollment flows when the matchers come from a DiscoveryConfig resource. For static matchers, those in `teleport.yaml/discovery_service.<cloud>.<matcher>` there's no status to write to.
marcoandredinis
added
the
no-changelog
tigrato
approved these changes
Nov 5, 2024
kopiczko
approved these changes
Nov 5, 2024
| @@ -45,6 +45,12 @@ import ( | |||
| // - AWS Sync (TAG) status | |||
| // - AWS EC2 Auto Discover status | |||
| func (s *Server) updateDiscoveryConfigStatus(discoveryConfigName string) { | |||
| // Static configurations (ie those in `teleport.yaml/discovery_config.<cloud>.matchers`) do not have a DiscoveryConfig resource. | |||
There was a problem hiding this comment.
I forgot to ask in the original PR: isn't that teleport.yaml/discovery_service?
There was a problem hiding this comment.
Nice catch 🙏
Yes, it should be.
I'll create another PR for the fix because we already merged it in master
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.
Backport #48156 to branch/v17