Skip to content

Commit

Permalink
fix: avoid failures when cleaning up spiderpool resources due to reso…
Browse files Browse the repository at this point in the history
…urceVersion conflicts.

Signed-off-by: tao.yang <tao.yang@daocloud.io>
  • Loading branch information
ty-dc committed Sep 27, 2024
1 parent 04355b4 commit e4b948e
Showing 1 changed file with 19 additions and 2 deletions.
21 changes: 19 additions & 2 deletions cmd/spiderpool-controller/cmd/clean.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (
"github.com/spidernet-io/spiderpool/pkg/constant"
spiderpoolv2beta1 "github.com/spidernet-io/spiderpool/pkg/k8s/apis/spiderpool.spidernet.io/v2beta1"
"github.com/spidernet-io/spiderpool/pkg/k8s/utils"
"github.com/spidernet-io/spiderpool/pkg/utils/retry"
webhook "k8s.io/api/admissionregistration/v1"
batchv1 "k8s.io/api/batch/v1"
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
Expand Down Expand Up @@ -210,15 +211,31 @@ func (c *CoreClient) cleanSpiderpoolResources(ctx context.Context, list client.O
}

if cleanFinalizers {
item.SetFinalizers(nil)
err = c.Update(ctx, item)
err = retry.RetryOnConflictWithContext(ctx, retry.DefaultBackoff, func(ctx context.Context) error {
copyItem := item.DeepCopyObject().(client.Object)
err = c.Get(ctx, client.ObjectKeyFromObject(item), copyItem)
if err != nil {
return err
}

copyItem.SetFinalizers(nil)
if err := c.Update(ctx, copyItem); err != nil {
if apierrors.IsConflict(err) {
logger.Sugar().Warnf("An conflict occurred when updating the status of Spiderpool resource %s: %s, %v", resourceName, copyItem.GetName(), err)
}
return err
}
return nil
})

if err != nil {
logger.Sugar().Errorf("failed to clean the finalizers of %s: %v, %v", resourceName, item.GetName(), err)
jobResult = multierror.Append(jobResult, err)
continue
}
logger.Sugar().Infof("succeeded to clean the finalizers of %s %v", resourceName, item.GetName())
}

err = c.Delete(ctx, item)
if err != nil {
if apierrors.IsNotFound(err) {
Expand Down

0 comments on commit e4b948e

Please sign in to comment.