Skip to content
This repository was archived by the owner on Feb 8, 2021. It is now read-only.

Commit 24b4286

Browse files
author
Timothy St. Clair
committed
In preparation for new storage backends renaming generic registry store
1 parent 9db4559 commit 24b4286

File tree

62 files changed

+374
-375
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+374
-375
lines changed

‎contrib/mesos/pkg/scheduler/podtask/leaky.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ package podtask
2020

2121
import (
2222
"k8s.io/kubernetes/pkg/api"
23-
"k8s.io/kubernetes/pkg/registry/generic/etcd"
23+
"k8s.io/kubernetes/pkg/registry/generic/registry"
2424
)
2525

2626
// makePodKey constructs etcd paths to pod items enforcing namespace rules.
2727
func MakePodKey(ctx api.Context, id string) (string, error) {
28-
return etcd.NamespaceKeyFunc(ctx, PodPath, id)
28+
return registry.NamespaceKeyFunc(ctx, PodPath, id)
2929
}

‎examples/apiserver/rest/reststorage.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ import (
2222
"k8s.io/kubernetes/pkg/fields"
2323
"k8s.io/kubernetes/pkg/labels"
2424
"k8s.io/kubernetes/pkg/registry/generic"
25-
etcdgeneric "k8s.io/kubernetes/pkg/registry/generic/etcd"
25+
"k8s.io/kubernetes/pkg/registry/generic/registry"
2626
"k8s.io/kubernetes/pkg/runtime"
2727
"k8s.io/kubernetes/pkg/storage"
2828
)
2929

3030
type REST struct {
31-
*etcdgeneric.Etcd
31+
*registry.Store
3232
}
3333

3434
// NewREST returns a RESTStorage object that will work with testtype.
@@ -39,19 +39,19 @@ func NewREST(s storage.Interface, storageDecorator generic.StorageDecorator) *RE
3939
strategy := &NotNamespaceScoped{}
4040
storageInterface := storageDecorator(
4141
s, 100, &testgroup.TestType{}, prefix, strategy, newListFunc)
42-
store := &etcdgeneric.Etcd{
42+
store := &registry.Store{
4343
NewFunc: func() runtime.Object { return &testgroup.TestType{} },
4444
// NewListFunc returns an object capable of storing results of an etcd list.
4545
NewListFunc: newListFunc,
4646
// Produces a path that etcd understands, to the root of the resource
4747
// by combining the namespace in the context with the given prefix.
4848
KeyRootFunc: func(ctx api.Context) string {
49-
return etcdgeneric.NamespaceKeyRootFunc(ctx, prefix)
49+
return registry.NamespaceKeyRootFunc(ctx, prefix)
5050
},
5151
// Produces a path that etcd understands, to the resource by combining
5252
// the namespace in the context with the given prefix.
5353
KeyFunc: func(ctx api.Context, name string) (string, error) {
54-
return etcdgeneric.NamespaceKeyFunc(ctx, prefix, name)
54+
return registry.NamespaceKeyFunc(ctx, prefix, name)
5555
},
5656
// Retrieve the name field of the resource.
5757
ObjectNameFunc: func(obj runtime.Object) (string, error) {

‎pkg/genericapiserver/genericapiserver.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ import (
4040
"k8s.io/kubernetes/pkg/auth/authorizer"
4141
"k8s.io/kubernetes/pkg/auth/handlers"
4242
"k8s.io/kubernetes/pkg/registry/generic"
43-
genericetcd "k8s.io/kubernetes/pkg/registry/generic/etcd"
43+
"k8s.io/kubernetes/pkg/registry/generic/registry"
4444
ipallocator "k8s.io/kubernetes/pkg/registry/service/ipallocator"
4545
"k8s.io/kubernetes/pkg/runtime"
4646
"k8s.io/kubernetes/pkg/ui"
@@ -246,7 +246,7 @@ type GenericAPIServer struct {
246246

247247
func (s *GenericAPIServer) StorageDecorator() generic.StorageDecorator {
248248
if s.enableWatchCache {
249-
return genericetcd.StorageWithCacher
249+
return registry.StorageWithCacher
250250
}
251251
return generic.UndecoratedStorage
252252
}

‎pkg/registry/configmap/etcd/etcd.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ import (
2222
"k8s.io/kubernetes/pkg/registry/generic"
2323
"k8s.io/kubernetes/pkg/runtime"
2424

25-
etcdgeneric "k8s.io/kubernetes/pkg/registry/generic/etcd"
25+
"k8s.io/kubernetes/pkg/registry/generic/registry"
2626
)
2727

2828
// REST implements a RESTStorage for ConfigMap against etcd
2929
type REST struct {
30-
*etcdgeneric.Etcd
30+
*registry.Store
3131
}
3232

3333
// NewREST returns a RESTStorage object that will work with ConfigMap objects.
@@ -38,7 +38,7 @@ func NewREST(opts generic.RESTOptions) *REST {
3838
storageInterface := opts.Decorator(
3939
opts.Storage, 100, &api.ConfigMap{}, prefix, configmap.Strategy, newListFunc)
4040

41-
store := &etcdgeneric.Etcd{
41+
store := &registry.Store{
4242
NewFunc: func() runtime.Object {
4343
return &api.ConfigMap{}
4444
},
@@ -49,13 +49,13 @@ func NewREST(opts generic.RESTOptions) *REST {
4949
// Produces a path that etcd understands, to the root of the resource
5050
// by combining the namespace in the context with the given prefix.
5151
KeyRootFunc: func(ctx api.Context) string {
52-
return etcdgeneric.NamespaceKeyRootFunc(ctx, prefix)
52+
return registry.NamespaceKeyRootFunc(ctx, prefix)
5353
},
5454

5555
// Produces a path that etcd understands, to the resource by combining
5656
// the namespace in the context with the given prefix
5757
KeyFunc: func(ctx api.Context, name string) (string, error) {
58-
return etcdgeneric.NamespaceKeyFunc(ctx, prefix, name)
58+
return registry.NamespaceKeyFunc(ctx, prefix, name)
5959
},
6060

6161
// Retrieves the name field of a ConfigMap object.

‎pkg/registry/configmap/etcd/etcd_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ func validNewConfigMap() *api.ConfigMap {
5353
func TestCreate(t *testing.T) {
5454
storage, server := newStorage(t)
5555
defer server.Terminate(t)
56-
test := registrytest.New(t, storage.Etcd)
56+
test := registrytest.New(t, storage.Store)
5757

5858
validConfigMap := validNewConfigMap()
5959
validConfigMap.ObjectMeta = api.ObjectMeta{
@@ -80,7 +80,7 @@ func TestCreate(t *testing.T) {
8080
func TestUpdate(t *testing.T) {
8181
storage, server := newStorage(t)
8282
defer server.Terminate(t)
83-
test := registrytest.New(t, storage.Etcd)
83+
test := registrytest.New(t, storage.Store)
8484
test.TestUpdate(
8585
// valid
8686
validNewConfigMap(),
@@ -102,28 +102,28 @@ func TestUpdate(t *testing.T) {
102102
func TestDelete(t *testing.T) {
103103
storage, server := newStorage(t)
104104
defer server.Terminate(t)
105-
test := registrytest.New(t, storage.Etcd)
105+
test := registrytest.New(t, storage.Store)
106106
test.TestDelete(validNewConfigMap())
107107
}
108108

109109
func TestGet(t *testing.T) {
110110
storage, server := newStorage(t)
111111
defer server.Terminate(t)
112-
test := registrytest.New(t, storage.Etcd)
112+
test := registrytest.New(t, storage.Store)
113113
test.TestGet(validNewConfigMap())
114114
}
115115

116116
func TestList(t *testing.T) {
117117
storage, server := newStorage(t)
118118
defer server.Terminate(t)
119-
test := registrytest.New(t, storage.Etcd)
119+
test := registrytest.New(t, storage.Store)
120120
test.TestList(validNewConfigMap())
121121
}
122122

123123
func TestWatch(t *testing.T) {
124124
storage, server := newStorage(t)
125125
defer server.Terminate(t)
126-
test := registrytest.New(t, storage.Etcd)
126+
test := registrytest.New(t, storage.Store)
127127
test.TestWatch(
128128
validNewConfigMap(),
129129
// matching labels

‎pkg/registry/controller/etcd/etcd.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import (
3131
"k8s.io/kubernetes/pkg/registry/cachesize"
3232
"k8s.io/kubernetes/pkg/registry/controller"
3333
"k8s.io/kubernetes/pkg/registry/generic"
34-
etcdgeneric "k8s.io/kubernetes/pkg/registry/generic/etcd"
34+
"k8s.io/kubernetes/pkg/registry/generic/registry"
3535
"k8s.io/kubernetes/pkg/runtime"
3636
)
3737

@@ -54,7 +54,7 @@ func NewStorage(opts generic.RESTOptions) ControllerStorage {
5454
}
5555

5656
type REST struct {
57-
*etcdgeneric.Etcd
57+
*registry.Store
5858
}
5959

6060
// NewREST returns a RESTStorage object that will work against replication controllers.
@@ -65,20 +65,20 @@ func NewREST(opts generic.RESTOptions) (*REST, *StatusREST) {
6565
storageInterface := opts.Decorator(
6666
opts.Storage, cachesize.GetWatchCacheSizeByResource(cachesize.Controllers), &api.ReplicationController{}, prefix, controller.Strategy, newListFunc)
6767

68-
store := &etcdgeneric.Etcd{
68+
store := &registry.Store{
6969
NewFunc: func() runtime.Object { return &api.ReplicationController{} },
7070

7171
// NewListFunc returns an object capable of storing results of an etcd list.
7272
NewListFunc: newListFunc,
7373
// Produces a path that etcd understands, to the root of the resource
7474
// by combining the namespace in the context with the given prefix
7575
KeyRootFunc: func(ctx api.Context) string {
76-
return etcdgeneric.NamespaceKeyRootFunc(ctx, prefix)
76+
return registry.NamespaceKeyRootFunc(ctx, prefix)
7777
},
7878
// Produces a path that etcd understands, to the resource by combining
7979
// the namespace in the context with the given prefix
8080
KeyFunc: func(ctx api.Context, name string) (string, error) {
81-
return etcdgeneric.NamespaceKeyFunc(ctx, prefix, name)
81+
return registry.NamespaceKeyFunc(ctx, prefix, name)
8282
},
8383
// Retrieve the name field of a replication controller
8484
ObjectNameFunc: func(obj runtime.Object) (string, error) {
@@ -109,7 +109,7 @@ func NewREST(opts generic.RESTOptions) (*REST, *StatusREST) {
109109

110110
// StatusREST implements the REST endpoint for changing the status of a replication controller
111111
type StatusREST struct {
112-
store *etcdgeneric.Etcd
112+
store *registry.Store
113113
}
114114

115115
func (r *StatusREST) New() runtime.Object {

‎pkg/registry/controller/etcd/etcd_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ var validController = validNewController()
8787
func TestCreate(t *testing.T) {
8888
storage, server := newStorage(t)
8989
defer server.Terminate(t)
90-
test := registrytest.New(t, storage.Controller.Etcd)
90+
test := registrytest.New(t, storage.Controller.Store)
9191
controller := validNewController()
9292
controller.ObjectMeta = api.ObjectMeta{}
9393
test.TestCreate(
@@ -107,7 +107,7 @@ func TestCreate(t *testing.T) {
107107
func TestUpdate(t *testing.T) {
108108
storage, server := newStorage(t)
109109
defer server.Terminate(t)
110-
test := registrytest.New(t, storage.Controller.Etcd)
110+
test := registrytest.New(t, storage.Controller.Store)
111111
test.TestUpdate(
112112
// valid
113113
validNewController(),
@@ -134,7 +134,7 @@ func TestUpdate(t *testing.T) {
134134
func TestDelete(t *testing.T) {
135135
storage, server := newStorage(t)
136136
defer server.Terminate(t)
137-
test := registrytest.New(t, storage.Controller.Etcd)
137+
test := registrytest.New(t, storage.Controller.Store)
138138
test.TestDelete(validNewController())
139139
}
140140

@@ -191,21 +191,21 @@ func TestGenerationNumber(t *testing.T) {
191191
func TestGet(t *testing.T) {
192192
storage, server := newStorage(t)
193193
defer server.Terminate(t)
194-
test := registrytest.New(t, storage.Controller.Etcd)
194+
test := registrytest.New(t, storage.Controller.Store)
195195
test.TestGet(validNewController())
196196
}
197197

198198
func TestList(t *testing.T) {
199199
storage, server := newStorage(t)
200200
defer server.Terminate(t)
201-
test := registrytest.New(t, storage.Controller.Etcd)
201+
test := registrytest.New(t, storage.Controller.Store)
202202
test.TestList(validNewController())
203203
}
204204

205205
func TestWatch(t *testing.T) {
206206
storage, server := newStorage(t)
207207
defer server.Terminate(t)
208-
test := registrytest.New(t, storage.Controller.Etcd)
208+
test := registrytest.New(t, storage.Controller.Store)
209209
test.TestWatch(
210210
validController,
211211
// matching labels

‎pkg/registry/daemonset/etcd/etcd.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ import (
2424
"k8s.io/kubernetes/pkg/registry/cachesize"
2525
"k8s.io/kubernetes/pkg/registry/daemonset"
2626
"k8s.io/kubernetes/pkg/registry/generic"
27-
etcdgeneric "k8s.io/kubernetes/pkg/registry/generic/etcd"
27+
"k8s.io/kubernetes/pkg/registry/generic/registry"
2828
"k8s.io/kubernetes/pkg/runtime"
2929
)
3030

3131
// rest implements a RESTStorage for DaemonSets against etcd
3232
type REST struct {
33-
*etcdgeneric.Etcd
33+
*registry.Store
3434
}
3535

3636
// NewREST returns a RESTStorage object that will work against DaemonSets.
@@ -41,20 +41,20 @@ func NewREST(opts generic.RESTOptions) (*REST, *StatusREST) {
4141
storageInterface := opts.Decorator(
4242
opts.Storage, cachesize.GetWatchCacheSizeByResource(cachesize.Daemonsets), &extensions.DaemonSet{}, prefix, daemonset.Strategy, newListFunc)
4343

44-
store := &etcdgeneric.Etcd{
44+
store := &registry.Store{
4545
NewFunc: func() runtime.Object { return &extensions.DaemonSet{} },
4646

4747
// NewListFunc returns an object capable of storing results of an etcd list.
4848
NewListFunc: newListFunc,
4949
// Produces a path that etcd understands, to the root of the resource
5050
// by combining the namespace in the context with the given prefix
5151
KeyRootFunc: func(ctx api.Context) string {
52-
return etcdgeneric.NamespaceKeyRootFunc(ctx, prefix)
52+
return registry.NamespaceKeyRootFunc(ctx, prefix)
5353
},
5454
// Produces a path that etcd understands, to the resource by combining
5555
// the namespace in the context with the given prefix
5656
KeyFunc: func(ctx api.Context, name string) (string, error) {
57-
return etcdgeneric.NamespaceKeyFunc(ctx, prefix, name)
57+
return registry.NamespaceKeyFunc(ctx, prefix, name)
5858
},
5959
// Retrieve the name field of a daemon set
6060
ObjectNameFunc: func(obj runtime.Object) (string, error) {
@@ -84,7 +84,7 @@ func NewREST(opts generic.RESTOptions) (*REST, *StatusREST) {
8484

8585
// StatusREST implements the REST endpoint for changing the status of a daemonset
8686
type StatusREST struct {
87-
store *etcdgeneric.Etcd
87+
store *registry.Store
8888
}
8989

9090
func (r *StatusREST) New() runtime.Object {

‎pkg/registry/daemonset/etcd/etcd_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ var validDaemonSet = newValidDaemonSet()
7070
func TestCreate(t *testing.T) {
7171
storage, _, server := newStorage(t)
7272
defer server.Terminate(t)
73-
test := registrytest.New(t, storage.Etcd)
73+
test := registrytest.New(t, storage.Store)
7474
ds := newValidDaemonSet()
7575
ds.ObjectMeta = api.ObjectMeta{}
7676
test.TestCreate(
@@ -96,7 +96,7 @@ func TestCreate(t *testing.T) {
9696
func TestUpdate(t *testing.T) {
9797
storage, _, server := newStorage(t)
9898
defer server.Terminate(t)
99-
test := registrytest.New(t, storage.Etcd)
99+
test := registrytest.New(t, storage.Store)
100100
test.TestUpdate(
101101
// valid
102102
newValidDaemonSet(),
@@ -124,28 +124,28 @@ func TestUpdate(t *testing.T) {
124124
func TestDelete(t *testing.T) {
125125
storage, _, server := newStorage(t)
126126
defer server.Terminate(t)
127-
test := registrytest.New(t, storage.Etcd)
127+
test := registrytest.New(t, storage.Store)
128128
test.TestDelete(newValidDaemonSet())
129129
}
130130

131131
func TestGet(t *testing.T) {
132132
storage, _, server := newStorage(t)
133133
defer server.Terminate(t)
134-
test := registrytest.New(t, storage.Etcd)
134+
test := registrytest.New(t, storage.Store)
135135
test.TestGet(newValidDaemonSet())
136136
}
137137

138138
func TestList(t *testing.T) {
139139
storage, _, server := newStorage(t)
140140
defer server.Terminate(t)
141-
test := registrytest.New(t, storage.Etcd)
141+
test := registrytest.New(t, storage.Store)
142142
test.TestList(newValidDaemonSet())
143143
}
144144

145145
func TestWatch(t *testing.T) {
146146
storage, _, server := newStorage(t)
147147
defer server.Terminate(t)
148-
test := registrytest.New(t, storage.Etcd)
148+
test := registrytest.New(t, storage.Store)
149149
test.TestWatch(
150150
validDaemonSet,
151151
// matching labels

0 commit comments

Comments
 (0)