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
Hide whitespace changes
Inline Side-by-side

Showing with 17 additions and 12 deletions

etcd.go pkg/etcd/etcd.go +17 -12

No files found.
--- a/pkg/etcd/etcd.go
+++ b/pkg/etcd/etcd.go
@@ -1704,21 +1704,26 @@ func (e *ETCD) DeleteSnapshots(ctx context.Context, snapshots []string) error {
 			}
 		}()
-		for {
+		err = func() error {
-			select {
+			for {
-			case <-ctx.Done():
+				select {
-				logrus.Errorf("Unable to delete snapshot: %v", ctx.Err())
+				case <-ctx.Done():
-				return e.ReconcileSnapshotData(ctx)
+					logrus.Errorf("Unable to delete snapshot: %v", ctx.Err())
-			case <-time.After(time.Millisecond * 100):
-				continue
-			case err, ok := <-e.s3.client.RemoveObjects(ctx, e.config.EtcdS3BucketName, objectsCh, minio.RemoveObjectsOptions{}):
-				if err.Err != nil {
-					logrus.Errorf("Unable to delete snapshot: %v", err.Err)
-				}
-				if !ok {
 					return e.ReconcileSnapshotData(ctx)
+				case <-time.After(time.Millisecond * 100):
+					continue
+				case err, ok := <-e.s3.client.RemoveObjects(ctx, e.config.EtcdS3BucketName, objectsCh, minio.RemoveObjectsOptions{}):
+					if err.Err != nil {
+						logrus.Errorf("Unable to delete snapshot: %v", err.Err)
+					}
+					if !ok {
+						return e.ReconcileSnapshotData(ctx)
+					}
 				}
 			}
+		}()
+		if err != nil {
+			return err
 		}
 	}