diff --git a/pkg/proxy/iptables/proxier.go b/pkg/proxy/iptables/proxier.go index 50d13c57308..6e455c49ddd 100644 --- a/pkg/proxy/iptables/proxier.go +++ b/pkg/proxy/iptables/proxier.go @@ -294,10 +294,14 @@ func NewProxier(ipt utiliptables.Interface, ipFamily = v1.IPv6Protocol } - var incorrectAddresses []string - nodePortAddresses, incorrectAddresses = utilproxy.FilterIncorrectCIDRVersion(nodePortAddresses, ipFamily) - if len(incorrectAddresses) > 0 { - klog.Warningf("NodePortAddresses of wrong family; %s", incorrectAddresses) + 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, ",")) + } } proxier := &Proxier{ @@ -367,17 +371,18 @@ func NewDualStackProxier( nodePortAddresses []string, ) (proxy.Provider, error) { // Create an ipv4 instance of the single-stack proxier - nodePortAddresses4, nodePortAddresses6 := utilproxy.FilterIncorrectCIDRVersion(nodePortAddresses, v1.IPv4Protocol) + isCIDR := true + ipFamilyIPMap := utilproxy.MapIPsToIPFamily(nodePortAddresses, isCIDR) ipv4Proxier, err := NewProxier(ipt[0], sysctl, exec, syncPeriod, minSyncPeriod, masqueradeAll, masqueradeBit, localDetectors[0], hostname, - nodeIP[0], recorder, healthzServer, nodePortAddresses4) + nodeIP[0], recorder, healthzServer, ipFamilyIPMap[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, nodePortAddresses6) + nodeIP[1], recorder, healthzServer, ipFamilyIPMap[v1.IPv6Protocol]) if err != nil { return nil, fmt.Errorf("unable to create ipv6 proxier: %v", err) } diff --git a/pkg/proxy/ipvs/proxier.go b/pkg/proxy/ipvs/proxier.go index 7d67008332c..8062619a9ee 100644 --- a/pkg/proxy/ipvs/proxier.go +++ b/pkg/proxy/ipvs/proxier.go @@ -450,10 +450,14 @@ func NewProxier(ipt utiliptables.Interface, endpointSlicesEnabled := utilfeature.DefaultFeatureGate.Enabled(features.EndpointSliceProxying) - var incorrectAddresses []string - nodePortAddresses, incorrectAddresses = utilproxy.FilterIncorrectCIDRVersion(nodePortAddresses, ipFamily) - if len(incorrectAddresses) > 0 { - klog.Warningf("NodePortAddresses of wrong family; %s", incorrectAddresses) + 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, ",")) + } } proxier := &Proxier{ ipFamily: ipFamily, @@ -532,14 +536,15 @@ func NewDualStackProxier( safeIpset := newSafeIpset(ipset) - nodePortAddresses4, nodePortAddresses6 := utilproxy.FilterIncorrectCIDRVersion(nodePortAddresses, v1.IPv4Protocol) + isCIDR := true + ipFamilyIPMap := utilproxy.MapIPsToIPFamily(nodePortAddresses, isCIDR) // 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, nodePortAddresses4, kernelHandler) + recorder, healthzServer, scheduler, ipFamilyIPMap[v1.IPv4Protocol], kernelHandler) if err != nil { return nil, fmt.Errorf("unable to create ipv4 proxier: %v", err) } @@ -548,7 +553,7 @@ func NewDualStackProxier( exec, syncPeriod, minSyncPeriod, filterCIDRs(true, excludeCIDRs), strictARP, tcpTimeout, tcpFinTimeout, udpTimeout, masqueradeAll, masqueradeBit, localDetectors[1], hostname, nodeIP[1], - nil, nil, scheduler, nodePortAddresses6, kernelHandler) + nil, nil, scheduler, ipFamilyIPMap[v1.IPv6Protocol], kernelHandler) if err != nil { return nil, fmt.Errorf("unable to create ipv6 proxier: %v", err) } diff --git a/pkg/proxy/service.go b/pkg/proxy/service.go index a00b2ddab1c..5d1392f6af5 100644 --- a/pkg/proxy/service.go +++ b/pkg/proxy/service.go @@ -156,15 +156,25 @@ 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 - var incorrectIPs []string - info.externalIPs, incorrectIPs = utilproxy.FilterIncorrectIPVersion(service.Spec.ExternalIPs, sct.ipFamily) - if len(incorrectIPs) > 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(incorrectIPs, ","), service.Namespace, service.Name) + 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) + } } - info.loadBalancerSourceRanges, incorrectIPs = utilproxy.FilterIncorrectCIDRVersion(loadBalancerSourceRanges, sct.ipFamily) - if len(incorrectIPs) > 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(incorrectIPs, ","), 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) + } } // Obtain Load Balancer Ingress IPs @@ -174,14 +184,17 @@ func (sct *ServiceChangeTracker) newBaseServiceInfo(port *v1.ServicePort, servic } if len(ips) > 0 { - correctIPs, incorrectIPs := utilproxy.FilterIncorrectIPVersion(ips, sct.ipFamily) + isCIDR := false + ipFamilyIPMap := utilproxy.MapIPsToIPFamily(ips, isCIDR) - if len(incorrectIPs) > 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(incorrectIPs, ","), service.Namespace, service.Name) + 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) + } } // Create the LoadBalancerStatus with the filtered IPs - for _, ip := range correctIPs { + for _, ip := range ipFamilyIPMap[sct.ipFamily] { info.loadBalancerStatus.Ingress = append(info.loadBalancerStatus.Ingress, v1.LoadBalancerIngress{IP: ip}) } } diff --git a/pkg/proxy/service_test.go b/pkg/proxy/service_test.go index a690608a885..0329b8ace31 100644 --- a/pkg/proxy/service_test.go +++ b/pkg/proxy/service_test.go @@ -434,7 +434,9 @@ func TestServiceToServiceMap(t *testing.T) { }, }, { - desc: "service with extra space in LoadBalancerSourceRanges", + desc: "service with extra space in LoadBalancerSourceRanges", + ipFamily: v1.IPv4Protocol, + service: &v1.Service{ ObjectMeta: metav1.ObjectMeta{ Name: "extra-space", diff --git a/pkg/proxy/util/utils.go b/pkg/proxy/util/utils.go index 2031cd1a09e..e3cd9e8e048 100644 --- a/pkg/proxy/util/utils.go +++ b/pkg/proxy/util/utils.go @@ -255,26 +255,26 @@ func LogAndEmitIncorrectIPVersionEvent(recorder record.EventRecorder, fieldName, } } -// FilterIncorrectIPVersion filters out the incorrect IP version case from a slice of IP strings. -func FilterIncorrectIPVersion(ipStrings []string, ipfamily v1.IPFamily) ([]string, []string) { - return filterWithCondition(ipStrings, (ipfamily == v1.IPv6Protocol), utilnet.IsIPv6String) -} - -// FilterIncorrectCIDRVersion filters out the incorrect IP version case from a slice of CIDR strings. -func FilterIncorrectCIDRVersion(ipStrings []string, ipfamily v1.IPFamily) ([]string, []string) { - return filterWithCondition(ipStrings, (ipfamily == v1.IPv6Protocol), utilnet.IsIPv6CIDRString) -} - -func filterWithCondition(strs []string, expectedCondition bool, conditionFunc func(string) bool) ([]string, []string) { - var corrects, incorrects []string - for _, str := range strs { - if conditionFunc(str) != expectedCondition { - incorrects = append(incorrects, str) - } else { - corrects = append(corrects, str) - } +// MapIPsToIPFamily maps a slice of IPs to their respective IP families (v4 or v6) +func MapIPsToIPFamily(ipStrings []string, isCIDR bool) map[v1.IPFamily][]string { + ipFamilyMap := map[v1.IPFamily][]string{} + for _, ip := range ipStrings { + ipFamily := getIPFamilyFromIP(ip, isCIDR) + ipFamilyMap[ipFamily] = append(ipFamilyMap[ipFamily], ip) } - return corrects, incorrects + return ipFamilyMap +} + +func getIPFamilyFromIP(ip string, isCIDR bool) v1.IPFamily { + conditionFunc := utilnet.IsIPv6String + if isCIDR { + conditionFunc = utilnet.IsIPv6CIDRString + } + + if conditionFunc(ip) { + return v1.IPv6Protocol + } + return v1.IPv4Protocol } // AppendPortIfNeeded appends the given port to IP address unless it is already in diff --git a/pkg/proxy/util/utils_test.go b/pkg/proxy/util/utils_test.go index f10a95c88b3..e545d74687d 100644 --- a/pkg/proxy/util/utils_test.go +++ b/pkg/proxy/util/utils_test.go @@ -567,7 +567,7 @@ func TestShuffleStrings(t *testing.T) { } } -func TestFilterIncorrectIPVersion(t *testing.T) { +func TestMapIPsToIPFamily(t *testing.T) { testCases := []struct { desc string ipString []string @@ -650,15 +650,21 @@ func TestFilterIncorrectIPVersion(t *testing.T) { for _, testcase := range testCases { t.Run(testcase.desc, func(t *testing.T) { ipFamily := v1.IPv4Protocol + otherIPFamily := v1.IPv6Protocol + if testcase.wantIPv6 { ipFamily = v1.IPv6Protocol + otherIPFamily = v1.IPv4Protocol } - correct, incorrect := FilterIncorrectIPVersion(testcase.ipString, ipFamily) - if !reflect.DeepEqual(testcase.expectCorrect, correct) { - t.Errorf("Test %v failed: expected %v, got %v", testcase.desc, testcase.expectCorrect, correct) + + isCIDR := false + ipMap := MapIPsToIPFamily(testcase.ipString, isCIDR) + + if !reflect.DeepEqual(testcase.expectCorrect, ipMap[ipFamily]) { + t.Errorf("Test %v failed: expected %v, got %v", testcase.desc, testcase.expectCorrect, ipMap[ipFamily]) } - if !reflect.DeepEqual(testcase.expectIncorrect, incorrect) { - t.Errorf("Test %v failed: expected %v, got %v", testcase.desc, testcase.expectIncorrect, incorrect) + if !reflect.DeepEqual(testcase.expectIncorrect, ipMap[otherIPFamily]) { + t.Errorf("Test %v failed: expected %v, got %v", testcase.desc, testcase.expectIncorrect, ipMap[otherIPFamily]) } }) }