diff --git a/pkg/apiserver/resources/resources.go b/pkg/apiserver/resources/resources.go index aa89dd5d1..484c6c5cc 100644 --- a/pkg/apiserver/resources/resources.go +++ b/pkg/apiserver/resources/resources.go @@ -34,15 +34,10 @@ func ListResources(req *restful.Request, resp *restful.Response) { namespace := req.PathParameter("namespace") resourceName := req.PathParameter("resources") conditions, err := params.ParseConditions(req.QueryParameter(params.ConditionsParam)) - orderBy := req.QueryParameter(params.OrderByParam) + orderBy := params.GetStringValueWithDefault(req, params.OrderByParam, resources.CreateTime) limit, offset := params.ParsePaging(req.QueryParameter(params.PagingParam)) reverse := params.ParseReverse(req) - if orderBy == "" { - orderBy = resources.CreateTime - reverse = true - } - if err != nil { resp.WriteHeaderAndEntity(http.StatusBadRequest, errors.Wrap(err)) return diff --git a/pkg/server/params/params.go b/pkg/server/params/params.go index 1a192db1c..83ace6438 100644 --- a/pkg/server/params/params.go +++ b/pkg/server/params/params.go @@ -89,3 +89,11 @@ type Conditions struct { Match map[string]string Fuzzy map[string]string } + +func GetStringValueWithDefault(req *restful.Request, name string, dv string) string { + v := req.QueryParameter(name) + if v == "" { + v = dv + } + return v +}