From fed776f419dcfba59abea3de046f2c46ce5baaa9 Mon Sep 17 00:00:00 2001 From: lihanbo Date: Mon, 18 Oct 2021 19:34:30 +0800 Subject: [PATCH] ignore not found err when delete resource Signed-off-by: lihanbo --- pkg/controllers/cluster/cluster_controller.go | 2 +- pkg/controllers/hpa/hpa_controller.go | 2 +- pkg/controllers/mcs/service_import_controller.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/controllers/cluster/cluster_controller.go b/pkg/controllers/cluster/cluster_controller.go index c5838f553..e9cc13e65 100644 --- a/pkg/controllers/cluster/cluster_controller.go +++ b/pkg/controllers/cluster/cluster_controller.go @@ -157,7 +157,7 @@ func (c *Controller) removeExecutionSpace(cluster *clusterv1alpha1.Cluster) erro Name: executionSpaceName, }, } - if err := c.Client.Delete(context.TODO(), executionSpaceObj); err != nil { + if err := c.Client.Delete(context.TODO(), executionSpaceObj); err != nil && !apierrors.IsNotFound(err) { klog.Errorf("Error while deleting namespace %s: %s", executionSpaceName, err) return err } diff --git a/pkg/controllers/hpa/hpa_controller.go b/pkg/controllers/hpa/hpa_controller.go index 093bbb16b..5a5c9033d 100644 --- a/pkg/controllers/hpa/hpa_controller.go +++ b/pkg/controllers/hpa/hpa_controller.go @@ -169,7 +169,7 @@ func (c *HorizontalPodAutoscalerController) deleteWorks(workName string) error { for i := range workList.Items { work := &workList.Items[i] if workName == work.Name { - if err := c.Client.Delete(context.TODO(), work); err != nil { + if err := c.Client.Delete(context.TODO(), work); err != nil && !apierrors.IsNotFound(err) { klog.Errorf("Failed to delete work %s/%s: %v.", work.Namespace, work.Name, err) return err } diff --git a/pkg/controllers/mcs/service_import_controller.go b/pkg/controllers/mcs/service_import_controller.go index e4a1a0aa8..089cc146d 100644 --- a/pkg/controllers/mcs/service_import_controller.go +++ b/pkg/controllers/mcs/service_import_controller.go @@ -66,7 +66,7 @@ func (c *ServiceImportController) deleteDerivedService(svcImport types.Namespace } err = c.Client.Delete(context.TODO(), derivedSvc) - if err != nil { + if err != nil && !apierrors.IsNotFound(err) { klog.Errorf("Delete derived service(%s) failed, Error: %v", derivedSvcNamespacedName, err) return controllerruntime.Result{Requeue: true}, err }