Skip to content

Commit 99d3dd3

Browse files
authored
Merge pull request #852 from hidekazuna/fix_del_instance_poll
🐛 Fix polling deleting instance
2 parents bddb579 + f550bcd commit 99d3dd3

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

pkg/cloud/services/compute/instance.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -650,14 +650,14 @@ func (s *Service) DeleteInstance(object runtime.Object, instanceName string) err
650650
}
651651

652652
err = util.PollImmediate(RetryIntervalInstanceStatus, TimeoutInstanceDelete, func() (bool, error) {
653-
_, err = s.GetInstance(instance.ID)
653+
i, err := s.GetInstance(instance.ID)
654654
if err != nil {
655-
if capoerrors.IsNotFound(err) {
656-
return true, nil
657-
}
658655
return false, err
659656
}
660-
return false, nil
657+
if i != nil {
658+
return false, nil
659+
}
660+
return true, nil
661661
})
662662
if err != nil {
663663
record.Warnf(object, "FailedDeleteServer", "Failed to deleted server %s with id %s: %v", instance.Name, instance.ID, err)

0 commit comments

Comments
 (0)