From 23c242770fefa0fd5104f0f600d214277354c35f Mon Sep 17 00:00:00 2001 From: mowangdk Date: Sun, 26 Mar 2023 11:44:23 +0800 Subject: [PATCH] Chore: add etp tweak function --- .../controllers/service/controller_test.go | 22 ++++++------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/staging/src/k8s.io/cloud-provider/controllers/service/controller_test.go b/staging/src/k8s.io/cloud-provider/controllers/service/controller_test.go index d4734b76cc5..02d339ff2de 100644 --- a/staging/src/k8s.io/cloud-provider/controllers/service/controller_test.go +++ b/staging/src/k8s.io/cloud-provider/controllers/service/controller_test.go @@ -73,17 +73,9 @@ func newService(name string, serviceType v1.ServiceType, tweaks ...serviceTweak) return s } -func newETPLocalService(name string, serviceType v1.ServiceType) *v1.Service { - return &v1.Service{ - ObjectMeta: metav1.ObjectMeta{ - Name: name, - Namespace: "default", - UID: "777", - }, - Spec: v1.ServiceSpec{ - Type: serviceType, - ExternalTrafficPolicy: v1.ServiceExternalTrafficPolicyLocal, - }, +func tweakAddETP(etpType v1.ServiceExternalTrafficPolicyType) serviceTweak { + return func(s *v1.Service) { + s.Spec.ExternalTrafficPolicy = etpType } } @@ -588,8 +580,8 @@ func TestNodeChangesForExternalTrafficPolicyLocalServices(t *testing.T) { syncCallErr bool } - etpLocalservice1 := newETPLocalService("s0", v1.ServiceTypeLoadBalancer) - etpLocalservice2 := newETPLocalService("s1", v1.ServiceTypeLoadBalancer) + etpLocalservice1 := newService("s0", v1.ServiceTypeLoadBalancer, tweakAddETP(v1.ServiceExternalTrafficPolicyLocal)) + etpLocalservice2 := newService("s1", v1.ServiceTypeLoadBalancer, tweakAddETP(v1.ServiceExternalTrafficPolicyLocal)) service3 := defaultExternalService() services := []*v1.Service{etpLocalservice1, etpLocalservice2, service3} @@ -761,8 +753,8 @@ func TestNodeChangesForStableNodeSetEnabled(t *testing.T) { syncCallErr bool } - etpLocalservice1 := newETPLocalService("s0", v1.ServiceTypeLoadBalancer) - etpLocalservice2 := newETPLocalService("s1", v1.ServiceTypeLoadBalancer) + etpLocalservice1 := newService("s0", v1.ServiceTypeLoadBalancer, tweakAddETP(v1.ServiceExternalTrafficPolicyLocal)) + etpLocalservice2 := newService("s1", v1.ServiceTypeLoadBalancer, tweakAddETP(v1.ServiceExternalTrafficPolicyLocal)) service3 := defaultExternalService() services := []*v1.Service{etpLocalservice1, etpLocalservice2, service3}