github/whereabouts
7
0
Fork 0
mirror of https://github.com/k8snetworkplumbingwg/whereabouts.git synced 2025-06-03 06:42:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

The node slice controller should only process valid whereabouts configurations

Browse Source 
If a net-attach-def with a whereabouts configuration was missing ranges, a comparison of the missing property would cause the node slice controller to crash
This commit is contained in:
dougbtv 2025-04-03 14:18:16 -04:00
parent a18f177e60
commit c903949fe3
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/node-controller/controller.go
View File

@ -2,6 +2,7 @@ package node_controller
import (
"context"
nativeerrors "errors"
"fmt"
"sort"
"time"
@ -271,6 +272,10 @@ func (c *Controller) processNextWorkItem(ctx context.Context) bool {
// Foo resource to be synced.
if err := c.syncHandler(ctx, key); err != nil {
// Put the item back on the workqueue to handle any transient errors.
if nativeerrors.Is(err, types.ErrNoIPRanges) {
logger.Info(fmt.Sprintf("Ignoring net-attach-def with no IP ranges '%s': %s", key, err.Error()))
return nil // Don't requeue
}
c.workqueue.AddRateLimited(key)
return fmt.Errorf("error syncing '%s': %s, requeuing", key, err.Error())
}
@ -505,6 +510,11 @@ func (c *Controller) checkForMultiNadMismatch(name, namespace string) error {
return err
}
// We need a valid IPAM configuration for comparison.
if len(ipamConf.IPRanges) == 0 {
return fmt.Errorf("%w: %s/%s", types.ErrNoIPRanges, namespace, name)
}
nadList, err := c.nadLister.List(labels.Everything())
if err != nil {
return err
@ -514,6 +524,11 @@ func (c *Controller) checkForMultiNadMismatch(name, namespace string) error {
if err != nil {
return err
}
if len(additionalIpamConf.IPRanges) == 0 {
continue // skip this net-attach-def, it has no ranges
}
if !checkIpamConfMatch(ipamConf, additionalIpamConf) {
return fmt.Errorf("found IPAM conf mismatch for network-attachment-definitions with same network name")
}

3
pkg/types/types.go
View File

@ -2,6 +2,7 @@ package types
import (
"encoding/json"
"errors"
"fmt"
"net"
"time"
@ -205,3 +206,5 @@ const (
// Deallocate operation identifier
Deallocate = 1
)
var ErrNoIPRanges = errors.New("no IP ranges in whereabouts config")