Auto Discover Server must not overwrite manual changes #44637
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
marcoandredinis
added
no-changelog
marcoandredinis
force-pushed
the
marco/autodiscover-server-prevent-config-overwrite
branch
2 times, most recently
from
ac29b7f to
30de68a
Compare
This PR changes the flow so that only discover managed installations might have their teleport.yaml configuration replaced.
marcoandredinis
force-pushed
the
marco/autodiscover-server-prevent-config-overwrite
branch
from
30de68a to
28efbad
Compare
ryanclark
approved these changes
Jul 26, 2024
Co-authored-by: Ryan Clark <[email protected]>
|
@GavinFrazar can you please take a look? |
r0mant
approved these changes
Jul 30, 2024
public-teleport-github-review-bot
bot
removed the request for review
from GavinFrazar
Co-authored-by: Roman Tkachenko <[email protected]>
oops, sorry I don't know how I missed this last Friday |
GavinFrazar
approved these changes
Jul 30, 2024
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
|
@marcoandredinis See the table below for backport results.
|
michellescripts
pushed a commit
that referenced
this pull request
Jul 30, 2024
* Auto Discover Server must not overwrite manual changes This PR changes the flow so that only discover managed installations might have their teleport.yaml configuration replaced. * Update lib/srv/server/installer/autodiscover.go Co-authored-by: Ryan Clark <[email protected]> * Update lib/srv/server/installer/autodiscover.go Co-authored-by: Roman Tkachenko <[email protected]> * Update lib/srv/server/installer/autodiscover.go --------- Co-authored-by: Ryan Clark <[email protected]> Co-authored-by: Roman Tkachenko <[email protected]> Co-authored-by: Gavin Frazar <[email protected]>
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.
This PR changes the flow so that only discover managed installations might have their teleport.yaml configuration replaced.
Demo
Started by using a DiscoveryConfig which had a typo in the installer params.
As expected, the command was executed but the node couldn't join
Discover notice file was created:
The discover notice file was removed and the typo was fixed.
The script refused to re-configure teleport because the discover file was not present.
After fixing the typo and running the suggested command, and after a new iteration of SSM Run (discover flow), teleport was able to recover and join the cluster.