Merge pull request #811 from wansir/refactor-openpitrix

fix: filter app template in built-in repo

pkg/apiserver/openpitrix/categories.go

@@ -156,7 +156,7 @@ func ListCategories(req *restful.Request, resp *restful.Response) {
 	if statistics {
 		for _, item := range result.Items {
 			if category, ok := item.(*openpitrix.Category); ok {
-				statisticsResult, err := openpitrix.ListApps(&params.Conditions{Match: map[string]string{"category_id": category.CategoryID, "status": "active"}}, "", false, 0, 0)
+				statisticsResult, err := openpitrix.ListApps(&params.Conditions{Match: map[string]string{"category_id": category.CategoryID, "status": openpitrix.StatusActive, "repo": openpitrix.BuiltinRepoId}}, "", false, 0, 0)
 				if err != nil {
 					klog.Errorln(err)
 					resp.WriteHeaderAndEntity(http.StatusInternalServerError, errors.Wrap(err))

pkg/controller/namespace/namespace_controller.go

@@ -405,6 +405,7 @@ func (r *ReconcileNamespace) checkAndCreateRuntime(namespace *corev1.Namespace)
 		kubesphereRuntimeCredentialId = resp.GetRuntimeCredentialId().GetValue()
 	}
 
+	// TODO runtime id is invalid when recreate runtime
 	runtimeId, err := openPitrixClient.Runtime().CreateRuntime(openpitrix.SystemContext(), &pb.CreateRuntimeRequest{
 		Name:                &wrappers.StringValue{Value: namespace.Name},
 		RuntimeCredentialId: &wrappers.StringValue{Value: kubesphereRuntimeCredentialId},

pkg/models/openpitrix/apps.go

@@ -32,6 +32,11 @@ import (
 	"strings"
 )
 
+const (
+	BuiltinRepoId = "repo-helm"
+	StatusActive  = "active"
+)
+
 func ListApps(conditions *params.Conditions, orderBy string, reverse bool, limit, offset int) (*models.PageableResponse, error) {
 	client, err := cs.ClientSets().OpenPitrix()
 	if err != nil {
@@ -53,7 +58,12 @@ func ListApps(conditions *params.Conditions, orderBy string, reverse bool, limit
 		describeAppsRequest.CategoryId = strings.Split(categoryId, "|")
 	}
 	if repoId := conditions.Match["repo"]; repoId != "" {
-		describeAppsRequest.RepoId = strings.Split(repoId, "|")
+		// hard code, app template in built-in repo has no repo_id attribute
+		if repoId == BuiltinRepoId {
+			describeAppsRequest.RepoId = []string{"\u0000"}
+		} else {
+			describeAppsRequest.RepoId = strings.Split(repoId, "|")
+		}
 	}
 	if status := conditions.Match["status"]; status != "" {
 		describeAppsRequest.Status = strings.Split(status, "|")