Skip to content

Split Connectivity into watcher/handler under felix #775

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

Open
sknat wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Split Connectivity into watcher/handler under felix #775

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
c93538b
Split felix server into watcher/handler
sknat Sep 1, 2025
9ff5761
Split CNI into watcher/handler under felix
sknat Oct 22, 2025
e12b068
Split Connectivity into watcher/handler under felix
sknat Sep 2, 2025
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
53 changes: 14 additions & 39 deletions calico-vpp-agent/cmd/calico_vpp_dataplane.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,14 @@ import (
apipb "github.com/osrg/gobgp/v3/api"
bgpserver "github.com/osrg/gobgp/v3/pkg/server"
"github.com/pkg/errors"
felixconfig "github.com/projectcalico/calico/felix/config"
calicov3cli "github.com/projectcalico/calico/libcalico-go/lib/clientv3"
"github.com/sirupsen/logrus"
"google.golang.org/grpc"
"gopkg.in/tomb.v2"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/rest"

"github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/cni"
"github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/common"
"github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/connectivity"
"github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/felix"
"github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/health"
"github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/prometheus"
Expand Down Expand Up @@ -154,16 +151,13 @@ func main() {
serviceServer := services.NewServiceServer(vpp, k8sclient, log.WithFields(logrus.Fields{"component": "services"}))
prometheusServer := prometheus.NewPrometheusServer(vpp, log.WithFields(logrus.Fields{"component": "prometheus"}))
localSIDWatcher := watchers.NewLocalSIDWatcher(vpp, clientv3, log.WithFields(logrus.Fields{"subcomponent": "localsid-watcher"}))
felixServer, err := felix.NewFelixServer(vpp, log.WithFields(logrus.Fields{"component": "policy"}))
if err != nil {
log.Fatalf("Failed to create policy server %s", err)
}
err = felix.InstallFelixPlugin()
felixServer := felix.NewFelixServer(vpp, clientv3, log.WithFields(logrus.Fields{"component": "policy"}))
felixWatcher := watchers.NewFelixWatcher(felixServer.GetFelixServerEventChan(), log.WithFields(logrus.Fields{"component": "felix watcher"}))
cniServer := watchers.NewCNIServer(felixServer.GetFelixServerEventChan(), log.WithFields(logrus.Fields{"component": "cni"}))
err = watchers.InstallFelixPlugin()
if err != nil {
log.Fatalf("could not install felix plugin: %s", err)
}
connectivityServer := connectivity.NewConnectivityServer(vpp, felixServer, clientv3, log.WithFields(logrus.Fields{"subcomponent": "connectivity"}))
cniServer := cni.NewCNIServer(vpp, felixServer, log.WithFields(logrus.Fields{"component": "cni"}))

/* Pubsub should now be registered */

Expand All @@ -175,8 +169,10 @@ func main() {
peerWatcher.SetBGPConf(bgpConf)
routingServer.SetBGPConf(bgpConf)
serviceServer.SetBGPConf(bgpConf)
felixServer.SetBGPConf(bgpConf)

Go(felixServer.ServeFelix)
Go(felixWatcher.WatchFelix)

/*
* Mark as unhealthy while waiting for Felix config
Expand All @@ -188,19 +184,16 @@ func main() {
ticker := time.NewTicker(10 * time.Second)
defer ticker.Stop()

var felixConfig interface{}
var ourBGPSpec interface{}
var ourBGPSpec *common.LocalNodeSpec
felixConfigReceived := false
bgpSpecReceived := false

for !felixConfigReceived || !bgpSpecReceived {
select {
case value := <-felixServer.FelixConfigChan:
felixConfig = value
case <-felixServer.GotFelixConfig:
felixConfigReceived = true
log.Info("FelixConfig received from calico pod")
case value := <-felixServer.GotOurNodeBGPchan:
ourBGPSpec = value
case ourBGPSpec = <-felixServer.GotOurNodeBGPchan():
bgpSpecReceived = true
log.Info("BGP spec received from node add")
case <-t.Dying():
Expand All @@ -220,19 +213,11 @@ func main() {
healthServer.SetComponentStatus(health.ComponentFelix, true, "Felix config received")
log.Info("Felix configuration received")

if ourBGPSpec != nil {
bgpSpec, ok := ourBGPSpec.(*common.LocalNodeSpec)
if !ok {
panic("ourBGPSpec is not *common.LocalNodeSpec")
}
prefixWatcher.SetOurBGPSpec(bgpSpec)
connectivityServer.SetOurBGPSpec(bgpSpec)
routingServer.SetOurBGPSpec(bgpSpec)
serviceServer.SetOurBGPSpec(bgpSpec)
localSIDWatcher.SetOurBGPSpec(bgpSpec)
netWatcher.SetOurBGPSpec(bgpSpec)
cniServer.SetOurBGPSpec(bgpSpec)
}
prefixWatcher.SetOurBGPSpec(ourBGPSpec)
routingServer.SetOurBGPSpec(ourBGPSpec)
serviceServer.SetOurBGPSpec(ourBGPSpec)
localSIDWatcher.SetOurBGPSpec(ourBGPSpec)
netWatcher.SetOurBGPSpec(ourBGPSpec)

if *config.GetCalicoVppFeatureGates().MultinetEnabled {
Go(netWatcher.WatchNetworks)
Expand All @@ -246,22 +231,12 @@ func main() {
}
}

if felixConfig != nil {
felixCfg, ok := felixConfig.(*felixconfig.Config)
if !ok {
panic("ourBGPSpec is not *felixconfig.Config")
}
cniServer.SetFelixConfig(felixCfg)
connectivityServer.SetFelixConfig(felixCfg)
}

Go(routeWatcher.WatchRoutes)
Go(linkWatcher.WatchLinks)
Go(bgpConfigurationWatcher.WatchBGPConfiguration)
Go(prefixWatcher.WatchPrefix)
Go(peerWatcher.WatchBGPPeers)
Go(bgpFilterWatcher.WatchBGPFilters)
Go(connectivityServer.ServeConnectivity)
Go(routingServer.ServeRouting)
Go(serviceServer.ServeService)
Go(cniServer.ServeCNI)
Expand Down
Loading
Loading