kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix sporadic volume detach error when volume is already detached 

Update pkg/resources/digitalocean/resources.go

Co-authored-by: Ciprian Hacman <ciprian@hakman.dev>

Incorporate review comments
This commit is contained in:
srikiz 2021-07-09 10:10:41 +05:30
parent b58caf6130
commit 8836b4076e
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/resources/digitalocean/resources.go
View File

@ -20,6 +20,7 @@ import (
"context" "context"
"errors" "errors"
"fmt" "fmt"
"net/http"
"strconv" "strconv"
"strings" "strings"
"time" "time"
@ -264,10 +265,15 @@ func deleteVolume(cloud fi.Cloud, t *resources.Resource) error {
c := cloud.(do.DOCloud) c := cloud.(do.DOCloud)
volume := t.Obj.(godo.Volume) volume := t.Obj.(godo.Volume)
for _, dropletID := range volume.DropletIDs { for _, dropletID := range volume.DropletIDs {
action, _, err := c.VolumeActionService().DetachByDropletID(context.TODO(), volume.ID, dropletID) action, resp, err := c.VolumeActionService().DetachByDropletID(context.TODO(), volume.ID, dropletID)
if err != nil { if err != nil {
return fmt.Errorf("failed to detach volume: %s, err: %s", volume.ID, err) if resp != nil && resp.StatusCode == http.StatusNotFound {
// Volume is already detached, nothing to do.
continue
}
return fmt.Errorf("failed to detach volume %s: %s", volume.ID, err)
} }
if err := waitForDetach(c, action); err != nil { if err := waitForDetach(c, action); err != nil {
return fmt.Errorf("error while waiting for volume %s to detach: %s", volume.ID, err) return fmt.Errorf("error while waiting for volume %s to detach: %s", volume.ID, err)
} }