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

[release-1.26] Fix s3 snapshot restore #8734

Merged

Conversation

brandond
Copy link
Contributor

Proposed Changes

Don't try to read token hash and cluster id during cluster-reset

These fields are only necessary when saving snapshots to S3, and will block restoration if attempted

Types of Changes

bugfix

Verification

See linked issue

Testing

Linked Issues

User-Facing Change

Further Comments

@brandond brandond requested a review from a team as a code owner October 27, 2023 19:10
These fields are only necessary when saving snapshots to S3, and will block restoration if attempted

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
@brandond brandond force-pushed the fix-s3-snapshot-restore_release-1.26 branch from 7bb11be to 67037f4 Compare October 27, 2023 20:02
@codecov
Copy link

codecov bot commented Oct 27, 2023

Codecov Report

Attention: 23 lines in your changes are missing coverage. Please review.

Comparison is base (10379aa) 17.48% compared to head (67037f4) 17.47%.

Additional details and impacted files
@@               Coverage Diff                @@
##           release-1.26    #8734      +/-   ##
================================================
- Coverage         17.48%   17.47%   -0.02%     
================================================
  Files                94       94              
  Lines              6313     6319       +6     
================================================
  Hits               1104     1104              
- Misses             4976     4982       +6     
  Partials            233      233              
Flag Coverage Δ
unittests 17.47% <0.00%> (-0.02%) ⬇️

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

Files Coverage Δ
pkg/etcd/etcd.go 24.40% <0.00%> (ø)
pkg/etcd/s3.go 0.00% <0.00%> (ø)

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

@brandond brandond merged commit a6687b5 into k3s-io:release-1.26 Oct 27, 2023
15 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.

None yet

5 participants