diff --git a/pkg/controller/devopsproject/devopsproject_controller.go b/pkg/controller/devopsproject/devopsproject_controller.go index 9e5840562..88d08f215 100644 --- a/pkg/controller/devopsproject/devopsproject_controller.go +++ b/pkg/controller/devopsproject/devopsproject_controller.go @@ -22,7 +22,6 @@ import ( devopsClient "kubesphere.io/kubesphere/pkg/simple/client/devops" "kubesphere.io/kubesphere/pkg/utils/k8sutil" "kubesphere.io/kubesphere/pkg/utils/sliceutil" - "net/http" "reflect" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" "time" @@ -295,15 +294,9 @@ func (c *Controller) syncHandler(key string) error { // Finalizers processing logic if sliceutil.HasString(project.ObjectMeta.Finalizers, devopsv1alpha3.DevOpsProjectFinalizerName) { _, err := c.devopsClient.GetDevOpsProject(key) - if err != nil && devopsClient.GetDevOpsStatusCode(err) != http.StatusNotFound { - klog.Error(err, fmt.Sprintf("failed to get project %s ", key)) + if err := c.deleteDevOpsProjectInDevOps(project); err != nil { + klog.Error(err, fmt.Sprintf("failed to delete resource %s in devops", key)) return err - } else if err != nil && devopsClient.GetDevOpsStatusCode(err) == http.StatusNotFound { - } else { - if err := c.deleteDevOpsProjectInDevOps(project); err != nil { - klog.Error(err, fmt.Sprintf("failed to delete resource %s in devops", key)) - return err - } } project.ObjectMeta.Finalizers = sliceutil.RemoveString(project.ObjectMeta.Finalizers, func(item string) bool { return item == devopsv1alpha3.DevOpsProjectFinalizerName