From 83e3818a09103d810b909a7491082a553406b44b Mon Sep 17 00:00:00 2001 From: Pablo Acevedo Montserrat Date: Fri, 21 Jun 2024 14:12:52 +0200 Subject: [PATCH] USHIFT-3002: Add ipv6 to router address handling --- pkg/config/config.go | 4 +++- pkg/loadbalancerservice/router.go | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/config/config.go b/pkg/config/config.go index c92c33b5127..21f3bc8868e 100644 --- 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 index bdd552ce7e2..61ca921a3d0 100644 --- 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 }