Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport release-1.29] Harden etcd subcommand usage and validation #4128

Merged
merged 2 commits into from
Mar 27, 2024

Conversation

k0s-bot
Copy link

@k0s-bot k0s-bot commented Mar 1, 2024

Automated backport to release-1.29, triggered by a label in #4118.
See k0sproject/k0smotron#459.

twz123 added 2 commits March 1, 2024 09:09
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)
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)
@k0s-bot k0s-bot requested a review from a team as a code owner March 1, 2024 09:09
@k0s-bot k0s-bot requested review from ncopa and makhov March 1, 2024 09:09
@twz123 twz123 added bug Something isn't working component/etcd area/cli backport/release-1.28 PR that needs to be backported/cherrypicked to release-1.28 branch labels Mar 1, 2024
@twz123 twz123 enabled auto-merge March 27, 2024 16:27
@twz123 twz123 merged commit cc0941f into release-1.29 Mar 27, 2024
78 checks passed
@twz123 twz123 deleted the backport-4118-to-release-1.29 branch March 27, 2024 21:02
@k0s-bot
Copy link
Author

k0s-bot commented Mar 27, 2024

Successfully created backport PR for release-1.28:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/cli backport/release-1.28 PR that needs to be backported/cherrypicked to release-1.28 branch bug Something isn't working component/etcd
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants