fix for etcd-snapshot delete with --etcd-s3 flag (#8110)

k3s etcd-snapshot save --etcd-s3 ... is creating a local snapshot and uploading it to s3 while k3s etcd-snapshot delete --etcd-s3 ... was deleting the snapshot only on s3 buckets, this commit change the behavior of delete to do it locally and on s3 Signed-off-by: Ian Cardoso <osodracnai@gmail.com> (cherry picked from commit e551308d)

fix for etcd-snapshot delete with --etcd-s3 flag (#8110)
9fc75e74 · Ian Cardoso · Brad Davidson · 2adec135 · 9fc75e74
Commit 9fc75e74 authored Aug 04, 2023 by Ian Cardoso Committed by Brad Davidson Aug 04, 2023
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

etcd.go pkg/etcd/etcd.go +5 -0

No files found.
--- a/pkg/etcd/etcd.go
+++ b/pkg/etcd/etcd.go
@@ -1704,6 +1704,7 @@ func (e *ETCD) DeleteSnapshots(ctx context.Context, snapshots []string) error {
 			}
 		}()
+		err = func() error {
 			for {
 				select {
 				case <-ctx.Done():
@@ -1720,6 +1721,10 @@ func (e *ETCD) DeleteSnapshots(ctx context.Context, snapshots []string) error {
 					}
 				}
 			}
+		}()
+		if err != nil {
+			return err
+		}
 	}
 	logrus.Info("Removing the given locally stored etcd snapshot(s)")