scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-01 18:58:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make EndpointSlice mirroring controller always canonicalize the IPs it writes out

Browse Source 
(Also rearrange some code to avoid parsing the IP twice.)
This commit is contained in:
Dan Winship
2025-02-11 17:43:17 -05:00
parent 29be52b3f7
commit 6512de76ce
4 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
pkg/controller/endpointslicemirroring/utils.go
View File

@@ -49,18 +49,6 @@ func (pk addrTypePortMapKey) addressType() discovery.AddressType {
return discovery.AddressTypeIPv4
}
func getAddressType(address string) *discovery.AddressType {
ip := netutils.ParseIPSloppy(address)
if ip == nil {
return nil
}
addressType := discovery.AddressTypeIPv4
if ip.To4() == nil {
addressType = discovery.AddressTypeIPv6
}
return &addressType
}
// newEndpointSlice returns an EndpointSlice generated from an Endpoints
// resource, ports, and address type.
func newEndpointSlice(endpoints *corev1.Endpoints, ports []discovery.EndpointPort, addrType discovery.AddressType, sliceName string) *discovery.EndpointSlice {
@@ -115,10 +103,20 @@ func getEndpointSlicePrefix(serviceName string) string {
}
// addressToEndpoint converts an address from an Endpoints resource to an
// EndpointSlice endpoint.
func addressToEndpoint(address corev1.EndpointAddress, ready bool) *discovery.Endpoint {
// EndpointSlice endpoint and AddressType.
func addressToEndpoint(address corev1.EndpointAddress, ready bool) (*discovery.Endpoint, *discovery.AddressType) {
ip := netutils.ParseIPSloppy(address.IP)
if ip == nil {
return nil, nil
}
addressType := discovery.AddressTypeIPv4
if ip.To4() == nil {
addressType = discovery.AddressTypeIPv6
}
endpoint := &discovery.Endpoint{
Addresses: []string{address.IP},
// We parse and restringify the Endpoints IP in case it is in an irregular format.
Addresses: []string{ip.String()},
Conditions: discovery.EndpointConditions{
Ready: &ready,
},
@@ -132,7 +130,7 @@ func addressToEndpoint(address corev1.EndpointAddress, ready bool) *discovery.En
endpoint.Hostname = &address.Hostname
}
return endpoint
return endpoint, &addressType
}
// epPortsToEpsPorts converts ports from an Endpoints resource to ports for an