From 34e15c2bdc6011bb5b1a48f6ef1cab573755268e Mon Sep 17 00:00:00 2001 From: hongming Date: Fri, 25 Oct 2019 02:25:01 +0800 Subject: [PATCH] fix: do not delete devops project when devops is not enabled Signed-off-by: hongming --- pkg/controller/workspace/workspace_controller.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkg/controller/workspace/workspace_controller.go b/pkg/controller/workspace/workspace_controller.go index d4379d723..581b6e8be 100644 --- a/pkg/controller/workspace/workspace_controller.go +++ b/pkg/controller/workspace/workspace_controller.go @@ -324,6 +324,15 @@ func (r *ReconcileWorkspace) deleteGroup(instance *tenantv1alpha1.Workspace) err } func (r *ReconcileWorkspace) deleteDevOpsProjects(instance *tenantv1alpha1.Workspace) error { + if _, err := cs.ClientSets().Devops(); err != nil { + // skip if devops is not enabled + if _, notEnabled := err.(cs.ClientSetNotEnabledError); notEnabled { + return nil + } else { + log.Error(err, "") + return err + } + } var wg sync.WaitGroup log.Info("Delete DevOps Projects")