From dfe61db7a5f1d3278e4f4a250728d8097b16cc44 Mon Sep 17 00:00:00 2001 From: Todd Treece <360020+toddtreece@users.noreply.github.com> Date: Mon, 25 Mar 2024 16:45:32 -0400 Subject: [PATCH] Scopes: Add type filter (#84866) Co-authored-by: Kyle Brandt --- pkg/registry/apis/scope/register.go | 18 +++++++++++++++ pkg/registry/apis/scope/storage.go | 35 +++++++++++++++++++++++++---- 2 files changed, 49 insertions(+), 4 deletions(-) diff --git a/pkg/registry/apis/scope/register.go b/pkg/registry/apis/scope/register.go index f55454a11ed..f5f1a64936d 100644 --- a/pkg/registry/apis/scope/register.go +++ b/pkg/registry/apis/scope/register.go @@ -1,6 +1,8 @@ package scope import ( + "fmt" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" @@ -49,6 +51,22 @@ func (b *ScopeAPIBuilder) InstallSchema(scheme *runtime.Scheme) error { return err } + err = scheme.AddFieldLabelConversionFunc( + scope.ScopeResourceInfo.GroupVersionKind(), + func(label, value string) (string, string, error) { + fieldSet := SelectableFields(&scope.Scope{}) + for key := range fieldSet { + if label == key { + return label, value, nil + } + } + return "", "", fmt.Errorf("field label not supported for %s: %s", scope.ScopeResourceInfo.GroupVersionKind(), label) + }, + ) + if err != nil { + return err + } + // Link this version to the internal representation. // This is used for server-side-apply (PATCH), and avoids the error: // "no kind is registered for the type" diff --git a/pkg/registry/apis/scope/storage.go b/pkg/registry/apis/scope/storage.go index abd88de717a..d033892994a 100644 --- a/pkg/registry/apis/scope/storage.go +++ b/pkg/registry/apis/scope/storage.go @@ -5,6 +5,8 @@ import ( "time" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/fields" + "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apiserver/pkg/registry/generic" genericregistry "k8s.io/apiserver/pkg/registry/generic/registry" @@ -13,6 +15,7 @@ import ( grafanaregistry "github.com/grafana/grafana/pkg/apiserver/registry/generic" grafanarest "github.com/grafana/grafana/pkg/apiserver/rest" "github.com/grafana/grafana/pkg/services/apiserver/utils" + apistore "k8s.io/apiserver/pkg/storage" ) var _ grafanarest.Storage = (*storage)(nil) @@ -28,7 +31,7 @@ func newScopeStorage(scheme *runtime.Scheme, optsGetter generic.RESTOptionsGette store := &genericregistry.Store{ NewFunc: resourceInfo.NewFunc, NewListFunc: resourceInfo.NewListFunc, - PredicateFunc: grafanaregistry.Matcher, + PredicateFunc: Matcher, DefaultQualifiedResource: resourceInfo.GroupResource(), SingularQualifiedResource: resourceInfo.SingularGroupResource(), TableConvertor: utils.NewTableConverter( @@ -52,7 +55,7 @@ func newScopeStorage(scheme *runtime.Scheme, optsGetter generic.RESTOptionsGette UpdateStrategy: strategy, DeleteStrategy: strategy, } - options := &generic.StoreOptions{RESTOptions: optsGetter, AttrFunc: grafanaregistry.GetAttrs} + options := &generic.StoreOptions{RESTOptions: optsGetter, AttrFunc: GetAttrs} if err := store.CompleteWithOptions(options); err != nil { return nil, err } @@ -66,7 +69,7 @@ func newScopeDashboardStorage(scheme *runtime.Scheme, optsGetter generic.RESTOpt store := &genericregistry.Store{ NewFunc: resourceInfo.NewFunc, NewListFunc: resourceInfo.NewListFunc, - PredicateFunc: grafanaregistry.Matcher, + PredicateFunc: Matcher, DefaultQualifiedResource: resourceInfo.GroupResource(), SingularQualifiedResource: resourceInfo.SingularGroupResource(), TableConvertor: utils.NewTableConverter( @@ -90,9 +93,33 @@ func newScopeDashboardStorage(scheme *runtime.Scheme, optsGetter generic.RESTOpt UpdateStrategy: strategy, DeleteStrategy: strategy, } - options := &generic.StoreOptions{RESTOptions: optsGetter, AttrFunc: grafanaregistry.GetAttrs} + options := &generic.StoreOptions{RESTOptions: optsGetter, AttrFunc: GetAttrs} if err := store.CompleteWithOptions(options); err != nil { return nil, err } return &storage{Store: store}, nil } + +func GetAttrs(obj runtime.Object) (labels.Set, fields.Set, error) { + s, ok := obj.(*scope.Scope) + if !ok { + return nil, nil, fmt.Errorf("not a scope") + } + + return labels.Set(s.Labels), SelectableFields(s), nil +} + +// Matcher returns a generic.SelectionPredicate that matches on label and field selectors. +func Matcher(label labels.Selector, field fields.Selector) apistore.SelectionPredicate { + return apistore.SelectionPredicate{ + Label: label, + Field: field, + GetAttrs: GetAttrs, + } +} + +func SelectableFields(obj *scope.Scope) fields.Set { + return generic.MergeFieldsSets(generic.ObjectMetaFieldsSet(&obj.ObjectMeta, false), fields.Set{ + "spec.type": obj.Spec.Type, + }) +}