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

Add snapshot retention etcd-s3-folder fix #10293

Merged
merged 2 commits into from
Jun 6, 2024

Conversation

vitorsavian
Copy link
Member

Proposed Changes

  • Certificate that the snapshot key doesn't have the folder in it before add the folder in the key value

Types of Changes

  • Fix

Verification

  • Setup k3s with the etcd-s3-folder flag and wait for the retention to happen
cluster-init: true
etcd-s3: true
etcd-snapshot-schedule-cron: '*/1 * * * *'
etcd-snapshot-retention: 5
etcd-s3-bucket: bucket-name
etcd-s3-folder: bucket-folder
etcd-s3-region: bucket-region
etcd-s3-access-key: s3-access-key
etcd-s3-secret-key: s3-secret-key

Testing

Linked Issues

User-Facing Change


Further Comments

@vitorsavian vitorsavian requested a review from a team as a code owner June 4, 2024 23:01
pkg/etcd/s3.go Outdated Show resolved Hide resolved
Copy link

codecov bot commented Jun 4, 2024

Codecov Report

Attention: Patch coverage is 0% with 3 lines in your changes missing coverage. Please review.

Project coverage is 41.78%. Comparing base (79ba10f) to head (d285aa3).
Report is 2 commits behind head on master.

Files Patch % Lines
pkg/etcd/s3.go 0.00% 3 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master   #10293      +/-   ##
==========================================
- Coverage   47.89%   41.78%   -6.12%     
==========================================
  Files         177      177              
  Lines       14792    14802      +10     
==========================================
- Hits         7085     6185     -900     
- Misses       6362     7439    +1077     
+ Partials     1345     1178     -167     
Flag Coverage Δ
e2etests 36.47% <0.00%> (-9.98%) ⬇️
inttests 36.96% <0.00%> (+<0.01%) ⬆️
unittests 11.33% <0.00%> (+<0.01%) ⬆️

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.

@vitorsavian vitorsavian force-pushed the snapshot-retention-fix branch 2 times, most recently from f472e2d to 28ef184 Compare June 5, 2024 01:07
pkg/etcd/s3.go Outdated Show resolved Hide resolved
@vitorsavian vitorsavian force-pushed the snapshot-retention-fix branch 3 times, most recently from e1cc3bf to d88db13 Compare June 5, 2024 17:13
pkg/etcd/s3.go Outdated Show resolved Hide resolved
Signed-off-by: Vitor Savian <vitor.savian@suse.com>
@vitorsavian vitorsavian force-pushed the snapshot-retention-fix branch 2 times, most recently from a238c92 to 5932b4c Compare June 5, 2024 19:06
brandond
brandond previously approved these changes Jun 5, 2024
@brandond
Copy link
Member

brandond commented Jun 5, 2024

👍🏻 I think that should do it...

Signed-off-by: Vitor Savian <vitor.savian@suse.com>
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.

3 participants