mirror of
https://github.com/k3s-io/kubernetes.git
synced 2026-01-05 23:47:50 +00:00
Pass versioner to cacher.
This commit is contained in:
@@ -48,12 +48,12 @@ type FinalizeREST struct {
|
||||
}
|
||||
|
||||
// NewREST returns a RESTStorage object that will work against namespaces.
|
||||
func NewREST(s storage.Interface, storageFactory storage.StorageFactory) (*REST, *StatusREST, *FinalizeREST) {
|
||||
func NewREST(s storage.Interface, storageDecorator generic.StorageDecorator) (*REST, *StatusREST, *FinalizeREST) {
|
||||
prefix := "/namespaces"
|
||||
|
||||
newListFunc := func() runtime.Object { return &api.NamespaceList{} }
|
||||
storageInterface := storageFactory(
|
||||
s, 100, nil, &api.Namespace{}, prefix, true, newListFunc)
|
||||
storageInterface := storageDecorator(
|
||||
s, 100, &api.Namespace{}, prefix, true, newListFunc)
|
||||
|
||||
store := &etcdgeneric.Etcd{
|
||||
NewFunc: func() runtime.Object { return &api.Namespace{} },
|
||||
|
||||
@@ -24,16 +24,16 @@ import (
|
||||
"k8s.io/kubernetes/pkg/api/unversioned"
|
||||
"k8s.io/kubernetes/pkg/fields"
|
||||
"k8s.io/kubernetes/pkg/labels"
|
||||
"k8s.io/kubernetes/pkg/registry/generic"
|
||||
"k8s.io/kubernetes/pkg/registry/registrytest"
|
||||
"k8s.io/kubernetes/pkg/runtime"
|
||||
"k8s.io/kubernetes/pkg/storage"
|
||||
"k8s.io/kubernetes/pkg/storage/etcd/etcdtest"
|
||||
"k8s.io/kubernetes/pkg/tools"
|
||||
)
|
||||
|
||||
func newStorage(t *testing.T) (*REST, *tools.FakeEtcdClient) {
|
||||
etcdStorage, fakeClient := registrytest.NewEtcdStorage(t, "")
|
||||
namespaceStorage, _, _ := NewREST(etcdStorage, storage.NoDecoration)
|
||||
namespaceStorage, _, _ := NewREST(etcdStorage, generic.UndecoratedStorage)
|
||||
return namespaceStorage, fakeClient
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user