diff --git a/pkg/resources/aws/aws.go b/pkg/resources/aws/aws.go index 51037122e7..3673fca838 100644 --- a/pkg/resources/aws/aws.go +++ b/pkg/resources/aws/aws.go @@ -561,6 +561,17 @@ func ListVolumes(cloud fi.Cloud, clusterName string) ([]*resources.Resource, err for _, volume := range volumes { id := aws.StringValue(volume.VolumeId) + deleteOnTermination := false + for _, attachment := range volume.Attachments { + if aws.BoolValue(attachment.DeleteOnTermination) { + deleteOnTermination = true + break + } + } + if deleteOnTermination { + continue + } + resourceTracker := &resources.Resource{ Name: FindName(volume.Tags), ID: id,