USHIFT-3002: Add ipv6 to router address handling

openshift · Jun 21, 2024 · 83e3818 · 83e3818
1 parent 71d9c6b
commit 83e3818
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -35,6 +35,8 @@ var (
 	defaultRouterForbiddenCIDRs = []string{
 		"127.0.0.0/8",
 		"169.254.0.0/16",
+		"::1/128",
+		"fe80::/10",
 	}
 )
 
@@ -489,7 +491,7 @@ func getHostAddresses() ([]net.IP, error) {
 		if link.Attrs().ParentIndex != 0 || link.Attrs().MasterIndex != 0 {
 			continue
 		}
-		addressList, err := handle.AddrList(link, netlink.FAMILY_V4)
+		addressList, err := handle.AddrList(link, netlink.FAMILY_ALL)
 		if err != nil {
 			return nil, err
 		}

diff --git a/pkg/loadbalancerservice/router.go b/pkg/loadbalancerservice/router.go
@@ -128,7 +128,7 @@ func ipAddressesFromNIC(name string) ([]string, error) {
 		return nil, err
 	}
 
-	addrList, err := netlink.AddrList(link, netlink.FAMILY_V4)
+	addrList, err := netlink.AddrList(link, netlink.FAMILY_ALL)
 	if err != nil {
 		return nil, err
 	}