github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 07:27:21 +00:00
Code Issues Projects Releases Wiki Activity

Pass versioner to cacher.

Browse Source
This commit is contained in:
Wojciech Tyczynski
2015-11-05 16:04:42 +01:00
parent 0d9f2dc5fd
commit a5a8717539
49 changed files with 218 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/registry/experimental/controller/etcd/etcd.go
View File

@@ -27,6 +27,7 @@ import (
"k8s.io/kubernetes/pkg/registry/controller"
"k8s.io/kubernetes/pkg/registry/controller/etcd"
"k8s.io/kubernetes/pkg/registry/generic"
"k8s.io/kubernetes/pkg/apis/extensions"
)
@@ -37,9 +38,9 @@ type ContainerStorage struct {
Scale *ScaleREST
}
func NewStorage(s storage.Interface, storageFactory storage.StorageFactory) ContainerStorage {
func NewStorage(s storage.Interface, storageDecorator generic.StorageDecorator) ContainerStorage {
// scale does not set status, only updates spec so we ignore the status
controllerREST, _ := etcd.NewREST(s, storageFactory)
controllerREST, _ := etcd.NewREST(s, storageDecorator)
rcRegistry := controller.NewRegistry(controllerREST)
return ContainerStorage{

4
pkg/registry/experimental/controller/etcd/etcd_test.go
View File

@@ -22,9 +22,9 @@ import (
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/testapi"
"k8s.io/kubernetes/pkg/apis/extensions"
"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"
"k8s.io/kubernetes/pkg/util"
@@ -32,7 +32,7 @@ import (
func newStorage(t *testing.T) (*ScaleREST, *tools.FakeEtcdClient) {
etcdStorage, fakeClient := registrytest.NewEtcdStorage(t, "")
return NewStorage(etcdStorage, storage.NoDecoration).Scale, fakeClient
return NewStorage(etcdStorage, generic.UndecoratedStorage).Scale, fakeClient
}
var validPodTemplate = api.PodTemplate{