admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3195 from LinuxSuRen/fix/devops-project-del

Browse Source 
Fix devops project cannot be deleted due to mess up with finalizer control
This commit is contained in:
KubeSphere CI Bot
2020-12-18 14:03:47 +08:00
committed by GitHub
parent ce9ca401c3 f908aa42f7
commit d814d5db7b
2 changed files with 36 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/simple/client/devops/jenkins/project.go
View File

@@ -20,7 +20,6 @@ import (
"github.com/emicklei/go-restful"
"k8s.io/klog"
"kubesphere.io/kubesphere/pkg/simple/client/devops"
"net/http"
)
type DevOpsProjectRoleResponse struct {
@@ -37,14 +36,12 @@ func (j *Jenkins) CreateDevOpsProject(projectId string) (string, error) {
return projectId, nil
}
func (j *Jenkins) DeleteDevOpsProject(projectId string) error {
_, err := j.DeleteJob(projectId)
if err != nil && devops.GetDevOpsStatusCode(err) != http.StatusNotFound {
klog.Errorf("%+v", err)
func (j *Jenkins) DeleteDevOpsProject(projectId string) (err error) {
_, err = j.DeleteJob(projectId)
if err != nil {
return restful.NewError(devops.GetDevOpsStatusCode(err), err.Error())
}
return nil
return
}
func (j *Jenkins) GetDevOpsProject(projectId string) (string, error) {