From 987b84d0ca24dbc9d50df545e23f882a579fa96d Mon Sep 17 00:00:00 2001 From: Vitor Savian Date: Tue, 4 Jun 2024 19:46:56 -0300 Subject: [PATCH] Add snapshot retention folder fix Signed-off-by: Vitor Savian --- pkg/etcd/s3.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg/etcd/s3.go b/pkg/etcd/s3.go index 6af4c4d27a8a..cc45f6f525f0 100644 --- a/pkg/etcd/s3.go +++ b/pkg/etcd/s3.go @@ -321,7 +321,9 @@ func (s *S3) snapshotRetention(ctx context.Context) ([]string, error) { deleted := []string{} for _, df := range snapshotFiles[s.config.EtcdSnapshotRetention:] { logrus.Infof("Removing S3 snapshot: s3://%s/%s", s.config.EtcdS3BucketName, df.Key) - if err := s.deleteSnapshot(ctx, df.Key); err != nil { + + key := path.Base(df.Key) + if err := s.deleteSnapshot(ctx, key); err != nil { return deleted, err } deleted = append(deleted, df.Key)