Skip to content

OCPBUGS-36587: Filter ip family in router service controller #3593

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 3 commits into from
Jul 9, 2024
Merged

OCPBUGS-36587: Filter ip family in router service controller #3593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3bea049
OCPBUGS-36587: filter ip family in router service controller
pacevedom Jul 5, 2024
1c3160e
OCPBUGS-36587: Add further validations to listenAddress and IP family
pacevedom Jul 5, 2024
62dc711
OCPBUGS-36587: Nits for verify-go
pacevedom Jul 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 26 additions & 15 deletions pkg/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@ func (c *Config) validate() error {
}

if len(c.Ingress.ListenAddress) != 0 {
if err := validateRouterListenAddress(c.Ingress.ListenAddress, c.ApiServer.AdvertiseAddress, c.ApiServer.SkipInterface); err != nil {
if err := validateRouterListenAddress(c.Ingress.ListenAddress, c.ApiServer.AdvertiseAddress, c.ApiServer.SkipInterface, c.IsIPv4(), c.IsIPv6()); err != nil {
return fmt.Errorf("error validating ingress.listenAddress: %w", err)
}
}
Expand Down Expand Up @@ -464,8 +464,8 @@ func checkAdvertiseAddressConfigured(advertiseAddress string) error {
return fmt.Errorf("Advertise address: %s not present in any interface", advertiseAddress)
}

func validateRouterListenAddress(ingressListenAddresses []string, advertiseAddress string, skipInterface bool) error {
addresses, err := AllowedListeningIPAddresses()
func validateRouterListenAddress(ingressListenAddresses []string, advertiseAddress string, skipInterface, ipv4, ipv6 bool) error {
addresses, err := AllowedListeningIPAddresses(ipv4, ipv6)
if err != nil {
return err
}
Expand All @@ -474,18 +474,22 @@ func validateRouterListenAddress(ingressListenAddresses []string, advertiseAddre
return err
}
for _, entry := range ingressListenAddresses {
if net.ParseIP(entry) != nil {
if entry == advertiseAddress && !skipInterface {
if entry == advertiseAddress && !skipInterface {
continue
}
ip := net.ParseIP(entry)
if ip == nil {
if slices.Contains(nicNames, entry) {
continue
}
if !slices.Contains(addresses, entry) {
return fmt.Errorf("IP %v not present in any of the host's interfaces", entry)
}
} else if slices.Contains(nicNames, entry) {
continue
} else {
return fmt.Errorf("interface %v not present in the host", entry)
}
if (ip.To4() != nil && !ipv4) || (ip.To4() == nil && !ipv6) {
return fmt.Errorf("IP %v does not match family of service/cluster network", entry)
}
if !slices.Contains(addresses, entry) {
return fmt.Errorf("IP %v not present in any of the host's interfaces", entry)
}
}
return nil
}
Expand All @@ -502,7 +506,7 @@ func getForbiddenIPs() ([]*net.IPNet, error) {
return banned, nil
}

func getHostAddresses() ([]net.IP, error) {
func getHostAddresses(ipv4, ipv6 bool) ([]net.IP, error) {
handle, err := netlink.NewHandle()
if err != nil {
return nil, err
Expand All @@ -511,13 +515,20 @@ func getHostAddresses() ([]net.IP, error) {
if err != nil {
return nil, err
}
family := netlink.FAMILY_V4
if ipv6 {
family = netlink.FAMILY_ALL
if !ipv4 {
family = netlink.FAMILY_V6
}
}
addresses := make([]net.IP, 0, len(links)*2)
for _, link := range links {
// Filter out slave NICs. These include ovs/ovn created interfaces, in case of a restart.
if link.Attrs().ParentIndex != 0 || link.Attrs().MasterIndex != 0 {
continue
}
addressList, err := handle.AddrList(link, netlink.FAMILY_ALL)
addressList, err := handle.AddrList(link, family)
if err != nil {
return nil, err
}
Expand All @@ -528,12 +539,12 @@ func getHostAddresses() ([]net.IP, error) {
return addresses, nil
}

func AllowedListeningIPAddresses() ([]string, error) {
func AllowedListeningIPAddresses(ipv4, ipv6 bool) ([]string, error) {
bannedAddresses, err := getForbiddenIPs()
if err != nil {
return nil, err
}
hostAddresses, err := getHostAddresses()
hostAddresses, err := getHostAddresses(ipv4, ipv6)
if err != nil {
return nil, err
}
Expand Down
22 changes: 22 additions & 0 deletions pkg/config/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,6 +507,28 @@ func TestValidate(t *testing.T) {
}(),
expectErr: true,
},
{
name: "ingress-listen-address-bad-ip-family-1",
config: func() *Config {
c := mkDefaultConfig()
c.Ingress.ListenAddress = []string{"1.2.3.4"}
c.Network.ClusterNetwork = []string{"fd01::/48"}
c.Network.ServiceNetwork = []string{"fd02::/112"}
return c
}(),
expectErr: true,
},
{
name: "ingress-listen-address-bad-ip-family-2",
config: func() *Config {
c := mkDefaultConfig()
c.Ingress.ListenAddress = []string{"fe80::1"}
c.Network.ClusterNetwork = []string{"10.42.0.0/16"}
c.Network.ServiceNetwork = []string{"10.43.0.0/16"}
return c
}(),
expectErr: true,
},
{
name: "audit-log-flag-values-unexpected-values",
config: func() *Config {
Expand Down
6 changes: 5 additions & 1 deletion pkg/loadbalancerservice/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ type LoadbalancerServiceController struct {
NICNames []string
NodeIP string
KubeConfig string
Ipv4 bool
Ipv6 bool
client *kubernetes.Clientset
indexer cache.Indexer
queue workqueue.RateLimitingInterface
Expand All @@ -55,6 +57,8 @@ func NewLoadbalancerServiceController(cfg *config.Config) *LoadbalancerServiceCo
NICNames: nicNames,
NodeIP: cfg.Node.NodeIP,
KubeConfig: cfg.KubeConfigPath(config.KubeAdmin),
Ipv4: cfg.IsIPv4(),
Ipv6: cfg.IsIPv6(),
}
}

Expand Down Expand Up @@ -123,7 +127,7 @@ func (c *LoadbalancerServiceController) Run(ctx context.Context, ready chan<- st

go wait.Until(c.runWorker, time.Second, stopCh)

go defaultRouterWatch(c.IPAddresses, c.NICNames, c.updateDefaultRouterServiceStatus, stopCh)
go defaultRouterWatch(c.IPAddresses, c.NICNames, c.Ipv4, c.Ipv6, c.updateDefaultRouterServiceStatus, stopCh)

close(ready)

Expand Down
23 changes: 15 additions & 8 deletions pkg/loadbalancerservice/router.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ const (

type serviceUpdateFunction func([]string) error

func defaultRouterWatch(ipAddresses, nicNames []string, updateFunc serviceUpdateFunction, stopCh <-chan struct{}) {
func defaultRouterWatch(ipAddresses, nicNames []string, ipv4, ipv6 bool, updateFunc serviceUpdateFunction, stopCh <-chan struct{}) {
updateChan := make(chan netlink.AddrUpdate)
doneChan := make(chan struct{})
for {
ips, err := defaultRouterListenAddresses(ipAddresses, nicNames)
ips, err := defaultRouterListenAddresses(ipAddresses, nicNames, ipv4, ipv6)
if err != nil {
klog.ErrorS(err, "unable to determine default router listening addresses")
continue
Expand All @@ -41,7 +41,7 @@ func defaultRouterWatch(ipAddresses, nicNames []string, updateFunc serviceUpdate
for {
select {
case <-updateChan:
ips, err := defaultRouterListenAddresses(ipAddresses, nicNames)
ips, err := defaultRouterListenAddresses(ipAddresses, nicNames, ipv4, ipv6)
if err != nil {
klog.Errorf("unable to determine default router listening addresses: %v", err)
break
Expand All @@ -67,8 +67,8 @@ func isDefaultRouterService(svc *corev1.Service) bool {
svc.Namespace == defaultRouterServiceNamespace
}

func defaultRouterListenAddresses(ipAddresses, nicNames []string) ([]string, error) {
allowedAddresses, err := config.AllowedListeningIPAddresses()
func defaultRouterListenAddresses(ipAddresses, nicNames []string, ipv4, ipv6 bool) ([]string, error) {
allowedAddresses, err := config.AllowedListeningIPAddresses(ipv4, ipv6)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -98,7 +98,7 @@ func defaultRouterListenAddresses(ipAddresses, nicNames []string) ([]string, err
klog.Warningf("NIC %v not found in the host. Skipping", nicName)
continue
}
nicAddresses, err := ipAddressesFromNIC(nicName)
nicAddresses, err := ipAddressesFromNIC(nicName, ipv4, ipv6)
if err != nil {
return nil, err
}
Expand All @@ -122,13 +122,20 @@ func defaultRouterListenAddresses(ipAddresses, nicNames []string) ([]string, err
return ipList, nil
}

func ipAddressesFromNIC(name string) ([]string, error) {
func ipAddressesFromNIC(name string, ipv4, ipv6 bool) ([]string, error) {
link, err := netlink.LinkByName(name)
if err != nil {
return nil, err
}

addrList, err := netlink.AddrList(link, netlink.FAMILY_ALL)
family := netlink.FAMILY_V4
if ipv6 {
family = netlink.FAMILY_ALL
if !ipv4 {
family = netlink.FAMILY_V6
}
}
addrList, err := netlink.AddrList(link, family)
if err != nil {
return nil, err
}
Expand Down