From 43b13840db5cbe86b13dbb393ed8870a372749d6 Mon Sep 17 00:00:00 2001 From: Tim Hockin Date: Thu, 1 Jul 2021 12:01:50 -0700 Subject: [PATCH] Service REST test: remove obscure const --- .../core/service/storage/rest_test.go | 52 +++++++++---------- 1 file changed, 24 insertions(+), 28 deletions(-) diff --git a/pkg/registry/core/service/storage/rest_test.go b/pkg/registry/core/service/storage/rest_test.go index 0167933913d..1db155effbb 100644 --- a/pkg/registry/core/service/storage/rest_test.go +++ b/pkg/registry/core/service/storage/rest_test.go @@ -54,10 +54,6 @@ import ( "sigs.k8s.io/structured-merge-diff/v4/fieldpath" ) -var ( - singleStackIPv4 = []api.IPFamily{api.IPv4Protocol} -) - // TODO(wojtek-t): Cleanup this file. // It is now testing mostly the same things as other resources but // in a completely different way. We should unify it. @@ -417,7 +413,7 @@ func TestServiceRegistryCreateDryRun(t *testing.T) { } func TestDryRunNodePort(t *testing.T) { - storage, server := NewTestREST(t, singleStackIPv4) + storage, server := NewTestREST(t, []api.IPFamily{api.IPv4Protocol}) defer server.Terminate(t) // Test dry run create request with a node port @@ -496,7 +492,7 @@ func TestDryRunNodePort(t *testing.T) { } func TestServiceRegistryCreateMultiNodePortsService(t *testing.T) { - storage, server := NewTestREST(t, singleStackIPv4) + storage, server := NewTestREST(t, []api.IPFamily{api.IPv4Protocol}) defer server.Terminate(t) testCases := []struct { @@ -569,7 +565,7 @@ func TestServiceRegistryCreateMultiNodePortsService(t *testing.T) { } func TestServiceStorageValidatesCreate(t *testing.T) { - storage, server := NewTestREST(t, singleStackIPv4) + storage, server := NewTestREST(t, []api.IPFamily{api.IPv4Protocol}) defer server.Terminate(t) failureCases := map[string]*api.Service{ "empty ID": svctest.MakeService(""), @@ -627,7 +623,7 @@ func TestServiceRegistryUpdate(t *testing.T) { func TestServiceRegistryUpdateDryRun(t *testing.T) { ctx := genericapirequest.NewDefaultContext() - storage, server := NewTestREST(t, singleStackIPv4) + storage, server := NewTestREST(t, []api.IPFamily{api.IPv4Protocol}) defer server.Terminate(t) obj, err := storage.Create(ctx, svctest.MakeService("foo", svctest.SetTypeExternalName), rest.ValidateAllObjectFunc, &metav1.CreateOptions{}) @@ -711,7 +707,7 @@ func TestServiceRegistryUpdateDryRun(t *testing.T) { func TestServiceStorageValidatesUpdate(t *testing.T) { ctx := genericapirequest.NewDefaultContext() - storage, server := NewTestREST(t, singleStackIPv4) + storage, server := NewTestREST(t, []api.IPFamily{api.IPv4Protocol}) defer server.Terminate(t) _, err := storage.Create(ctx, svctest.MakeService("foo"), rest.ValidateAllObjectFunc, &metav1.CreateOptions{}) if err != nil { @@ -736,7 +732,7 @@ func TestServiceStorageValidatesUpdate(t *testing.T) { func TestServiceRegistryExternalService(t *testing.T) { ctx := genericapirequest.NewDefaultContext() - storage, server := NewTestREST(t, singleStackIPv4) + storage, server := NewTestREST(t, []api.IPFamily{api.IPv4Protocol}) defer server.Terminate(t) svc := svctest.MakeService("foo", svctest.SetTypeLoadBalancer) _, err := storage.Create(ctx, svc, rest.ValidateAllObjectFunc, &metav1.CreateOptions{}) @@ -805,7 +801,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, []api.IPFamily{api.IPv4Protocol}) defer server.Terminate(t) _, err := storage.Create(ctx, tc.svc, rest.ValidateAllObjectFunc, &metav1.CreateOptions{}) @@ -838,7 +834,7 @@ func TestAllocateLoadBalancerNodePorts(t *testing.T) { func TestServiceRegistryDelete(t *testing.T) { ctx := genericapirequest.NewDefaultContext() - storage, server := NewTestREST(t, singleStackIPv4) + storage, server := NewTestREST(t, []api.IPFamily{api.IPv4Protocol}) defer server.Terminate(t) svc := svctest.MakeService("foo") _, err := storage.Create(ctx, svc, rest.ValidateAllObjectFunc, &metav1.CreateOptions{}) @@ -853,7 +849,7 @@ func TestServiceRegistryDelete(t *testing.T) { func TestServiceRegistryDeleteDryRun(t *testing.T) { ctx := genericapirequest.NewDefaultContext() - storage, server := NewTestREST(t, singleStackIPv4) + storage, server := NewTestREST(t, []api.IPFamily{api.IPv4Protocol}) defer server.Terminate(t) // Test dry run delete request with cluster ip @@ -933,7 +929,7 @@ func TestDualStackServiceRegistryDeleteDryRun(t *testing.T) { func TestServiceRegistryDeleteExternal(t *testing.T) { ctx := genericapirequest.NewDefaultContext() - storage, server := NewTestREST(t, singleStackIPv4) + storage, server := NewTestREST(t, []api.IPFamily{api.IPv4Protocol}) defer server.Terminate(t) svc := svctest.MakeService("foo", svctest.SetTypeExternalName) _, err := storage.Create(ctx, svc, rest.ValidateAllObjectFunc, &metav1.CreateOptions{}) @@ -948,7 +944,7 @@ func TestServiceRegistryDeleteExternal(t *testing.T) { func TestServiceRegistryUpdateExternalService(t *testing.T) { ctx := genericapirequest.NewDefaultContext() - storage, server := NewTestREST(t, singleStackIPv4) + storage, server := NewTestREST(t, []api.IPFamily{api.IPv4Protocol}) defer server.Terminate(t) // Create non-external load balancer. @@ -976,7 +972,7 @@ func TestServiceRegistryUpdateExternalService(t *testing.T) { func TestServiceRegistryUpdateMultiPortExternalService(t *testing.T) { ctx := genericapirequest.NewDefaultContext() - storage, server := NewTestREST(t, singleStackIPv4) + storage, server := NewTestREST(t, []api.IPFamily{api.IPv4Protocol}) defer server.Terminate(t) // Create external load balancer. @@ -1001,7 +997,7 @@ func TestServiceRegistryUpdateMultiPortExternalService(t *testing.T) { func TestServiceRegistryGet(t *testing.T) { ctx := genericapirequest.NewDefaultContext() - storage, server := NewTestREST(t, singleStackIPv4) + storage, server := NewTestREST(t, []api.IPFamily{api.IPv4Protocol}) defer server.Terminate(t) _, err := storage.Create(ctx, svctest.MakeService("foo"), rest.ValidateAllObjectFunc, &metav1.CreateOptions{}) if err != nil { @@ -1071,7 +1067,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, []api.IPFamily{api.IPv4Protocol}) defer server.Terminate(t) ctx := genericapirequest.NewDefaultContext() @@ -1171,7 +1167,7 @@ func TestServiceRegistryResourceLocation(t *testing.T) { func TestServiceRegistryList(t *testing.T) { ctx := genericapirequest.NewDefaultContext() - storage, server := NewTestREST(t, singleStackIPv4) + storage, server := NewTestREST(t, []api.IPFamily{api.IPv4Protocol}) defer server.Terminate(t) _, err := storage.Create(ctx, svctest.MakeService("foo"), rest.ValidateAllObjectFunc, &metav1.CreateOptions{}) if err != nil { @@ -1195,7 +1191,7 @@ func TestServiceRegistryList(t *testing.T) { } func TestServiceRegistryIPAllocation(t *testing.T) { - storage, server := NewTestREST(t, singleStackIPv4) + storage, server := NewTestREST(t, []api.IPFamily{api.IPv4Protocol}) defer server.Terminate(t) svc1 := svctest.MakeService("foo") @@ -1248,7 +1244,7 @@ func TestServiceRegistryIPAllocation(t *testing.T) { } func TestServiceRegistryIPReallocation(t *testing.T) { - storage, server := NewTestREST(t, singleStackIPv4) + storage, server := NewTestREST(t, []api.IPFamily{api.IPv4Protocol}) defer server.Terminate(t) svc1 := svctest.MakeService("foo") @@ -1286,7 +1282,7 @@ func TestServiceRegistryIPReallocation(t *testing.T) { } func TestServiceRegistryIPUpdate(t *testing.T) { - storage, server := NewTestREST(t, singleStackIPv4) + storage, server := NewTestREST(t, []api.IPFamily{api.IPv4Protocol}) defer server.Terminate(t) svc := svctest.MakeService("foo") @@ -1336,7 +1332,7 @@ func TestServiceRegistryIPUpdate(t *testing.T) { } func TestServiceRegistryIPLoadBalancer(t *testing.T) { - storage, server := NewTestREST(t, singleStackIPv4) + storage, server := NewTestREST(t, []api.IPFamily{api.IPv4Protocol}) defer server.Terminate(t) svc := svctest.MakeService("foo", svctest.SetTypeLoadBalancer) @@ -1367,7 +1363,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, []api.IPFamily{api.IPv4Protocol}) defer server.Terminate(t) svc := svctest.MakeService("external-lb-esipp", svctest.SetTypeLoadBalancer, func(s *api.Service) { s.Spec.ExternalTrafficPolicy = api.ServiceExternalTrafficPolicyTypeLocal @@ -1395,7 +1391,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, []api.IPFamily{api.IPv4Protocol}) 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 +1426,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, []api.IPFamily{api.IPv4Protocol}) defer server.Terminate(t) svc := svctest.MakeService("external-lb-esipp", svctest.SetTypeLoadBalancer, func(s *api.Service) { s.Spec.ExternalTrafficPolicy = api.ServiceExternalTrafficPolicyTypeLocal @@ -1446,7 +1442,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, []api.IPFamily{api.IPv4Protocol}) defer server.Terminate(t) svc := svctest.MakeService("external-lb-esipp", svctest.SetTypeLoadBalancer, func(s *api.Service) { s.Spec.ExternalTrafficPolicy = api.ServiceExternalTrafficPolicyTypeCluster @@ -1798,7 +1794,7 @@ func TestInitNodePorts(t *testing.T) { } func TestUpdateNodePorts(t *testing.T) { - storage, server := NewTestREST(t, singleStackIPv4) + storage, server := NewTestREST(t, []api.IPFamily{api.IPv4Protocol}) defer server.Terminate(t) nodePortOp := portallocator.StartOperation(storage.serviceNodePorts, false) defer nodePortOp.Finish()