Merge pull request #10508 from wongma7/dhcpnotfound

Treat InvalidDhcpOptionsId.NotFound as already-deleted
kubernetes · Dec 30, 2020 · 0e34ce1 · 0e34ce1
2 parents dded75e + 7e9392e
commit 0e34ce1
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/pkg/resources/aws/aws.go b/pkg/resources/aws/aws.go
@@ -933,7 +933,10 @@ func DeleteDhcpOptions(cloud fi.Cloud, r *resources.Resource) error {
 	}
 	_, err := c.EC2().DeleteDhcpOptions(request)
 	if err != nil {
-		if IsDependencyViolation(err) {
+		if awsup.AWSErrorCode(err) == "InvalidDhcpOptionsID.NotFound" {
+			klog.V(2).Infof("Got InvalidDhcpOptionsID.NotFound error deleting DhcpOptions %q; will treat as already-deleted", id)
+			return nil
+		} else if IsDependencyViolation(err) {
 			return err
 		}
 		return fmt.Errorf("error deleting DhcpOptions %q: %v", id, err)