Cleanup snapshots before volumes

timoreimann · timoreimann · commit e28d78a183e3 · 2020-08-31T21:22:06.000+02:00
[1] accidentally swapped the cleanup order which represents a deviation to the previous behavior that not all CSI drivers may be able to handle. This change restores the original order. [1]: kubernetes-csi#261
diff --git a/pkg/sanity/resources.go b/pkg/sanity/resources.go
@@ -248,8 +248,8 @@ func (cl *Resources) Cleanup() {
 	defer cl.mutex.Unlock()
 	ctx := context.Background()
 
-	cl.deleteVolumes(ctx, 2)
 	cl.deleteSnapshots(ctx, 2)
+	cl.deleteVolumes(ctx, 2)
 }
 
 func (cl *Resources) deleteVolumes(ctx context.Context, offset int) {

Original file line number	Diff line number	Diff line change
`@@ -248,8 +248,8 @@ func (cl *Resources) Cleanup() {`
`248`	`248`	`defer cl.mutex.Unlock()`
`249`	`249`	`ctx := context.Background()`
`250`	`250`
`251`		`- cl.deleteVolumes(ctx, 2)`
`252`	`251`	`cl.deleteSnapshots(ctx, 2)`
	`252`	`+ cl.deleteVolumes(ctx, 2)`
`253`	`253`	`}`
`254`	`254`
`255`	`255`	`func (cl *Resources) deleteVolumes(ctx context.Context, offset int) {`