Skip to content

Commit

Permalink
Merge pull request #786 from jdrahos/rr_ipv4_785
Browse files Browse the repository at this point in the history 
Allow to configure RR cluster id using IPv4 strings
  • Loading branch information
@aauren
aauren committed Jul 16, 2020
2 parents aec73b8 + 8023f6a commit 031a992
Show file tree
Hide file tree
Showing 3 changed files with 215 additions and 9 deletions.
4 changes: 2 additions & 2 deletions pkg/controllers/routing/bgp_peers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,11 +148,11 @@ func (nrc *NetworkRoutingController) syncInternalPeers() {
n.RouteReflector = config.RouteReflector{
Config: config.RouteReflectorConfig{
RouteReflectorClient: true,
RouteReflectorClusterId: config.RrClusterIdType(fmt.Sprint(nrc.bgpClusterID)),
RouteReflectorClusterId: config.RrClusterIdType(nrc.bgpClusterID),
},
State: config.RouteReflectorState{
RouteReflectorClient: true,
RouteReflectorClusterId: config.RrClusterIdType(fmt.Sprint(nrc.bgpClusterID)),
RouteReflectorClusterId: config.RrClusterIdType(nrc.bgpClusterID),
},
}
}
Expand Down
18 changes: 11 additions & 7 deletions pkg/controllers/routing/network_routes_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ type NetworkRoutingController struct {
bgpPort uint16
bgpRRClient bool
bgpRRServer bool
bgpClusterID uint32
bgpClusterID string
cniConfFile string
disableSrcDstCheck bool
initSrcDstCheckDone bool
Expand Down Expand Up @@ -674,19 +674,23 @@ func (nrc *NetworkRoutingController) startBgpServer() error {

if clusterid, ok := node.ObjectMeta.Annotations[rrServerAnnotation]; ok {
glog.Infof("Found rr.server for the node to be %s from the node annotation", clusterid)
clusterID, err := strconv.ParseUint(clusterid, 0, 32)
_, err := strconv.ParseUint(clusterid, 0, 32)
if err != nil {
return errors.New("Failed to parse rr.server clusterId number specified for the the node")
if ip := net.ParseIP(clusterid).To4(); ip == nil {
return errors.New("Failed to parse rr.server clusterId specified for the node")
}
}
nrc.bgpClusterID = uint32(clusterID)
nrc.bgpClusterID = clusterid
nrc.bgpRRServer = true
} else if clusterid, ok := node.ObjectMeta.Annotations[rrClientAnnotation]; ok {
glog.Infof("Found rr.client for the node to be %s from the node annotation", clusterid)
clusterID, err := strconv.ParseUint(clusterid, 0, 32)
_, err := strconv.ParseUint(clusterid, 0, 32)
if err != nil {
return errors.New("Failed to parse rr.client clusterId number specified for the the node")
if ip := net.ParseIP(clusterid).To4(); ip == nil {
return errors.New("Failed to parse rr.client clusterId specified for the node")
}
}
nrc.bgpClusterID = uint32(clusterID)
nrc.bgpClusterID = clusterid
nrc.bgpRRClient = true
}

Expand Down
202 changes: 202 additions & 0 deletions pkg/controllers/routing/network_routes_controller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1347,6 +1347,208 @@ func Test_syncInternalPeers(t *testing.T) {
}
}

func Test_routeReflectorConfiguration(t *testing.T) {
testcases := []struct {
name string
nrc *NetworkRoutingController
node *v1core.Node
expectedRRServer bool
expectedRRClient bool
expectedClusterId string
expectedBgpToStart bool
}{
{
"RR server with int cluster id",
&NetworkRoutingController{
bgpFullMeshMode: false,
bgpPort: 10000,
clientset: fake.NewSimpleClientset(),
nodeIP: net.ParseIP("10.0.0.0"),
bgpServer: gobgp.NewBgpServer(),
activeNodes: make(map[string]bool),
nodeAsnNumber: 100,
hostnameOverride: "node-1",
},
&v1core.Node{
ObjectMeta: metav1.ObjectMeta{
Name: "node-1",
Annotations: map[string]string{
"kube-router.io/node.asn": "100",
rrServerAnnotation: "1",
},
},
},
true,
false,
"1",
true,
},
{
"RR server with IPv4 cluster id",
&NetworkRoutingController{
bgpFullMeshMode: false,
bgpPort: 10000,
clientset: fake.NewSimpleClientset(),
nodeIP: net.ParseIP("10.0.0.0"),
bgpServer: gobgp.NewBgpServer(),
activeNodes: make(map[string]bool),
nodeAsnNumber: 100,
hostnameOverride: "node-1",
},
&v1core.Node{
ObjectMeta: metav1.ObjectMeta{
Name: "node-1",
Annotations: map[string]string{
"kube-router.io/node.asn": "100",
rrServerAnnotation: "10.0.0.1",
},
},
},
true,
false,
"10.0.0.1",
true,
},
{
"RR client with int cluster id",
&NetworkRoutingController{
bgpFullMeshMode: false,
bgpPort: 10000,
clientset: fake.NewSimpleClientset(),
nodeIP: net.ParseIP("10.0.0.0"),
bgpServer: gobgp.NewBgpServer(),
activeNodes: make(map[string]bool),
nodeAsnNumber: 100,
hostnameOverride: "node-1",
},
&v1core.Node{
ObjectMeta: metav1.ObjectMeta{
Name: "node-1",
Annotations: map[string]string{
"kube-router.io/node.asn": "100",
rrClientAnnotation: "1",
},
},
},
false,
true,
"1",
true,
},
{
"RR client with IPv4 cluster id",
&NetworkRoutingController{
bgpFullMeshMode: false,
bgpPort: 10000,
clientset: fake.NewSimpleClientset(),
nodeIP: net.ParseIP("10.0.0.0"),
bgpServer: gobgp.NewBgpServer(),
activeNodes: make(map[string]bool),
nodeAsnNumber: 100,
hostnameOverride: "node-1",
},
&v1core.Node{
ObjectMeta: metav1.ObjectMeta{
Name: "node-1",
Annotations: map[string]string{
"kube-router.io/node.asn": "100",
rrClientAnnotation: "10.0.0.1",
},
},
},
false,
true,
"10.0.0.1",
true,
},
{
"RR server with unparseable cluster id",
&NetworkRoutingController{
bgpFullMeshMode: false,
bgpPort: 10000,
clientset: fake.NewSimpleClientset(),
nodeIP: net.ParseIP("10.0.0.0"),
bgpServer: gobgp.NewBgpServer(),
activeNodes: make(map[string]bool),
nodeAsnNumber: 100,
hostnameOverride: "node-1",
},
&v1core.Node{
ObjectMeta: metav1.ObjectMeta{
Name: "node-1",
Annotations: map[string]string{
"kube-router.io/node.asn": "100",
rrServerAnnotation: "10_0_0_1",
},
},
},
false,
false,
"",
false,
},
{
"RR client with unparseable cluster id",
&NetworkRoutingController{
bgpFullMeshMode: false,
bgpPort: 10000,
clientset: fake.NewSimpleClientset(),
nodeIP: net.ParseIP("10.0.0.0"),
bgpServer: gobgp.NewBgpServer(),
activeNodes: make(map[string]bool),
nodeAsnNumber: 100,
hostnameOverride: "node-1",
},
&v1core.Node{
ObjectMeta: metav1.ObjectMeta{
Name: "node-1",
Annotations: map[string]string{
"kube-router.io/node.asn": "100",
rrClientAnnotation: "10_0_0_1",
},
},
},
false,
false,
"",
false,
},
}

for _, testcase := range testcases {
t.Run(testcase.name, func(t *testing.T) {
if err := createNodes(testcase.nrc.clientset, []*v1core.Node{testcase.node}); err != nil {
t.Errorf("failed to create existing nodes: %v", err)
}

err := testcase.nrc.startBgpServer()
if err == nil {
defer testcase.nrc.bgpServer.Stop()
}

if testcase.expectedBgpToStart {
if err != nil {
t.Fatalf("failed to start BGP server: %v", err)
}
if testcase.expectedRRServer != testcase.nrc.bgpRRServer {
t.Error("Node suppose to be RR server")
}
if testcase.expectedRRClient != testcase.nrc.bgpRRClient {
t.Error("Node suppose to be RR client")
}
if testcase.expectedClusterId != testcase.nrc.bgpClusterID {
t.Errorf("Node suppose to have cluster id '%s' but got %s", testcase.expectedClusterId, testcase.nrc.bgpClusterID)
}
} else {
if err == nil {
t.Fatal("misconfigured BGP server not suppose to start")
}
}
})
}

}

/* Disabling test for now. OnNodeUpdate() behaviour is changed. test needs to be adopted.
func Test_OnNodeUpdate(t *testing.T) {
testcases := []struct {
Expand Down

0 comments on commit 031a992

Please sign in to comment.