[Backport release-1.26] Ignore token-file argument when value not needed #4301
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
Both "k0s controller" and "k0s worker" take either [TOKEN] as an argument or a path to a file containing the join token via --token-file. Before this PR, when --token-file was given, the file was read upon spin-up, even when the node has joined already and won't utilize the token. As the token is not needed after join, you would expect that you can or even should remove the file, but that makes k0s refuse to start unless the --token-file argument is removed from the systemd unit or other startup scripts. This PR makes the controller and worker read the contents of the file only right before the value is getting used. This allows --token-file argument to be ignored when it is not needed and the file not existing will not generate an error. Signed-off-by: Kimmo Lehto <[email protected]> (cherry picked from commit 42d94e4) (cherry picked from commit 75c65eb) (cherry picked from commit 00e610c) (cherry picked from commit 8aa40a9)
Signed-off-by: Kimmo Lehto <[email protected]> (cherry picked from commit 1391728) (cherry picked from commit f152262) (cherry picked from commit 26f57a8) (cherry picked from commit 5edd77e)
Signed-off-by: Kimmo Lehto <[email protected]> (cherry picked from commit df17744) (cherry picked from commit d86cad2) (cherry picked from commit 9c9fa82) (cherry picked from commit ca66a64)
twz123
changed the title
jnummelin
approved these changes
Apr 18, 2024
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.
Automated backport to
release-1.26, triggered by a label in #4295.See #4293 #4277.