diff --git a/pkg/storage/unified/apistore/storage.go b/pkg/storage/unified/apistore/storage.go index c4cd32f244b..9ccab9d2ac7 100644 --- a/pkg/storage/unified/apistore/storage.go +++ b/pkg/storage/unified/apistore/storage.go @@ -13,7 +13,6 @@ import ( "io" "reflect" "strconv" - "strings" apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/meta" @@ -21,7 +20,6 @@ import ( "k8s.io/apimachinery/pkg/conversion" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" - "k8s.io/apimachinery/pkg/selection" "k8s.io/apimachinery/pkg/watch" "k8s.io/apiserver/pkg/storage" "k8s.io/apiserver/pkg/storage/storagebackend" @@ -33,8 +31,6 @@ import ( "github.com/grafana/grafana/pkg/storage/unified/resource" ) -const SortByKey = "grafana.app/sortBy" - var _ storage.Interface = (*Storage)(nil) // Storage implements storage.Interface and stores resources in unified storage @@ -306,28 +302,6 @@ func toListRequest(key string, opts storage.ListOptions) (*resource.ListRequest, for _, r := range requirements { v := r.Key() - // TODO?? sorting in list not supported - if v == SortByKey { - if r.Operator() != selection.Equals { - return nil, predicate, apierrors.NewBadRequest("invalid sort operation // " + r.String()) - } - parts := strings.Split(v, " ") - if len(parts) != 2 { - return nil, predicate, apierrors.NewBadRequest("invalid sort operation // " + r.String()) - } - sort := &resource.Sort{Field: parts[0]} - switch parts[1] { - case "ASC": - sort.Order = resource.Sort_ASC - case "DESC": - sort.Order = resource.Sort_DESC - default: - return nil, predicate, apierrors.NewBadRequest("invalid sort order // " + r.String()) - } - // TODO! Must update the predicate! - continue - } - req.Options.Labels = append(req.Options.Labels, &resource.Requirement{ Key: v, Operator: string(r.Operator()),