Treat InvalidDhcpOptionsId.NotFound as already-deleted

kubernetes · Dec 28, 2020 · 5bf1719 · 5bf1719
1 parent 784c4f0
commit 5bf1719
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/pkg/resources/aws/aws.go b/pkg/resources/aws/aws.go
@@ -933,7 +933,9 @@ 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)
+		} else if IsDependencyViolation(err) {
 			return err
 		}
 		return fmt.Errorf("error deleting DhcpOptions %q: %v", id, err)