Merge pull request #7031 from justinsb/cherrypick_7008_release-1.13

Cherry pick of #7008 onto release-1.13
kubernetes · May 19, 2019 · 5d7cdef · 5d7cdef
2 parents 0151919 + fa82f2e
commit 5d7cdef
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/pkg/resources/aws/vpc.go b/pkg/resources/aws/vpc.go
@@ -39,6 +39,11 @@ func DeleteVPC(cloud fi.Cloud, r *resources.Resource) error {
 	}
 	_, err := c.EC2().DeleteVpc(request)
 	if err != nil {
+		if awsup.AWSErrorCode(err) == "InvalidVpcID.NotFound" {
+			// Concurrently deleted
+			return nil
+		}
+
 		if IsDependencyViolation(err) {
 			return err
 		}