From ab58014cc2b412773ccf58cd70c0af25ed943536 Mon Sep 17 00:00:00 2001
From: hzxuzhonghu <xuzhonghu@huawei.com>
Date: Wed, 28 Mar 2018 09:58:51 +0800
Subject: [PATCH] LoadBalancerStatus make use of generated deep copy method

---
 pkg/apis/core/helper/helpers.go | 10 ----------
 pkg/proxy/BUILD                 |  1 -
 pkg/proxy/service.go            |  3 +--
 pkg/proxy/userspace/proxier.go  |  2 +-
 pkg/proxy/winkernel/proxier.go  |  2 +-
 5 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/pkg/apis/core/helper/helpers.go b/pkg/apis/core/helper/helpers.go
index 96899f1841..8cb8595f52 100644
--- a/pkg/apis/core/helper/helpers.go
+++ b/pkg/apis/core/helper/helpers.go
@@ -326,16 +326,6 @@ func ingressEqual(lhs, rhs *core.LoadBalancerIngress) bool {
 	return true
 }
 
-// TODO: make method on LoadBalancerStatus?
-func LoadBalancerStatusDeepCopy(lb *core.LoadBalancerStatus) *core.LoadBalancerStatus {
-	c := &core.LoadBalancerStatus{}
-	c.Ingress = make([]core.LoadBalancerIngress, len(lb.Ingress))
-	for i := range lb.Ingress {
-		c.Ingress[i] = lb.Ingress[i]
-	}
-	return c
-}
-
 // GetAccessModesAsString returns a string representation of an array of access modes.
 // modes, when present, are always in the same order: RWO,ROX,RWX.
 func GetAccessModesAsString(modes []core.PersistentVolumeAccessMode) string {
diff --git a/pkg/proxy/BUILD b/pkg/proxy/BUILD
index ba71f18ca3..bb5b4b6165 100644
--- a/pkg/proxy/BUILD
+++ b/pkg/proxy/BUILD
@@ -18,7 +18,6 @@ go_library(
     deps = [
         "//pkg/api/service:go_default_library",
         "//pkg/apis/core:go_default_library",
-        "//pkg/apis/core/helper:go_default_library",
         "//pkg/proxy/util:go_default_library",
         "//pkg/util/net:go_default_library",
         "//vendor/github.com/golang/glog:go_default_library",
diff --git a/pkg/proxy/service.go b/pkg/proxy/service.go
index 23911a43c5..88e804517b 100644
--- a/pkg/proxy/service.go
+++ b/pkg/proxy/service.go
@@ -30,7 +30,6 @@ import (
 	"k8s.io/client-go/tools/record"
 	apiservice "k8s.io/kubernetes/pkg/api/service"
 	api "k8s.io/kubernetes/pkg/apis/core"
-	"k8s.io/kubernetes/pkg/apis/core/helper"
 	utilproxy "k8s.io/kubernetes/pkg/proxy/util"
 	utilnet "k8s.io/kubernetes/pkg/util/net"
 )
@@ -91,7 +90,7 @@ func (sct *ServiceChangeTracker) newBaseServiceInfo(port *api.ServicePort, servi
 		Protocol:  port.Protocol,
 		NodePort:  int(port.NodePort),
 		// Deep-copy in case the service instance changes
-		LoadBalancerStatus:     *helper.LoadBalancerStatusDeepCopy(&service.Status.LoadBalancer),
+		LoadBalancerStatus:     *service.Status.LoadBalancer.DeepCopy(),
 		SessionAffinityType:    service.Spec.SessionAffinity,
 		StickyMaxAgeSeconds:    stickyMaxAgeSeconds,
 		OnlyNodeLocalEndpoints: onlyNodeLocalEndpoints,
diff --git a/pkg/proxy/userspace/proxier.go b/pkg/proxy/userspace/proxier.go
index 3fc49c0642..d1c9c5bb83 100644
--- a/pkg/proxy/userspace/proxier.go
+++ b/pkg/proxy/userspace/proxier.go
@@ -447,7 +447,7 @@ func (proxier *Proxier) mergeService(service *api.Service) sets.String {
 		info.portal.port = int(servicePort.Port)
 		info.externalIPs = service.Spec.ExternalIPs
 		// Deep-copy in case the service instance changes
-		info.loadBalancerStatus = *helper.LoadBalancerStatusDeepCopy(&service.Status.LoadBalancer)
+		info.loadBalancerStatus = *service.Status.LoadBalancer.DeepCopy()
 		info.nodePort = int(servicePort.NodePort)
 		info.sessionAffinityType = service.Spec.SessionAffinity
 		// Kube-apiserver side guarantees SessionAffinityConfig won't be nil when session affinity type is ClientIP
diff --git a/pkg/proxy/winkernel/proxier.go b/pkg/proxy/winkernel/proxier.go
index 595286520c..e22295426c 100644
--- a/pkg/proxy/winkernel/proxier.go
+++ b/pkg/proxy/winkernel/proxier.go
@@ -175,7 +175,7 @@ func newServiceInfo(svcPortName proxy.ServicePortName, port *api.ServicePort, se
 		nodePort:   int(port.NodePort),
 		targetPort: port.TargetPort.IntValue(),
 		// Deep-copy in case the service instance changes
-		loadBalancerStatus:       *helper.LoadBalancerStatusDeepCopy(&service.Status.LoadBalancer),
+		loadBalancerStatus:       *service.Status.LoadBalancer.DeepCopy(),
 		sessionAffinityType:      service.Spec.SessionAffinity,
 		stickyMaxAgeSeconds:      stickyMaxAgeSeconds,
 		loadBalancerSourceRanges: make([]string, len(service.Spec.LoadBalancerSourceRanges)),