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

Don't use server value from config file for etcd-snapshot commands #10514

Merged
merged 1 commit into from
Jul 15, 2024

Conversation

brandond
Copy link
Member

@brandond brandond commented Jul 14, 2024

Proposed Changes

Don't use server and token values from config file for etcd-snapshot commands

Fixes an issue where running etcd-snapshot commands on a node that has a server address set in the config will manage snapshots on that server, instead of on the local node as intended.

Types of Changes

bugfix

Verification

See linked issue

Testing

Linked Issues

User-Facing Change

The `--server` and `--token` flags for the `k3s etcd-snapshot` command have been renamed to `--etcd-server` and `--etcd-token`, to avoid unintentionally running snapshot management commands against a remote node when the cluster join address or token are present in a config file.

Further Comments

@brandond brandond requested a review from a team as a code owner July 14, 2024 00:36
Copy link

codecov bot commented Jul 14, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 43.52%. Comparing base (58ab259) to head (ef2b70d).
Report is 1 commits behind head on master.

❗ There is a different number of reports uploaded between BASE (58ab259) and HEAD (ef2b70d). Click for more details.

HEAD has 1 upload less than BASE
Flag BASE (58ab259) HEAD (ef2b70d)
e2etests 7 6
Additional details and impacted files
@@            Coverage Diff             @@
##           master   #10514      +/-   ##
==========================================
- Coverage   49.47%   43.52%   -5.96%     
==========================================
  Files         179      179              
  Lines       14924    14924              
==========================================
- Hits         7384     6496     -888     
- Misses       6161     7223    +1062     
+ Partials     1379     1205     -174     
Flag Coverage Δ
e2etests 36.36% <ø> (-9.97%) ⬇️
inttests 36.69% <ø> (+16.97%) ⬆️
unittests 13.37% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@brandond brandond force-pushed the fix-etcd-snapshot-server-flag branch from 1441f76 to 0b9ca0b Compare July 14, 2024 01:39
…commands

Fixes an issue where running etcd-snapshot commands on a node that has a server address set in the config will manage snapshots on that server, instead of on the local node as intended.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
@brandond brandond merged commit 37830fe into k3s-io:master Jul 15, 2024
29 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants