From f7ce6f834a1f92fbd047cca1f89361aa2a13078e Mon Sep 17 00:00:00 2001
From: mowangdk <geyingqi0701@gmail.com>
Date: Tue, 25 Apr 2023 22:51:45 +0800
Subject: [PATCH] Chore: add ipfamilies tweak functions

---
 .../controllers/service/controller_test.go    | 60 +++----------------
 1 file changed, 9 insertions(+), 51 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 8018b7bd0f4..e8367f38275 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
@@ -123,6 +123,12 @@ func tweakAddAppProtocol(appProtocol string) serviceTweak {
 	}
 }
 
+func tweakAddIPFamilies(families ...v1.IPFamily) serviceTweak {
+	return func(s *v1.Service) {
+		s.Spec.IPFamilies = families
+	}
+}
+
 // Wrap newService so that you don't have to call default arguments again and again.
 func defaultExternalService() *v1.Service {
 	return newService("external-balancer", v1.ServiceTypeLoadBalancer)
@@ -1366,23 +1372,7 @@ func TestNeedsUpdate(t *testing.T) {
 	}, {
 		testName: "If service IPFamilies from single stack to dual stack",
 		updateFn: func() {
-			protocol := "http"
-			oldSvc = &v1.Service{
-				ObjectMeta: metav1.ObjectMeta{
-					Name:      "tcp-service",
-					Namespace: "default",
-				},
-				Spec: v1.ServiceSpec{
-					Ports: []v1.ServicePort{{
-						Port:        80,
-						Protocol:    v1.ProtocolTCP,
-						TargetPort:  intstr.Parse("22"),
-						AppProtocol: &protocol,
-					}},
-					IPFamilies: []v1.IPFamily{v1.IPv4Protocol},
-					Type:       v1.ServiceTypeLoadBalancer,
-				},
-			}
+			oldSvc = newService("tcp-service", v1.ServiceTypeLoadBalancer, tweakAddPorts(v1.ProtocolTCP, 22), tweakAddAppProtocol("http"), tweakAddIPFamilies(v1.IPv4Protocol))
 			newSvc = oldSvc.DeepCopy()
 			newSvc.Spec.IPFamilies = []v1.IPFamily{v1.IPv4Protocol, v1.IPv6Protocol}
 		},
@@ -1390,23 +1380,7 @@ func TestNeedsUpdate(t *testing.T) {
 	}, {
 		testName: "If service IPFamilies from dual stack to single stack",
 		updateFn: func() {
-			protocol := "http"
-			oldSvc = &v1.Service{
-				ObjectMeta: metav1.ObjectMeta{
-					Name:      "tcp-service",
-					Namespace: "default",
-				},
-				Spec: v1.ServiceSpec{
-					Ports: []v1.ServicePort{{
-						Port:        80,
-						Protocol:    v1.ProtocolTCP,
-						TargetPort:  intstr.Parse("22"),
-						AppProtocol: &protocol,
-					}},
-					IPFamilies: []v1.IPFamily{v1.IPv4Protocol, v1.IPv6Protocol},
-					Type:       v1.ServiceTypeLoadBalancer,
-				},
-			}
+			oldSvc = newService("tcp-service", v1.ServiceTypeLoadBalancer, tweakAddPorts(v1.ProtocolTCP, 22), tweakAddAppProtocol("http"), tweakAddIPFamilies(v1.IPv4Protocol, v1.IPv6Protocol))
 			newSvc = oldSvc.DeepCopy()
 			newSvc.Spec.IPFamilies = []v1.IPFamily{v1.IPv4Protocol}
 		},
@@ -1414,23 +1388,7 @@ func TestNeedsUpdate(t *testing.T) {
 	}, {
 		testName: "If service IPFamilies not change",
 		updateFn: func() {
-			protocol := "http"
-			oldSvc = &v1.Service{
-				ObjectMeta: metav1.ObjectMeta{
-					Name:      "tcp-service",
-					Namespace: "default",
-				},
-				Spec: v1.ServiceSpec{
-					Ports: []v1.ServicePort{{
-						Port:        80,
-						Protocol:    v1.ProtocolTCP,
-						TargetPort:  intstr.Parse("22"),
-						AppProtocol: &protocol,
-					}},
-					IPFamilies: []v1.IPFamily{v1.IPv4Protocol},
-					Type:       v1.ServiceTypeLoadBalancer,
-				},
-			}
+			oldSvc = newService("tcp-service", v1.ServiceTypeLoadBalancer, tweakAddPorts(v1.ProtocolTCP, 22), tweakAddAppProtocol("http"), tweakAddIPFamilies(v1.IPv4Protocol))
 			newSvc = oldSvc.DeepCopy()
 		},
 		expectedNeedsUpdate: false,