restored the exact behaviour for IPv4

Signed-off-by: Dan Finneran <daniel.finneran@gmail.com>
kube-vip · Sep 5, 2024 · 5512a08 · 5512a08
1 parent f438367
commit 5512a08
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/pkg/manager/service_egress.go b/pkg/manager/service_egress.go
@@ -46,7 +46,7 @@ func (sm *Manager) iptablesCheck() error {
 	return nil
 }
 
-func getSameFamilyCidr(sourceCidrs, ip string) string {
+func getSameFamilyCidr(sourceCidrs, ip string) string { //Todo: not sure how this ever worked
 	cidrs := strings.Split(sourceCidrs, ",")
 	for _, cidr := range cidrs {
 		// Is the ip an IPv6 address
@@ -56,7 +56,9 @@ func getSameFamilyCidr(sourceCidrs, ip string) string {
 			}
 		} else {
 			if vip.IsIPv4CIDR(cidr) {
-				return cidr
+				if vip.IsIPv4(cidr) == vip.IsIPv4(ip) {
+					return cidr
+				}
 			}
 		}
 	}

diff --git a/pkg/vip/util.go b/pkg/vip/util.go
@@ -106,12 +106,18 @@ func IsIPv6(address string) bool {
 
 func IsIPv4CIDR(cidr string) bool {
 	_, n, _ := net.ParseCIDR(cidr)
+	if n == nil {
+		return false
+	}
 	_, bits := n.Mask.Size()
 	return bits/8 == net.IPv4len
 }
 
 func IsIPv6CIDR(cidr string) bool {
 	_, n, _ := net.ParseCIDR(cidr)
+	if n == nil {
+		return false
+	}
 	_, bits := n.Mask.Size()
 	return bits/8 == net.IPv6len
 }