mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-09-09 13:12:20 +00:00
LoadBalancerStatus make use of generated deep copy method
This commit is contained in:
@@ -326,16 +326,6 @@ func ingressEqual(lhs, rhs *core.LoadBalancerIngress) bool {
|
|||||||
return true
|
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.
|
// GetAccessModesAsString returns a string representation of an array of access modes.
|
||||||
// modes, when present, are always in the same order: RWO,ROX,RWX.
|
// modes, when present, are always in the same order: RWO,ROX,RWX.
|
||||||
func GetAccessModesAsString(modes []core.PersistentVolumeAccessMode) string {
|
func GetAccessModesAsString(modes []core.PersistentVolumeAccessMode) string {
|
||||||
|
@@ -18,7 +18,6 @@ go_library(
|
|||||||
deps = [
|
deps = [
|
||||||
"//pkg/api/service:go_default_library",
|
"//pkg/api/service:go_default_library",
|
||||||
"//pkg/apis/core:go_default_library",
|
"//pkg/apis/core:go_default_library",
|
||||||
"//pkg/apis/core/helper:go_default_library",
|
|
||||||
"//pkg/proxy/util:go_default_library",
|
"//pkg/proxy/util:go_default_library",
|
||||||
"//pkg/util/net:go_default_library",
|
"//pkg/util/net:go_default_library",
|
||||||
"//vendor/github.com/golang/glog:go_default_library",
|
"//vendor/github.com/golang/glog:go_default_library",
|
||||||
|
@@ -30,7 +30,6 @@ import (
|
|||||||
"k8s.io/client-go/tools/record"
|
"k8s.io/client-go/tools/record"
|
||||||
apiservice "k8s.io/kubernetes/pkg/api/service"
|
apiservice "k8s.io/kubernetes/pkg/api/service"
|
||||||
api "k8s.io/kubernetes/pkg/apis/core"
|
api "k8s.io/kubernetes/pkg/apis/core"
|
||||||
"k8s.io/kubernetes/pkg/apis/core/helper"
|
|
||||||
utilproxy "k8s.io/kubernetes/pkg/proxy/util"
|
utilproxy "k8s.io/kubernetes/pkg/proxy/util"
|
||||||
utilnet "k8s.io/kubernetes/pkg/util/net"
|
utilnet "k8s.io/kubernetes/pkg/util/net"
|
||||||
)
|
)
|
||||||
@@ -91,7 +90,7 @@ func (sct *ServiceChangeTracker) newBaseServiceInfo(port *api.ServicePort, servi
|
|||||||
Protocol: port.Protocol,
|
Protocol: port.Protocol,
|
||||||
NodePort: int(port.NodePort),
|
NodePort: int(port.NodePort),
|
||||||
// Deep-copy in case the service instance changes
|
// Deep-copy in case the service instance changes
|
||||||
LoadBalancerStatus: *helper.LoadBalancerStatusDeepCopy(&service.Status.LoadBalancer),
|
LoadBalancerStatus: *service.Status.LoadBalancer.DeepCopy(),
|
||||||
SessionAffinityType: service.Spec.SessionAffinity,
|
SessionAffinityType: service.Spec.SessionAffinity,
|
||||||
StickyMaxAgeSeconds: stickyMaxAgeSeconds,
|
StickyMaxAgeSeconds: stickyMaxAgeSeconds,
|
||||||
OnlyNodeLocalEndpoints: onlyNodeLocalEndpoints,
|
OnlyNodeLocalEndpoints: onlyNodeLocalEndpoints,
|
||||||
|
@@ -447,7 +447,7 @@ func (proxier *Proxier) mergeService(service *api.Service) sets.String {
|
|||||||
info.portal.port = int(servicePort.Port)
|
info.portal.port = int(servicePort.Port)
|
||||||
info.externalIPs = service.Spec.ExternalIPs
|
info.externalIPs = service.Spec.ExternalIPs
|
||||||
// Deep-copy in case the service instance changes
|
// 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.nodePort = int(servicePort.NodePort)
|
||||||
info.sessionAffinityType = service.Spec.SessionAffinity
|
info.sessionAffinityType = service.Spec.SessionAffinity
|
||||||
// Kube-apiserver side guarantees SessionAffinityConfig won't be nil when session affinity type is ClientIP
|
// Kube-apiserver side guarantees SessionAffinityConfig won't be nil when session affinity type is ClientIP
|
||||||
|
@@ -175,7 +175,7 @@ func newServiceInfo(svcPortName proxy.ServicePortName, port *api.ServicePort, se
|
|||||||
nodePort: int(port.NodePort),
|
nodePort: int(port.NodePort),
|
||||||
targetPort: port.TargetPort.IntValue(),
|
targetPort: port.TargetPort.IntValue(),
|
||||||
// Deep-copy in case the service instance changes
|
// Deep-copy in case the service instance changes
|
||||||
loadBalancerStatus: *helper.LoadBalancerStatusDeepCopy(&service.Status.LoadBalancer),
|
loadBalancerStatus: *service.Status.LoadBalancer.DeepCopy(),
|
||||||
sessionAffinityType: service.Spec.SessionAffinity,
|
sessionAffinityType: service.Spec.SessionAffinity,
|
||||||
stickyMaxAgeSeconds: stickyMaxAgeSeconds,
|
stickyMaxAgeSeconds: stickyMaxAgeSeconds,
|
||||||
loadBalancerSourceRanges: make([]string, len(service.Spec.LoadBalancerSourceRanges)),
|
loadBalancerSourceRanges: make([]string, len(service.Spec.LoadBalancerSourceRanges)),
|
||||||
|
Reference in New Issue
Block a user