Merge pull request #828 from mrlihanbo/delete-ns-bugfix

ignore not found error when deleting resource

pkg/controllers/cluster/cluster_controller.go

@@ -161,7 +161,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
 	}

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
 			}

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
 	}