Skip to content

Commit

Permalink
Fixup #1 addressing review comments
Browse files Browse the repository at this point in the history
  • Loading branch information
@basantsa1989
basantsa1989 committed Nov 17, 2020
1 parent 09d966c commit 707073d
Show file tree
Hide file tree
Showing 5 changed files with 70 additions and 60 deletions.
20 changes: 8 additions & 12 deletions pkg/proxy/iptables/proxier.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -294,14 +294,11 @@ func NewProxier(ipt utiliptables.Interface,
ipFamily = v1.IPv6Protocol
}

isCIDR := true
ipFamilyIPMap := utilproxy.MapIPsToIPFamily(nodePortAddresses, isCIDR)
nodePortAddresses = ipFamilyIPMap[ipFamily]
for ipFam, ips := range ipFamilyIPMap {
// Log the IPs not matching the ipFamily
if ipFam != ipFamily && len(ips) > 0 {
klog.Warningf("IP Family: %s, NodePortAddresses of wrong family; %s", ipFamily, strings.Join(ips, ","))
}
ipFamilyMap := utilproxy.MapCIDRsByIPFamily(nodePortAddresses)
nodePortAddresses = ipFamilyMap[ipFamily]
// Log the IPs not matching the ipFamily
if ips, ok := ipFamilyMap[utilproxy.OtherIPFamily(ipFamily)]; ok && len(ips) > 0 {
klog.Warningf("IP Family: %s, NodePortAddresses of wrong family; %s", ipFamily, strings.Join(ips, ","))
}

proxier := &Proxier{
Expand Down Expand Up @@ -371,18 +368,17 @@ func NewDualStackProxier(
nodePortAddresses []string,
) (proxy.Provider, error) {
// Create an ipv4 instance of the single-stack proxier
isCIDR := true
ipFamilyIPMap := utilproxy.MapIPsToIPFamily(nodePortAddresses, isCIDR)
ipFamilyMap := utilproxy.MapCIDRsByIPFamily(nodePortAddresses)
ipv4Proxier, err := NewProxier(ipt[0], sysctl,
exec, syncPeriod, minSyncPeriod, masqueradeAll, masqueradeBit, localDetectors[0], hostname,
nodeIP[0], recorder, healthzServer, ipFamilyIPMap[v1.IPv4Protocol])
nodeIP[0], recorder, healthzServer, ipFamilyMap[v1.IPv4Protocol])
if err != nil {
return nil, fmt.Errorf("unable to create ipv4 proxier: %v", err)
}

ipv6Proxier, err := NewProxier(ipt[1], sysctl,
exec, syncPeriod, minSyncPeriod, masqueradeAll, masqueradeBit, localDetectors[1], hostname,
nodeIP[1], recorder, healthzServer, ipFamilyIPMap[v1.IPv6Protocol])
nodeIP[1], recorder, healthzServer, ipFamilyMap[v1.IPv6Protocol])
if err != nil {
return nil, fmt.Errorf("unable to create ipv6 proxier: %v", err)
}
Expand Down
21 changes: 9 additions & 12 deletions pkg/proxy/ipvs/proxier.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -450,15 +450,13 @@ func NewProxier(ipt utiliptables.Interface,

endpointSlicesEnabled := utilfeature.DefaultFeatureGate.Enabled(features.EndpointSliceProxying)

isCIDR := true
ipFamilyIPMap := utilproxy.MapIPsToIPFamily(nodePortAddresses, isCIDR)
nodePortAddresses = ipFamilyIPMap[ipFamily]
for ipFam, ips := range ipFamilyIPMap {
// Log the IPs not matching the ipFamily
if ipFam != ipFamily && len(ips) > 0 {
klog.Warningf("IP Family: %s, NodePortAddresses of wrong family; %s", ipFamily, strings.Join(ips, ","))
}
ipFamilyMap := utilproxy.MapCIDRsByIPFamily(nodePortAddresses)
nodePortAddresses = ipFamilyMap[ipFamily]
// Log the IPs not matching the ipFamily
if ips, ok := ipFamilyMap[utilproxy.OtherIPFamily(ipFamily)]; ok && len(ips) > 0 {
klog.Warningf("IP Family: %s, NodePortAddresses of wrong family; %s", ipFamily, strings.Join(ips, ","))
}

proxier := &Proxier{
ipFamily: ipFamily,
portsMap: make(map[utilproxy.LocalPort]utilproxy.Closeable),
Expand Down Expand Up @@ -536,15 +534,14 @@ func NewDualStackProxier(

safeIpset := newSafeIpset(ipset)

isCIDR := true
ipFamilyIPMap := utilproxy.MapIPsToIPFamily(nodePortAddresses, isCIDR)
ipFamilyMap := utilproxy.MapCIDRsByIPFamily(nodePortAddresses)

// Create an ipv4 instance of the single-stack proxier
ipv4Proxier, err := NewProxier(ipt[0], ipvs, safeIpset, sysctl,
exec, syncPeriod, minSyncPeriod, filterCIDRs(false, excludeCIDRs), strictARP,
tcpTimeout, tcpFinTimeout, udpTimeout, masqueradeAll, masqueradeBit,
localDetectors[0], hostname, nodeIP[0],
recorder, healthzServer, scheduler, ipFamilyIPMap[v1.IPv4Protocol], kernelHandler)
recorder, healthzServer, scheduler, ipFamilyMap[v1.IPv4Protocol], kernelHandler)
if err != nil {
return nil, fmt.Errorf("unable to create ipv4 proxier: %v", err)
}
Expand All @@ -553,7 +550,7 @@ func NewDualStackProxier(
exec, syncPeriod, minSyncPeriod, filterCIDRs(true, excludeCIDRs), strictARP,
tcpTimeout, tcpFinTimeout, udpTimeout, masqueradeAll, masqueradeBit,
localDetectors[1], hostname, nodeIP[1],
nil, nil, scheduler, ipFamilyIPMap[v1.IPv6Protocol], kernelHandler)
nil, nil, scheduler, ipFamilyMap[v1.IPv6Protocol], kernelHandler)
if err != nil {
return nil, fmt.Errorf("unable to create ipv6 proxier: %v", err)
}
Expand Down
39 changes: 15 additions & 24 deletions pkg/proxy/service.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,25 +156,19 @@ func (sct *ServiceChangeTracker) newBaseServiceInfo(port *v1.ServicePort, servic
// services, this is actually expected. Hence we downgraded from reporting by events
// to just log lines with high verbosity

isCIDR := false
ipFamilyIPMap := utilproxy.MapIPsToIPFamily(service.Spec.ExternalIPs, isCIDR)
info.externalIPs = ipFamilyIPMap[sct.ipFamily]

for ipFam, ips := range ipFamilyIPMap {
// Log the IPs not matching the ipFamily
if ipFam != sct.ipFamily && len(ips) > 0 {
klog.V(4).Infof("service change tracker(%v) ignored the following external IPs(%s) for service %v/%v as they don't match IPFamily", sct.ipFamily, strings.Join(ips, ","), service.Namespace, service.Name)
}
ipFamilyMap := utilproxy.MapIPsByIPFamily(service.Spec.ExternalIPs)
info.externalIPs = ipFamilyMap[sct.ipFamily]

// Log the IPs not matching the ipFamily
if ips, ok := ipFamilyMap[utilproxy.OtherIPFamily(sct.ipFamily)]; ok && len(ips) > 0 {
klog.V(4).Infof("service change tracker(%v) ignored the following external IPs(%s) for service %v/%v as they don't match IPFamily", sct.ipFamily, strings.Join(ips, ","), service.Namespace, service.Name)
}

isCIDR = true
ipFamilyCIDRMap := utilproxy.MapIPsToIPFamily(loadBalancerSourceRanges, isCIDR)
info.loadBalancerSourceRanges = ipFamilyCIDRMap[sct.ipFamily]
for ipFam, cidrs := range ipFamilyCIDRMap {
// Log the CIDRs not matching the ipFamily
if ipFam != sct.ipFamily && len(cidrs) > 0 {
klog.V(4).Infof("service change tracker(%v) ignored the following load balancer source ranges(%s) for service %v/%v as they don't match IPFamily", sct.ipFamily, strings.Join(cidrs, ","), service.Namespace, service.Name)
}
ipFamilyMap = utilproxy.MapCIDRsByIPFamily(loadBalancerSourceRanges)
info.loadBalancerSourceRanges = ipFamilyMap[sct.ipFamily]
// Log the CIDRs not matching the ipFamily
if cidrs, ok := ipFamilyMap[utilproxy.OtherIPFamily(sct.ipFamily)]; ok && len(cidrs) > 0 {
klog.V(4).Infof("service change tracker(%v) ignored the following load balancer source ranges(%s) for service %v/%v as they don't match IPFamily", sct.ipFamily, strings.Join(cidrs, ","), service.Namespace, service.Name)
}

// Obtain Load Balancer Ingress IPs
Expand All @@ -184,17 +178,14 @@ func (sct *ServiceChangeTracker) newBaseServiceInfo(port *v1.ServicePort, servic
}

if len(ips) > 0 {
isCIDR = false
ipFamilyIPMap = utilproxy.MapIPsToIPFamily(ips, isCIDR)
ipFamilyMap = utilproxy.MapIPsByIPFamily(ips)

for ipFam, ipList := range ipFamilyIPMap {
if ipFam != sct.ipFamily && len(ipList) > 0 {
klog.V(4).Infof("service change tracker(%v) ignored the following load balancer(%s) ingress ips for service %v/%v as they don't match IPFamily", sct.ipFamily, strings.Join(ipList, ","), service.Namespace, service.Name)
if ipList, ok := ipFamilyMap[utilproxy.OtherIPFamily(sct.ipFamily)]; ok && len(ipList) > 0 {
klog.V(4).Infof("service change tracker(%v) ignored the following load balancer(%s) ingress ips for service %v/%v as they don't match IPFamily", sct.ipFamily, strings.Join(ipList, ","), service.Namespace, service.Name)

}
}
// Create the LoadBalancerStatus with the filtered IPs
for _, ip := range ipFamilyIPMap[sct.ipFamily] {
for _, ip := range ipFamilyMap[sct.ipFamily] {
info.loadBalancerStatus.Ingress = append(info.loadBalancerStatus.Ingress, v1.LoadBalancerIngress{IP: ip})
}
}
Expand Down
45 changes: 36 additions & 9 deletions pkg/proxy/util/utils.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -255,23 +255,50 @@ func LogAndEmitIncorrectIPVersionEvent(recorder record.EventRecorder, fieldName,
}
}

// MapIPsToIPFamily maps a slice of IPs to their respective IP families (v4 or v6)
func MapIPsToIPFamily(ipStrings []string, isCIDR bool) map[v1.IPFamily][]string {
// MapIPsByIPFamily maps a slice of IPs to their respective IP families (v4 or v6)
func MapIPsByIPFamily(ipStrings []string) map[v1.IPFamily][]string {
ipFamilyMap := map[v1.IPFamily][]string{}
for _, ip := range ipStrings {
ipFamily := getIPFamilyFromIP(ip, isCIDR)
ipFamilyMap[ipFamily] = append(ipFamilyMap[ipFamily], ip)
// Handle only the valid IPs
if net.ParseIP(ip) != nil {
ipFamily := getIPFamilyFromIP(ip)
ipFamilyMap[ipFamily] = append(ipFamilyMap[ipFamily], ip)
}
}
return ipFamilyMap
}

// MapCIDRsByIPFamily maps a slice of IPs to their respective IP families (v4 or v6)
func MapCIDRsByIPFamily(ipStrings []string) map[v1.IPFamily][]string {
ipFamilyMap := map[v1.IPFamily][]string{}
for _, cidr := range ipStrings {
// Handle only the valid CIDRs
if _, _, err := net.ParseCIDR(cidr); err == nil {
ipFamily := getIPFamilyFromCIDR(cidr)
ipFamilyMap[ipFamily] = append(ipFamilyMap[ipFamily], cidr)
}
}
return ipFamilyMap
}

func getIPFamilyFromIP(ip string, isCIDR bool) v1.IPFamily {
conditionFunc := utilnet.IsIPv6String
if isCIDR {
conditionFunc = utilnet.IsIPv6CIDRString
func getIPFamilyFromIP(ip string) v1.IPFamily {
if utilnet.IsIPv6String(ip) {
return v1.IPv6Protocol
}
return v1.IPv4Protocol
}

// OtherIPFamily returns the other ip family
func OtherIPFamily(ipFamily v1.IPFamily) v1.IPFamily {
if ipFamily == v1.IPv6Protocol {
return v1.IPv4Protocol
}

return v1.IPv6Protocol
}

if conditionFunc(ip) {
func getIPFamilyFromCIDR(ip string) v1.IPFamily {
if utilnet.IsIPv6CIDRString(ip) {
return v1.IPv6Protocol
}
return v1.IPv4Protocol
Expand Down
5 changes: 2 additions & 3 deletions pkg/proxy/util/utils_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -567,7 +567,7 @@ func TestShuffleStrings(t *testing.T) {
}
}

func TestMapIPsToIPFamily(t *testing.T) {
func TestMapIPsByIPFamily(t *testing.T) {
testCases := []struct {
desc string
ipString []string
Expand Down Expand Up @@ -657,8 +657,7 @@ func TestMapIPsToIPFamily(t *testing.T) {
otherIPFamily = v1.IPv4Protocol
}

isCIDR := false
ipMap := MapIPsToIPFamily(testcase.ipString, isCIDR)
ipMap := MapIPsByIPFamily(testcase.ipString)

if !reflect.DeepEqual(testcase.expectCorrect, ipMap[ipFamily]) {
t.Errorf("Test %v failed: expected %v, got %v", testcase.desc, testcase.expectCorrect, ipMap[ipFamily])
Expand Down

0 comments on commit 707073d

Please sign in to comment.