Commit ca3b99d8 authored by Geoff Simmons's avatar Geoff Simmons

Encapsulate getting Pod ns & name from an Endpoint TargetRef.

parent a34a99bd
...@@ -128,3 +128,13 @@ func (worker *NamespaceWorker) getAllServiceEndpoints( ...@@ -128,3 +128,13 @@ func (worker *NamespaceWorker) getAllServiceEndpoints(
} }
return return
} }
func getTargetPod(epAddr api_v1.EndpointAddress) (string, string) {
ns := ""
name := ""
if epAddr.TargetRef != nil {
ns = epAddr.TargetRef.Namespace
name = epAddr.TargetRef.Name
}
return ns, name
}
...@@ -172,10 +172,7 @@ func epAddrs2VCLAddrs( ...@@ -172,10 +172,7 @@ func epAddrs2VCLAddrs(
IP: epAddr.IP, IP: epAddr.IP,
Port: admPort, Port: admPort,
} }
if epAddr.TargetRef != nil { vclAddr.PodNamespace, vclAddr.PodName = getTargetPod(epAddr)
vclAddr.PodNamespace = epAddr.TargetRef.Namespace
vclAddr.PodName = epAddr.TargetRef.Name
}
vclAddrs = append(vclAddrs, vclAddr) vclAddrs = append(vclAddrs, vclAddr)
} }
return vclAddrs return vclAddrs
...@@ -192,10 +189,7 @@ func epAddrs2OffldAddrs( ...@@ -192,10 +189,7 @@ func epAddrs2OffldAddrs(
DataplanePort: dplanePort, DataplanePort: dplanePort,
CrtDnldrPort: crtDnldrPort, CrtDnldrPort: crtDnldrPort,
} }
if epAddr.TargetRef != nil { offldAddr.PodNamespace, offldAddr.PodName = getTargetPod(epAddr)
offldAddr.PodNamespace = epAddr.TargetRef.Namespace
offldAddr.PodName = epAddr.TargetRef.Name
}
offldAddrs = append(offldAddrs, offldAddr) offldAddrs = append(offldAddrs, offldAddr)
} }
return offldAddrs return offldAddrs
......
...@@ -105,12 +105,8 @@ func endpsTargetPort2Addrs( ...@@ -105,12 +105,8 @@ func endpsTargetPort2Addrs(
IP: address.IP, IP: address.IP,
Port: port.Port, Port: port.Port,
} }
if address.TargetRef != nil { addr.PodNamespace, addr.PodName =
addr.PodNamespace = address. getTargetPod(address)
TargetRef.Namespace
addr.PodName = address.
TargetRef.Name
}
addrs = append(addrs, addr) addrs = append(addrs, addr)
} }
return addrs, update.MakeSuccess("") return addrs, update.MakeSuccess("")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment