diff --git a/pkg/registry/core/rest/storage_core.go b/pkg/registry/core/rest/storage_core.go index 7886ab2ddaf..cdb9af6f4ae 100644 --- a/pkg/registry/core/rest/storage_core.go +++ b/pkg/registry/core/rest/storage_core.go @@ -261,7 +261,7 @@ func (c LegacyRESTStorageProvider) NewLegacyRESTStorage(restOptionsGetter generi serviceIPAllocators[secondaryServiceClusterIPAllocator.IPFamily()] = secondaryServiceClusterIPAllocator } - serviceRESTStorage, serviceStatusStorage, serviceRESTProxy, err := servicestore.NewGenericREST( + serviceRESTStorage, serviceStatusStorage, serviceRESTProxy, err := servicestore.NewREST( restOptionsGetter, serviceClusterIPAllocator.IPFamily(), serviceIPAllocators, diff --git a/pkg/registry/core/service/storage/rest_test.go b/pkg/registry/core/service/storage/rest_test.go index e1bdc3e1997..d03271af12c 100644 --- a/pkg/registry/core/service/storage/rest_test.go +++ b/pkg/registry/core/service/storage/rest_test.go @@ -96,7 +96,7 @@ func NewTestREST(t *testing.T, ipFamilies []api.IPFamily) (*GenericREST, *etcd3t ResourcePrefix: "endpoints", }) - rest, _, _, err := NewGenericREST(restOptions, api.IPv4Protocol, ipAllocators, portAllocator, endpoints, nil, nil) + rest, _, _, err := NewREST(restOptions, api.IPv4Protocol, ipAllocators, portAllocator, endpoints, nil, nil) if err != nil { t.Fatalf("unexpected error from REST storage: %v", err) } diff --git a/pkg/registry/core/service/storage/storage.go b/pkg/registry/core/service/storage/storage.go index 0a9353df990..70f718b0dcc 100644 --- a/pkg/registry/core/service/storage/storage.go +++ b/pkg/registry/core/service/storage/storage.go @@ -78,8 +78,8 @@ var ( _ rest.Redirector = &GenericREST{} ) -// NewGenericREST returns a RESTStorage object that will work against services. -func NewGenericREST( +// NewREST returns a RESTStorage object that will work against services. +func NewREST( optsGetter generic.RESTOptionsGetter, serviceIPFamily api.IPFamily, ipAllocs map[api.IPFamily]ipallocator.Interface, diff --git a/pkg/registry/core/service/storage/storage_test.go b/pkg/registry/core/service/storage/storage_test.go index 4040898d9cf..5bf7a2a0de0 100644 --- a/pkg/registry/core/service/storage/storage_test.go +++ b/pkg/registry/core/service/storage/storage_test.go @@ -154,7 +154,7 @@ func newStorageWithPods(t *testing.T, ipFamilies []api.IPFamily, pods []api.Pod, } } - serviceStorage, statusStorage, _, err := NewGenericREST(restOptions, ipFamilies[0], ipAllocs, portAlloc, endpointsStorage, podStorage.Pod, nil) + serviceStorage, statusStorage, _, err := NewREST(restOptions, ipFamilies[0], ipAllocs, portAlloc, endpointsStorage, podStorage.Pod, nil) if err != nil { t.Fatalf("unexpected error from REST storage: %v", err) }