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

account for an s3 folder when listing objects #3807

Merged
merged 2 commits into from
Aug 9, 2021

Conversation

briandowns
Copy link
Contributor

@briandowns briandowns commented Aug 9, 2021

Proposed Changes

Additional logic needed to be added to account for the use of folders within AWS S3 buckets in the "list snapshots" routine.

Types of Changes

Verification

Run the command below and verify that what is listed in the ConfigMap is what's in the AWS folder.

kubectl get cm -n kube-system k3s-etcd-snapshots -o yaml 

Linked Issues

User-Facing Change


Further Comments

@briandowns briandowns added the kind/bug Something isn't working label Aug 9, 2021
@briandowns briandowns requested a review from a team August 9, 2021 21:28
@briandowns briandowns self-assigned this Aug 9, 2021
pkg/etcd/etcd.go Outdated Show resolved Hide resolved
pkg/etcd/etcd.go Outdated Show resolved Hide resolved
pkg/etcd/etcd.go Outdated Show resolved Hide resolved
Signed-off-by: Brian Downs <[email protected]>
@codecov-commenter
Copy link

Codecov Report

Merging #3807 (4f99f23) into master (bc96ffb) will decrease coverage by 0.01%.
The diff coverage is 0.00%.

❗ Current head 4f99f23 differs from pull request most recent head 798a1e4. Consider uploading reports for the commit 798a1e4 to get more accurate results
Impacted file tree graph

@@            Coverage Diff             @@
##           master    #3807      +/-   ##
==========================================
- Coverage   11.55%   11.54%   -0.02%     
==========================================
  Files         136      136              
  Lines        8815     8823       +8     
==========================================
  Hits         1019     1019              
- Misses       7575     7583       +8     
  Partials      221      221              
Flag Coverage Δ
inttests 0.62% <0.00%> (-0.01%) ⬇️
unittests 11.26% <0.00%> (-0.02%) ⬇️

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

Impacted Files Coverage Δ
pkg/etcd/etcd.go 16.51% <0.00%> (-0.21%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update bc96ffb...798a1e4. Read the comment docs.

@briandowns briandowns requested a review from brandond August 9, 2021 22:07
@brandond
Copy link
Member

brandond commented Aug 9, 2021

Does this currently find everything properly if there's not a prefix specified? I guess it just non-recursively lists everything in the top-level directory (no prefix)?

@briandowns
Copy link
Contributor Author

Does this currently find everything properly if there's not a prefix specified? I guess it just non-recursively lists everything in the top-level directory (no prefix)?

Correct. Only looks at the top level (bucket level).

@briandowns briandowns merged commit dcf0657 into k3s-io:master Aug 9, 2021
briandowns added a commit to briandowns/k3s that referenced this pull request Aug 9, 2021
* account for an s3 folder when listing objects

Signed-off-by: Brian Downs <[email protected]>
briandowns added a commit to briandowns/k3s that referenced this pull request Aug 9, 2021
* account for an s3 folder when listing objects

Signed-off-by: Brian Downs <[email protected]>
briandowns added a commit that referenced this pull request Aug 10, 2021
* account for an s3 folder when listing objects
briandowns added a commit that referenced this pull request Aug 10, 2021
* account for an s3 folder when listing objects
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants