From 8f40bb2d3e7961fca7e75a527c88b7d07896b803 Mon Sep 17 00:00:00 2001 From: shaowenchen Date: Thu, 14 May 2020 10:01:46 +0800 Subject: [PATCH] fix delete devops failed --- pkg/controller/devopsproject/devopsproject_controller.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkg/controller/devopsproject/devopsproject_controller.go b/pkg/controller/devopsproject/devopsproject_controller.go index 88d08f215..f4538cf46 100644 --- a/pkg/controller/devopsproject/devopsproject_controller.go +++ b/pkg/controller/devopsproject/devopsproject_controller.go @@ -293,7 +293,6 @@ func (c *Controller) syncHandler(key string) error { } else { // Finalizers processing logic if sliceutil.HasString(project.ObjectMeta.Finalizers, devopsv1alpha3.DevOpsProjectFinalizerName) { - _, err := c.devopsClient.GetDevOpsProject(key) if err := c.deleteDevOpsProjectInDevOps(project); err != nil { klog.Error(err, fmt.Sprintf("failed to delete resource %s in devops", key)) return err @@ -315,7 +314,7 @@ func (c *Controller) syncHandler(key string) error { func (c *Controller) deleteDevOpsProjectInDevOps(project *devopsv1alpha3.DevOpsProject) error { - err := c.devopsClient.DeleteDevOpsProject(project.Name) + err := c.devopsClient.DeleteDevOpsProject(project.Status.AdminNamespace) if err != nil { klog.Errorf("error happened while deleting %s, %v", project.Name, err) }