Add snapshot retention etcd-s3-folder fix

[vitorsavian]

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

• Snapshot retention does not work with etcd-s3-folder #10292

User-Facing Change

Further Comments

[codecov]

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.

[brandond]

👍🏻 I think that should do it...