change api default limit to result max

kubesphere · Sep 25, 2023 · b3b3de9 · b3b3de9
1 parent 1d41269
commit b3b3de9
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/pkg/controllers/inspectresult_controller.go b/pkg/controllers/inspectresult_controller.go
@@ -173,6 +173,7 @@ func (r *InspectResultReconciler) CountLevelNum(resultName string) (map[kubeeyev
 	ComputeLevel(result.Spec.PrometheusResult, levelTotal)
 
 	ComputeLevel(result.Spec.ComponentResult, levelTotal)
+	ComputeLevel(result.Spec.CommandResult, levelTotal)
 
 	return levelTotal, nil
 }
diff --git a/pkg/inspect/nodeinfo_inspect.go b/pkg/inspect/nodeinfo_inspect.go
@@ -159,11 +159,10 @@ func (o *nodeInfoInspect) GetResult(runNodeName string, resultCm *corev1.ConfigM
 		return nil, err
 	}
 
-	for _, item := range nodeInfoResult {
-		item.NodeName = runNodeName
-		resultCr.Spec.NodeInfo = append(resultCr.Spec.NodeInfo, item)
+	for i := range nodeInfoResult {
+		nodeInfoResult[i].NodeName = runNodeName
 	}
-
+	resultCr.Spec.NodeInfo = nodeInfoResult
 	return resultCr, nil
 
 }

diff --git a/pkg/server/query/query.go b/pkg/server/query/query.go
@@ -73,7 +73,7 @@ func ParseQuery(g *gin.Context) *Query {
 func NewQuery() *Query {
 	return &Query{
 		Pagination: &Pagination{
-			Limit:  10,
+			Limit:  0,
 			Offset: 0,
 		},
 		SortBy:        "",
@@ -123,7 +123,7 @@ func ParsePagination(values url.Values) *Pagination {
 	if limit != "" {
 		atoi, err := strconv.Atoi(limit)
 		if err != nil || atoi < 1 {
-			atoi = 10
+			atoi = 0
 		}
 		pagination.Limit = atoi
 	}
@@ -170,7 +170,7 @@ func (p *Pagination) computeIndex(total int) (int, int) {
 	startIndex = p.Offset
 	endIndex = startIndex + p.Limit
 
-	if endIndex > total {
+	if endIndex > total || endIndex == 0 {
 		endIndex = total
 	}
 	if startIndex > total {