mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 11:50:44 +00:00
Svc REST: Remove obviously unused args
This is part of the de-layering conclusion and cleanup. Bridge the old tests into the new REST. This will all be removed soon.
This commit is contained in:
parent
d30ae6a5ab
commit
cf4804643a
@ -275,11 +275,7 @@ func (c LegacyRESTStorageProvider) NewLegacyRESTStorage(restOptionsGetter generi
|
||||
|
||||
serviceRest, serviceRestProxy := servicestore.NewREST(
|
||||
serviceRESTStorage,
|
||||
endpointsStorage,
|
||||
podStorage.Pod,
|
||||
serviceClusterIPAllocator.IPFamily(),
|
||||
serviceIPAllocators,
|
||||
serviceNodePortAllocator,
|
||||
c.ProxyTransport)
|
||||
|
||||
restStorageMap := map[string]rest.Storage{
|
||||
|
@ -46,10 +46,7 @@ import (
|
||||
|
||||
// REST adapts a service registry into apiserver's RESTStorage model.
|
||||
type REST struct {
|
||||
strategy rest.RESTCreateUpdateStrategy
|
||||
services ServiceStorage
|
||||
endpoints EndpointsStorage
|
||||
alloc RESTAllocStuff
|
||||
proxyTransport http.RoundTripper
|
||||
pods rest.Getter
|
||||
}
|
||||
@ -90,25 +87,15 @@ type ServiceStorage interface {
|
||||
// or the strategy.
|
||||
func NewREST(
|
||||
services ServiceStorage,
|
||||
endpoints EndpointsStorage,
|
||||
pods rest.Getter,
|
||||
defaultFamily api.IPFamily,
|
||||
ipAllocs map[api.IPFamily]ipallocator.Interface,
|
||||
portAlloc portallocator.Interface,
|
||||
proxyTransport http.RoundTripper,
|
||||
) (*REST, *registry.ProxyREST) {
|
||||
|
||||
strategy, _ := registry.StrategyForServiceCIDRs(ipAllocs[defaultFamily].CIDR(), len(ipAllocs) > 1)
|
||||
|
||||
klog.V(0).Infof("the default service ipfamily for this cluster is: %s", string(defaultFamily))
|
||||
|
||||
rest := &REST{
|
||||
strategy: strategy,
|
||||
services: services,
|
||||
endpoints: endpoints,
|
||||
proxyTransport: proxyTransport,
|
||||
pods: pods,
|
||||
alloc: makeAlloc(defaultFamily, ipAllocs, portAlloc),
|
||||
}
|
||||
|
||||
return rest, ®istry.ProxyREST{Redirector: rest, ProxyTransport: proxyTransport}
|
||||
|
@ -42,7 +42,6 @@ import (
|
||||
svctest "k8s.io/kubernetes/pkg/api/service/testing"
|
||||
api "k8s.io/kubernetes/pkg/apis/core"
|
||||
endpointstore "k8s.io/kubernetes/pkg/registry/core/endpoint/storage"
|
||||
podstore "k8s.io/kubernetes/pkg/registry/core/pod/storage"
|
||||
"k8s.io/kubernetes/pkg/registry/core/service/ipallocator"
|
||||
"k8s.io/kubernetes/pkg/registry/core/service/portallocator"
|
||||
"k8s.io/kubernetes/pkg/registry/registrytest"
|
||||
@ -187,25 +186,6 @@ func (s *serviceStorage) ResourceLocation(ctx context.Context, id string) (remot
|
||||
func NewTestREST(t *testing.T, ipFamilies []api.IPFamily) (*REST, *etcd3testing.EtcdTestServer) {
|
||||
etcdStorage, server := registrytest.NewEtcdStorage(t, "")
|
||||
|
||||
podStorage, err := podstore.NewStorage(generic.RESTOptions{
|
||||
StorageConfig: etcdStorage.ForResource(schema.GroupResource{Resource: "pods"}),
|
||||
Decorator: generic.UndecoratedStorage,
|
||||
DeleteCollectionWorkers: 3,
|
||||
ResourcePrefix: "pods",
|
||||
}, nil, nil, nil)
|
||||
if err != nil {
|
||||
t.Fatalf("unexpected error from REST storage: %v", err)
|
||||
}
|
||||
|
||||
endpointStorage, err := endpointstore.NewREST(generic.RESTOptions{
|
||||
StorageConfig: etcdStorage.ForResource(schema.GroupResource{Resource: "endpoints"}),
|
||||
Decorator: generic.UndecoratedStorage,
|
||||
ResourcePrefix: "endpoints",
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatalf("unexpected error from REST storage: %v", err)
|
||||
}
|
||||
|
||||
var rPrimary ipallocator.Interface
|
||||
var rSecondary ipallocator.Interface
|
||||
|
||||
@ -214,6 +194,7 @@ func NewTestREST(t *testing.T, ipFamilies []api.IPFamily) (*REST, *etcd3testing.
|
||||
}
|
||||
for i, family := range ipFamilies {
|
||||
var r ipallocator.Interface
|
||||
var err error
|
||||
switch family {
|
||||
case api.IPv4Protocol:
|
||||
r, err = ipallocator.NewInMemory(makeIPNet(t))
|
||||
@ -248,7 +229,7 @@ func NewTestREST(t *testing.T, ipFamilies []api.IPFamily) (*REST, *etcd3testing.
|
||||
}
|
||||
|
||||
inner := newInnerREST(t, etcdStorage, ipAllocators, portAllocator)
|
||||
rest, _ := NewREST(inner, endpointStorage, podStorage.Pod, rPrimary.IPFamily(), ipAllocators, portAllocator, nil)
|
||||
rest, _ := NewREST(inner, rPrimary.IPFamily(), nil)
|
||||
|
||||
return rest, server
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user