Merge pull request #1181 from wansir/workspace-controller

fix: do not delete devops project when devops is not enabled
This commit is contained in:
KubeSphere CI Bot
2019-10-25 11:40:54 +08:00
committed by GitHub

View File

@@ -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")