github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 06:54:01 +00:00
Code Issues Projects Releases Wiki Activity

Service REST test: remove unused return value

Browse Source
This commit is contained in:
Tim Hockin 2021-06-29 16:44:21 -07:00
parent d6208606f3
commit 44eb475b10
1 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
pkg/registry/core/service/storage/rest_test.go
View File

@ -169,11 +169,11 @@ func (s *serviceStorage) GetResetFields() map[fieldpath.APIVersion]*fieldpath.Se
return nil
}
func NewTestREST(t *testing.T, ipFamilies []api.IPFamily) (*REST, *serviceStorage, *etcd3testing.EtcdTestServer) {
func NewTestREST(t *testing.T, ipFamilies []api.IPFamily) (*REST, *etcd3testing.EtcdTestServer) {
return NewTestRESTWithPods(t, nil, nil, ipFamilies)
}
func NewTestRESTWithPods(t *testing.T, endpoints []*api.Endpoints, pods []api.Pod, ipFamilies []api.IPFamily) (*REST, *serviceStorage, *etcd3testing.EtcdTestServer) {
func NewTestRESTWithPods(t *testing.T, endpoints []*api.Endpoints, pods []api.Pod, ipFamilies []api.IPFamily) (*REST, *etcd3testing.EtcdTestServer) {
etcdStorage, server := registrytest.NewEtcdStorage(t, "")
serviceStorage := &serviceStorage{}
@ -245,7 +245,7 @@ func NewTestRESTWithPods(t *testing.T, endpoints []*api.Endpoints, pods []api.Po
rest, _ := NewREST(serviceStorage, endpointStorage, podStorage.Pod, rPrimary, rSecondary, portAllocator, nil)
return rest, serviceStorage, server
return rest, server
}
func makeIPNet(t *testing.T) *net.IPNet {
@ -311,7 +311,7 @@ func TestServiceRegistryCreate(t *testing.T) {
}}
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
storage, _, server := NewTestREST(t, tc.families)
storage, server := NewTestREST(t, tc.families)
defer server.Terminate(t)
ctx := genericapirequest.NewDefaultContext()
@ -392,7 +392,7 @@ func TestServiceRegistryCreateDryRun(t *testing.T) {
if tc.enableDualStack {
families = append(families, api.IPv6Protocol)
}
storage, _, server := NewTestREST(t, families)
storage, server := NewTestREST(t, families)
defer server.Terminate(t)
ctx := genericapirequest.NewDefaultContext()
@ -417,7 +417,7 @@ func TestServiceRegistryCreateDryRun(t *testing.T) {
}
func TestDryRunNodePort(t *testing.T) {
storage, _, server := NewTestREST(t, singleStackIPv4)
storage, server := NewTestREST(t, singleStackIPv4)
defer server.Terminate(t)
// Test dry run create request with a node port
@ -496,7 +496,7 @@ func TestDryRunNodePort(t *testing.T) {
}
func TestServiceRegistryCreateMultiNodePortsService(t *testing.T) {
storage, _, server := NewTestREST(t, singleStackIPv4)
storage, server := NewTestREST(t, singleStackIPv4)
defer server.Terminate(t)
testCases := []struct {
@ -569,7 +569,7 @@ func TestServiceRegistryCreateMultiNodePortsService(t *testing.T) {
}
func TestServiceStorageValidatesCreate(t *testing.T) {
storage, _, server := NewTestREST(t, singleStackIPv4)
storage, server := NewTestREST(t, singleStackIPv4)
defer server.Terminate(t)
failureCases := map[string]*api.Service{
"empty ID": svctest.MakeService(""),
@ -592,7 +592,7 @@ func TestServiceStorageValidatesCreate(t *testing.T) {
func TestServiceRegistryUpdate(t *testing.T) {
ctx := genericapirequest.NewDefaultContext()
storage, _, server := NewTestREST(t, []api.IPFamily{api.IPv4Protocol})
storage, server := NewTestREST(t, []api.IPFamily{api.IPv4Protocol})
defer server.Terminate(t)
_, err := storage.Create(ctx, svctest.MakeService("foo"), rest.ValidateAllObjectFunc, &metav1.CreateOptions{})
@ -627,7 +627,7 @@ func TestServiceRegistryUpdate(t *testing.T) {
func TestServiceRegistryUpdateDryRun(t *testing.T) {
ctx := genericapirequest.NewDefaultContext()
storage, _, server := NewTestREST(t, singleStackIPv4)
storage, server := NewTestREST(t, singleStackIPv4)
defer server.Terminate(t)
obj, err := storage.Create(ctx, svctest.MakeService("foo", svctest.SetTypeExternalName), rest.ValidateAllObjectFunc, &metav1.CreateOptions{})
@ -711,7 +711,7 @@ func TestServiceRegistryUpdateDryRun(t *testing.T) {
func TestServiceStorageValidatesUpdate(t *testing.T) {
ctx := genericapirequest.NewDefaultContext()
storage, _, server := NewTestREST(t, singleStackIPv4)
storage, server := NewTestREST(t, singleStackIPv4)
defer server.Terminate(t)
_, err := storage.Create(ctx, svctest.MakeService("foo"), rest.ValidateAllObjectFunc, &metav1.CreateOptions{})
if err != nil {
@ -736,7 +736,7 @@ func TestServiceStorageValidatesUpdate(t *testing.T) {
func TestServiceRegistryExternalService(t *testing.T) {
ctx := genericapirequest.NewDefaultContext()
storage, _, server := NewTestREST(t, singleStackIPv4)
storage, server := NewTestREST(t, singleStackIPv4)
defer server.Terminate(t)
svc := svctest.MakeService("foo", svctest.SetTypeLoadBalancer)
_, err := storage.Create(ctx, svc, rest.ValidateAllObjectFunc, &metav1.CreateOptions{})
@ -805,7 +805,7 @@ func TestAllocateLoadBalancerNodePorts(t *testing.T) {
ctx := genericapirequest.NewDefaultContext()
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.ServiceLBNodePortControl, tc.allocateNodePortGate)()
storage, _, server := NewTestREST(t, singleStackIPv4)
storage, server := NewTestREST(t, singleStackIPv4)
defer server.Terminate(t)
_, err := storage.Create(ctx, tc.svc, rest.ValidateAllObjectFunc, &metav1.CreateOptions{})
@ -838,7 +838,7 @@ func TestAllocateLoadBalancerNodePorts(t *testing.T) {
func TestServiceRegistryDelete(t *testing.T) {
ctx := genericapirequest.NewDefaultContext()
storage, _, server := NewTestREST(t, singleStackIPv4)
storage, server := NewTestREST(t, singleStackIPv4)
defer server.Terminate(t)
svc := svctest.MakeService("foo")
_, err := storage.Create(ctx, svc, rest.ValidateAllObjectFunc, &metav1.CreateOptions{})
@ -853,7 +853,7 @@ func TestServiceRegistryDelete(t *testing.T) {
func TestServiceRegistryDeleteDryRun(t *testing.T) {
ctx := genericapirequest.NewDefaultContext()
storage, _, server := NewTestREST(t, singleStackIPv4)
storage, server := NewTestREST(t, singleStackIPv4)
defer server.Terminate(t)
// Test dry run delete request with cluster ip
@ -907,7 +907,7 @@ func TestDualStackServiceRegistryDeleteDryRun(t *testing.T) {
// dry run for non dualstack
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.IPv6DualStack, true)()
dualstack_storage, _, dualstack_server := NewTestREST(t, []api.IPFamily{api.IPv4Protocol, api.IPv6Protocol})
dualstack_storage, dualstack_server := NewTestREST(t, []api.IPFamily{api.IPv4Protocol, api.IPv6Protocol})
defer dualstack_server.Terminate(t)
// Test dry run delete request with cluster ip
dualstack_svc := svctest.MakeService("foo",
@ -933,7 +933,7 @@ func TestDualStackServiceRegistryDeleteDryRun(t *testing.T) {
func TestServiceRegistryDeleteExternal(t *testing.T) {
ctx := genericapirequest.NewDefaultContext()
storage, _, server := NewTestREST(t, singleStackIPv4)
storage, server := NewTestREST(t, singleStackIPv4)
defer server.Terminate(t)
svc := svctest.MakeService("foo", svctest.SetTypeExternalName)
_, err := storage.Create(ctx, svc, rest.ValidateAllObjectFunc, &metav1.CreateOptions{})
@ -948,7 +948,7 @@ func TestServiceRegistryDeleteExternal(t *testing.T) {
func TestServiceRegistryUpdateExternalService(t *testing.T) {
ctx := genericapirequest.NewDefaultContext()
storage, _, server := NewTestREST(t, singleStackIPv4)
storage, server := NewTestREST(t, singleStackIPv4)
defer server.Terminate(t)
// Create non-external load balancer.
@ -976,7 +976,7 @@ func TestServiceRegistryUpdateExternalService(t *testing.T) {
func TestServiceRegistryUpdateMultiPortExternalService(t *testing.T) {
ctx := genericapirequest.NewDefaultContext()
storage, _, server := NewTestREST(t, singleStackIPv4)
storage, server := NewTestREST(t, singleStackIPv4)
defer server.Terminate(t)
// Create external load balancer.
@ -1001,7 +1001,7 @@ func TestServiceRegistryUpdateMultiPortExternalService(t *testing.T) {
func TestServiceRegistryGet(t *testing.T) {
ctx := genericapirequest.NewDefaultContext()
storage, _, server := NewTestREST(t, singleStackIPv4)
storage, server := NewTestREST(t, singleStackIPv4)
defer server.Terminate(t)
_, err := storage.Create(ctx, svctest.MakeService("foo"), rest.ValidateAllObjectFunc, &metav1.CreateOptions{})
if err != nil {
@ -1071,7 +1071,7 @@ func TestServiceRegistryResourceLocation(t *testing.T) {
epstest.MakeEndpoints("no-endpoints", nil, nil), // to prove this does not get chosen
}
storage, _, server := NewTestRESTWithPods(t, endpoints, pods, singleStackIPv4)
storage, server := NewTestRESTWithPods(t, endpoints, pods, singleStackIPv4)
defer server.Terminate(t)
ctx := genericapirequest.NewDefaultContext()
@ -1171,7 +1171,7 @@ func TestServiceRegistryResourceLocation(t *testing.T) {
func TestServiceRegistryList(t *testing.T) {
ctx := genericapirequest.NewDefaultContext()
storage, _, server := NewTestREST(t, singleStackIPv4)
storage, server := NewTestREST(t, singleStackIPv4)
defer server.Terminate(t)
_, err := storage.Create(ctx, svctest.MakeService("foo"), rest.ValidateAllObjectFunc, &metav1.CreateOptions{})
if err != nil {
@ -1195,7 +1195,7 @@ func TestServiceRegistryList(t *testing.T) {
}
func TestServiceRegistryIPAllocation(t *testing.T) {
storage, _, server := NewTestREST(t, singleStackIPv4)
storage, server := NewTestREST(t, singleStackIPv4)
defer server.Terminate(t)
svc1 := svctest.MakeService("foo")
@ -1248,7 +1248,7 @@ func TestServiceRegistryIPAllocation(t *testing.T) {
}
func TestServiceRegistryIPReallocation(t *testing.T) {
storage, _, server := NewTestREST(t, singleStackIPv4)
storage, server := NewTestREST(t, singleStackIPv4)
defer server.Terminate(t)
svc1 := svctest.MakeService("foo")
@ -1286,7 +1286,7 @@ func TestServiceRegistryIPReallocation(t *testing.T) {
}
func TestServiceRegistryIPUpdate(t *testing.T) {
storage, _, server := NewTestREST(t, singleStackIPv4)
storage, server := NewTestREST(t, singleStackIPv4)
defer server.Terminate(t)
svc := svctest.MakeService("foo")
@ -1336,7 +1336,7 @@ func TestServiceRegistryIPUpdate(t *testing.T) {
}
func TestServiceRegistryIPLoadBalancer(t *testing.T) {
storage, _, server := NewTestREST(t, singleStackIPv4)
storage, server := NewTestREST(t, singleStackIPv4)
defer server.Terminate(t)
svc := svctest.MakeService("foo", svctest.SetTypeLoadBalancer)
@ -1367,7 +1367,7 @@ func TestServiceRegistryIPLoadBalancer(t *testing.T) {
// and type is LoadBalancer.
func TestServiceRegistryExternalTrafficHealthCheckNodePortAllocation(t *testing.T) {
ctx := genericapirequest.NewDefaultContext()
storage, _, server := NewTestREST(t, singleStackIPv4)
storage, server := NewTestREST(t, singleStackIPv4)
defer server.Terminate(t)
svc := svctest.MakeService("external-lb-esipp", svctest.SetTypeLoadBalancer, func(s *api.Service) {
s.Spec.ExternalTrafficPolicy = api.ServiceExternalTrafficPolicyTypeLocal
@ -1395,7 +1395,7 @@ func TestServiceRegistryExternalTrafficHealthCheckNodePortAllocation(t *testing.
// and type is LoadBalancer.
func TestServiceRegistryExternalTrafficHealthCheckNodePortUserAllocation(t *testing.T) {
ctx := genericapirequest.NewDefaultContext()
storage, _, server := NewTestREST(t, singleStackIPv4)
storage, server := NewTestREST(t, singleStackIPv4)
defer server.Terminate(t)
svc := svctest.MakeService("external-lb-esipp", svctest.SetTypeLoadBalancer, func(s *api.Service) {
// hard-code NodePort to make sure it doesn't conflict with the healthport.
@ -1430,7 +1430,7 @@ func TestServiceRegistryExternalTrafficHealthCheckNodePortUserAllocation(t *test
// Validate that the service creation fails when the requested port number is -1.
func TestServiceRegistryExternalTrafficHealthCheckNodePortNegative(t *testing.T) {
ctx := genericapirequest.NewDefaultContext()
storage, _, server := NewTestREST(t, singleStackIPv4)
storage, server := NewTestREST(t, singleStackIPv4)
defer server.Terminate(t)
svc := svctest.MakeService("external-lb-esipp", svctest.SetTypeLoadBalancer, func(s *api.Service) {
s.Spec.ExternalTrafficPolicy = api.ServiceExternalTrafficPolicyTypeLocal
@ -1446,7 +1446,7 @@ func TestServiceRegistryExternalTrafficHealthCheckNodePortNegative(t *testing.T)
// Validate that the health check nodePort is not allocated when ExternalTrafficPolicy is set to Global.
func TestServiceRegistryExternalTrafficGlobal(t *testing.T) {
ctx := genericapirequest.NewDefaultContext()
storage, _, server := NewTestREST(t, singleStackIPv4)
storage, server := NewTestREST(t, singleStackIPv4)
defer server.Terminate(t)
svc := svctest.MakeService("external-lb-esipp", svctest.SetTypeLoadBalancer, func(s *api.Service) {
s.Spec.ExternalTrafficPolicy = api.ServiceExternalTrafficPolicyTypeCluster
@ -1625,7 +1625,7 @@ func TestInitClusterIP(t *testing.T) {
if test.enableDualStackAllocator {
families = append(families, api.IPv6Protocol)
}
storage, _, server := NewTestREST(t, families)
storage, server := NewTestREST(t, families)
defer server.Terminate(t)
copySvc := test.svc.DeepCopy()
@ -1713,7 +1713,7 @@ func TestInitClusterIP(t *testing.T) {
}
func TestInitNodePorts(t *testing.T) {
storage, _, server := NewTestREST(t, []api.IPFamily{api.IPv4Protocol})
storage, server := NewTestREST(t, []api.IPFamily{api.IPv4Protocol})
defer server.Terminate(t)
nodePortOp := portallocator.StartOperation(storage.serviceNodePorts, false)
defer nodePortOp.Finish()
@ -1798,7 +1798,7 @@ func TestInitNodePorts(t *testing.T) {
}
func TestUpdateNodePorts(t *testing.T) {
storage, _, server := NewTestREST(t, singleStackIPv4)
storage, server := NewTestREST(t, singleStackIPv4)
defer server.Terminate(t)
nodePortOp := portallocator.StartOperation(storage.serviceNodePorts, false)
defer nodePortOp.Finish()
@ -2054,7 +2054,7 @@ func TestServiceUpgrade(t *testing.T) {
if testCase.enableDualStackAllocator {
families = append(families, api.IPv6Protocol)
}
storage, _, server := NewTestREST(t, families)
storage, server := NewTestREST(t, families)
defer server.Terminate(t)
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.IPv6DualStack, testCase.enableDualStackGate)()
@ -2191,7 +2191,7 @@ func TestServiceDowngrade(t *testing.T) {
for _, testCase := range testCases {
t.Run(testCase.name, func(t *testing.T) {
storage, _, server := NewTestREST(t, []api.IPFamily{api.IPv4Protocol, api.IPv6Protocol})
storage, server := NewTestREST(t, []api.IPFamily{api.IPv4Protocol, api.IPv6Protocol})
defer server.Terminate(t)
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.IPv6DualStack, testCase.enableDualStackGate)()
@ -3372,7 +3372,7 @@ func TestDefaultingValidation(t *testing.T) {
// This func only runs when feature gate is on
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.IPv6DualStack, true)()
storage, _, server := NewTestREST(t, []api.IPFamily{api.IPv4Protocol, api.IPv6Protocol})
storage, server := NewTestREST(t, []api.IPFamily{api.IPv4Protocol, api.IPv6Protocol})
defer server.Terminate(t)
for _, testCase := range testCases {