Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Unify secret and configmap triggers in cacher #80521

Merged
merged 2 commits into from Jul 30, 2019
Merged

Unify secret and configmap triggers in cacher #80521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
117a0e5
Unify secret and configmap triggers
wojtek-t Jul 24, 2019
467f5e9
Fix some golint failures
wojtek-t Jul 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions pkg/registry/core/configmap/BUILD
View file
Open in desktop
Expand Up @@ -17,9 +17,13 @@ go_library(
"//pkg/api/legacyscheme:go_default_library",
"//pkg/apis/core:go_default_library",
"//pkg/apis/core/validation:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/fields:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/labels:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/validation/field:go_default_library",
"//staging/src/k8s.io/apiserver/pkg/registry/generic:go_default_library",
"//staging/src/k8s.io/apiserver/pkg/registry/rest:go_default_library",
"//staging/src/k8s.io/apiserver/pkg/storage:go_default_library",
"//staging/src/k8s.io/apiserver/pkg/storage/names:go_default_library",
],
)
Expand Down
1 change: 1 addition & 0 deletions pkg/registry/core/configmap/storage/BUILD
View file
Open in desktop
Expand Up @@ -37,6 +37,7 @@ go_library(
"//staging/src/k8s.io/apiserver/pkg/registry/generic:go_default_library",
"//staging/src/k8s.io/apiserver/pkg/registry/generic/registry:go_default_library",
"//staging/src/k8s.io/apiserver/pkg/registry/rest:go_default_library",
"//staging/src/k8s.io/apiserver/pkg/storage:go_default_library",
],
)

Expand Down
7 changes: 6 additions & 1 deletion pkg/registry/core/configmap/storage/storage.go
View file
Open in desktop
Expand Up @@ -21,6 +21,7 @@ import (
"k8s.io/apiserver/pkg/registry/generic"
genericregistry "k8s.io/apiserver/pkg/registry/generic/registry"
"k8s.io/apiserver/pkg/registry/rest"
"k8s.io/apiserver/pkg/storage"
api "k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/printers"
printersinternal "k8s.io/kubernetes/pkg/printers/internalversion"
Expand All @@ -46,7 +47,11 @@ func NewREST(optsGetter generic.RESTOptionsGetter) *REST {

TableConvertor: printerstorage.TableConvertor{TableGenerator: printers.NewTableGenerator().With(printersinternal.AddHandlers)},
}
options := &generic.StoreOptions{RESTOptions: optsGetter}
options := &generic.StoreOptions{
RESTOptions: optsGetter,
AttrFunc: configmap.GetAttrs,
TriggerFunc: map[string]storage.IndexerFunc{"metadata.name": configmap.NameTriggerFunc},
}
if err := store.CompleteWithOptions(options); err != nil {
panic(err) // TODO: Propagate error up
}
Expand Down
34 changes: 34 additions & 0 deletions pkg/registry/core/configmap/strategy.go
View file
Open in desktop
Expand Up @@ -18,10 +18,15 @@ package configmap

import (
"context"
"fmt"

"k8s.io/apimachinery/pkg/fields"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/validation/field"
"k8s.io/apiserver/pkg/registry/generic"
"k8s.io/apiserver/pkg/registry/rest"
pkgstorage "k8s.io/apiserver/pkg/storage"
"k8s.io/apiserver/pkg/storage/names"
"k8s.io/kubernetes/pkg/api/legacyscheme"
api "k8s.io/kubernetes/pkg/apis/core"
Expand Down Expand Up @@ -80,3 +85,32 @@ func (strategy) ValidateUpdate(ctx context.Context, newObj, oldObj runtime.Objec

return validation.ValidateConfigMapUpdate(newCfg, oldCfg)
}

// GetAttrs returns labels and fields of a given object for filtering purposes.
func GetAttrs(obj runtime.Object) (labels.Set, fields.Set, error) {
configMap, ok := obj.(*api.ConfigMap)
if !ok {
return nil, nil, fmt.Errorf("not a configmap")
}
return labels.Set(configMap.Labels), SelectableFields(configMap), nil
}

// Matcher returns a generic matcher for a given label and field selector.
func Matcher(label labels.Selector, field fields.Selector) pkgstorage.SelectionPredicate {
return pkgstorage.SelectionPredicate{
Label: label,
Field: field,
GetAttrs: GetAttrs,
IndexFields: []string{"metadata.name"},
}
}

// NameTriggerFunc returns value metadata.namespace of given object.
func NameTriggerFunc(obj runtime.Object) string {
return obj.(*api.ConfigMap).ObjectMeta.Name
}

// SelectableFields returns a field set that can be used for filter selection
func SelectableFields(obj *api.ConfigMap) fields.Set {
return generic.ObjectMetaFieldsSet(&obj.ObjectMeta, true)
}
2 changes: 1 addition & 1 deletion pkg/registry/core/node/storage/storage.go
View file
Open in desktop
Expand Up @@ -93,7 +93,7 @@ func NewStorage(optsGetter generic.RESTOptionsGetter, kubeletClientConfig client
options := &generic.StoreOptions{
RESTOptions: optsGetter,
AttrFunc: node.GetAttrs,
TriggerFunc: map[string]storage.IndexerFunc{"metadata.name": node.NodeNameTriggerFunc},
TriggerFunc: map[string]storage.IndexerFunc{"metadata.name": node.NameTriggerFunc},
}
if err := store.CompleteWithOptions(options); err != nil {
return nil, err
Expand Down
3 changes: 2 additions & 1 deletion pkg/registry/core/node/strategy.go
View file
Open in desktop
Expand Up @@ -225,7 +225,8 @@ func MatchNode(label labels.Selector, field fields.Selector) pkgstorage.Selectio
}
}

func NodeNameTriggerFunc(obj runtime.Object) string {
// NameTriggerFunc returns value metadata.namespace of given object.
func NameTriggerFunc(obj runtime.Object) string {
return obj.(*api.Node).ObjectMeta.Name
}

Expand Down
1 change: 1 addition & 0 deletions pkg/registry/core/pod/strategy.go
View file
Open in desktop
Expand Up @@ -203,6 +203,7 @@ func MatchPod(label labels.Selector, field fields.Selector) storage.SelectionPre
}
}

// NodeNameTriggerFunc returns value spec.nodename of given object.
func NodeNameTriggerFunc(obj runtime.Object) string {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missed this one? Rename to NameTriggerFunc for consistency?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Left this on purpose - because it's for Pod object, for which NameTriggerFunc would suggest it's pods name (as it's the case for all other triggers), whereas we are looking into Spec.NodeName` field.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Gotcha.

return obj.(*api.Pod).Spec.NodeName
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/registry/core/secret/storage/storage.go
View file
Open in desktop
Expand Up @@ -50,7 +50,7 @@ func NewREST(optsGetter generic.RESTOptionsGetter) *REST {
options := &generic.StoreOptions{
RESTOptions: optsGetter,
AttrFunc: secret.GetAttrs,
TriggerFunc: map[string]storage.IndexerFunc{"metadata.name": secret.SecretNameTriggerFunc},
TriggerFunc: map[string]storage.IndexerFunc{"metadata.name": secret.NameTriggerFunc},
}
if err := store.CompleteWithOptions(options); err != nil {
panic(err) // TODO: Propagate error up
Expand Down
3 changes: 2 additions & 1 deletion pkg/registry/core/secret/strategy.go
View file
Open in desktop
Expand Up @@ -116,7 +116,8 @@ func Matcher(label labels.Selector, field fields.Selector) pkgstorage.SelectionP
}
}

func SecretNameTriggerFunc(obj runtime.Object) string {
// NameTriggerFunc returns value metadata.namespace of given object.
func NameTriggerFunc(obj runtime.Object) string {
return obj.(*api.Secret).ObjectMeta.Name
}

Expand Down