[Backport release-1.26] Harden etcd subcommand usage and validation #4231
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
twz123
changed the title
|
This needs #4232. |
This is usually the way etcdctl displays member IDs. This makes it more intuitive and easier to correlate with etcdctl's output. Signed-off-by: Tom Wieczorek <[email protected]> (cherry picked from commit a8ce70b) (cherry picked from commit dfb5bfd) (cherry picked from commit 88d956d) (cherry picked from commit 6684565)
The etcd leave subcommand can be used to remove k0s nodes from the etcd cluster. If no IP address is specified, the default is to remove the current node. The IP of the node to be removed can be specified with the --peer-address flag. However, it's quite tempting to just pass the IP as an argument, like this `k0s etcd drop 192.168.0.0.3`. This extra argument will simply be ignored, and the leave subcommand will use its defaults. This can be _very_ confusing, and also quite dangerous, as it may remove _different_ nodes than intended. Improve the subcommand by making it fail if arguments are passed to it. Add validation to the --peer-address flag and improve the usage strings. While at it, make the etcd member-list subcommand reject any args as well. Signed-off-by: Tom Wieczorek <[email protected]> (cherry picked from commit 477d354) (cherry picked from commit 6a19b5f) (cherry picked from commit ff33c56) (cherry picked from commit 6905070)
twz123
force-pushed
the
backport-4217-to-release-1.26
branch
from
d48f3d5
to
457a9b0
Compare
ncopa
approved these changes
Apr 5, 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 #4217.See #4210 #4118 k0sproject/k0smotron#459.