From cf4804643ad9d0218f9ecef1da5274adcb1ac6ab Mon Sep 17 00:00:00 2001
From: Tim Hockin <thockin@google.com>
Date: Sat, 5 Dec 2020 16:33:42 -0800
Subject: [PATCH] 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.
---
 pkg/registry/core/rest/storage_core.go        |  4 ----
 pkg/registry/core/service/storage/rest.go     | 13 -----------
 .../core/service/storage/rest_test.go         | 23 ++-----------------
 3 files changed, 2 insertions(+), 38 deletions(-)

diff --git a/pkg/registry/core/rest/storage_core.go b/pkg/registry/core/rest/storage_core.go
index 443a955a8d8..5f21257dc9e 100644
--- a/pkg/registry/core/rest/storage_core.go
+++ b/pkg/registry/core/rest/storage_core.go
@@ -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{
diff --git a/pkg/registry/core/service/storage/rest.go b/pkg/registry/core/service/storage/rest.go
index c0dbf401f6f..adbc2766119 100644
--- a/pkg/registry/core/service/storage/rest.go
+++ b/pkg/registry/core/service/storage/rest.go
@@ -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, &registry.ProxyREST{Redirector: rest, ProxyTransport: proxyTransport}
diff --git a/pkg/registry/core/service/storage/rest_test.go b/pkg/registry/core/service/storage/rest_test.go
index 136826f37d6..53703a2b1b8 100644
--- a/pkg/registry/core/service/storage/rest_test.go
+++ b/pkg/registry/core/service/storage/rest_test.go
@@ -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
 }