Fix: Add Route Reconciliation #1749
Conversation
aauren
added
the
override-stale
| @@ -0,0 +1,45 @@ | |||
| package pkg | |||
There was a problem hiding this comment.
@twz123 I wanted to get your feedback about this convention within Go.
As I started to get into the refactoring of InjectRoute, I found that I kept getting into circular dependency type situations between the bgp and routes packages.
After watching a video from Brian Ketelsen about structuring go programs, as well as several other posts, it seems like pulling up your domain models into the root of the project is a conventional way of working around circular dependencies.
Doing this with the below methods, did work out for me, but I noticed that this architecture is limited. For instance, I couldn't leave the TunnelCreator interface with EncapType and EncapPort because those are declared in the tunnels package. And for some reason, it didn't feel right to bring those up into this top level package either.
So I worked around it for now, but maybe this is showing that either I should have brought them up, or that maybe I'm embracing the wrong pattern here.
I would be curious for your thoughts.
| @@ -1,82 +0,0 @@ | |||
| package routes | |||
There was a problem hiding this comment.
@twz123 I ended up bringing this back into the routing package because I realized that it was behaving a bit more like an extension of the NetworkRoutesController, in that, in order to have it process route reconciliation I needed it to work with the routes source of truth, which is BGP. At that point it is no longer strictly related to host routes (although now that I'm thinking about it, it means that maybe host_route_sync.go isn't the right name for the file any more either.
Anyway, curious about your thoughts here as well.
| @@ -30,3 +32,109 @@ func DeleteByDestination(destinationSubnet *net.IPNet) error { | |||
| } | |||
| return nil | |||
| } | |||
|
|
|||
| func InjectRoute(subnet *net.IPNet, gw net.IP, ipa utils.NodeIPAware, tn pkg.Tunneler, rs pkg.RouteSyncer, | |||
There was a problem hiding this comment.
@twz123 - Now that this logic is disentangled with the BGP logic that used to be buried in here I like it a lot better. It feels a lot cleaner and more straight forward to me.
| "k8s.io/klog/v2" | ||
| ) | ||
|
|
||
| func PathChanged(path *gobgpapi.Path, pl PeerLister, rs pkg.RouteSyncer, tc pkg.TunnelCleaner) error { |
There was a problem hiding this comment.
@twz123 - This feels like the right pattern, because it decouples the routes package from the bgp package by making it implementation agnostic. So I think that making all of the arguments to this function interfaces is the right thing to do, but wanted to see if you had any feedback.
This PR is still very early and is not fully implemented, but I wanted to start to get some feedback going on the direction of this before I got too much further down the road.
The end goal of this PR is to enable route reconciliation within the route sync controller. However, in order to do that, I wanted to break out
injectRoute()from the NetworkRoutesController.Also, over the years, it has become obvious that the
injectRoute()function is hard for new users to parse, and there is often a lot of confusion about how it works because the logic is complicated. So this also attempts to split out the logic in inject route into BGP type logic as well as Route type logic.