Extend the generic routeagent handler to the other drivers

This will allow for all those network plugins to be recognized with this same
route agent driver, and at the same time we could make specific modification
if this was ever required.

Signed-off-by: Miguel Angel Ajo <majopela@redhat.com>

pkg/event/handler.go

@@ -17,7 +17,7 @@ type Handler interface {
 	GetName() string
 
 	// GetNetworkPlugin returns the kubernetes network plugin that this handler supports.
-	GetNetworkPlugin() string
+	GetNetworkPlugins() []string
 
 	// Stop is called once during shutdown to let the handler perform any cleanup. The uninstall flag indicates
 	// whether or not Submariner is being completely uninstalled from the system.

pkg/event/logger/handler.go

@@ -21,8 +21,8 @@ func (l *Handler) GetName() string {
 	return "logger"
 }
 
-func (l *Handler) GetNetworkPlugin() string {
-	return event.AnyNetworkPlugin
+func (l *Handler) GetNetworkPlugins() []string {
+	return []string{event.AnyNetworkPlugin}
 }
 
 func (l *Handler) TransitionToNonGateway() error {

pkg/event/registry.go

@@ -10,6 +10,7 @@ import (
 	"github.com/submariner-io/admiral/pkg/log"
 
 	submV1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1"
+	"github.com/submariner-io/submariner/pkg/util"
 )
 
 type Registry struct {
@@ -34,9 +35,13 @@ func (er *Registry) GetName() string {
 }
 
 func (er *Registry) addHandler(eventHandler Handler) error {
-	evNetworkPlugin := eventHandler.GetNetworkPlugin()
+	evNetworkPlugins := util.NewStringSet()
 
-	if evNetworkPlugin == AnyNetworkPlugin || evNetworkPlugin == er.networkPlugin {
+	for _, np := range eventHandler.GetNetworkPlugins() {
+		evNetworkPlugins.Add(np)
+	}
+
+	if evNetworkPlugins.Contains(AnyNetworkPlugin) || evNetworkPlugins.Contains(er.networkPlugin) {
 		if err := eventHandler.Init(); err != nil {
 			return errors.Wrapf(err, "Event handler %q failed to initialize", eventHandler.GetName())
 		}

pkg/event/testing/testing.go

@@ -52,8 +52,8 @@ func (t *TestHandler) GetName() string {
 	return t.Name
 }
 
-func (t *TestHandler) GetNetworkPlugin() string {
-	return t.NetworkPlugin
+func (t *TestHandler) GetNetworkPlugins() []string {
+	return []string{t.NetworkPlugin}
 }
 
 const EvTransitionToNonGateway = "TransitionToNonGateway"

pkg/networkplugin-syncer/handlers/ovn/handler.go

@@ -31,11 +31,11 @@ func (ovn *SyncHandler) GetName() string {
 	return "ovn-sync-handler"
 }
 
-func (ovn *SyncHandler) GetNetworkPlugin() string {
-	return "OVNKubernetes"
+func (ovn *SyncHandler) GetNetworkPlugins() []string {
+	return []string{"OVNKubernetes"}
 }
 
-func NewSyncHandler(k8sClientset clientset.Interface) *SyncHandler {
+func NewSyncHandler(k8sClientset clientset.Interface) event.Handler {
 	return &SyncHandler{
 		remoteEndpoints: make(map[string]*submV1.Endpoint),
 		k8sClientset:    k8sClientset,

pkg/networkplugin-syncer/main.go

@@ -30,7 +30,13 @@ func main() {
 	// set up signals so we handle the first shutdown signal gracefully
 	stopCh := signals.SetupSignalHandler()
 
-	registry := event.NewRegistry("networkplugin-syncer", os.Getenv("NETWORK_PLUGIN"))
+	networkPlugin := os.Getenv("SUBMARINER_NETWORKPLUGIN")
+
+	if networkPlugin == "" {
+		networkPlugin = "generic"
+	}
+
+	registry := event.NewRegistry("networkplugin-syncer", networkPlugin)
 	if err := registry.AddHandlers(logger.NewHandler(), ovn.NewSyncHandler(getK8sClient())); err != nil {
 		klog.Fatalf("Error registering the handlers: %s", err.Error())
 	}

pkg/routeagent_driver/handlers/kubeproxy_iptables/kp_iptables.go

@@ -60,8 +60,8 @@ func (kp *SyncHandler) GetName() string {
 	return "kubeproxy-iptables-handler"
 }
 
-func (kp *SyncHandler) GetNetworkPlugin() string {
-	return event.AnyNetworkPlugin
+func (kp *SyncHandler) GetNetworkPlugins() []string {
+	return []string{"generic", "canal-flannel", "weave-net", "OpenShiftSDN"}
 }
 
 func (kp *SyncHandler) Init() error {

pkg/routeagent_driver/main.go

@@ -60,9 +60,16 @@ func main() {
 		klog.Errorf("Error while annotating the node: %s", err.Error())
 	}
 
-	registry := event.NewRegistry("routeagent_driver", os.Getenv("NETWORK_PLUGIN"))
-	if err := registry.AddHandlers(logger.NewHandler(),
-		kp_iptables.NewSyncHandler(env.ClusterCidr, env.ServiceCidr, smClientset)); err != nil {
+	np := os.Getenv("SUBMARINER_NETWORKPLUGIN")
+	if np == "" {
+		np = "generic"
+	}
+
+	registry := event.NewRegistry("routeagent_driver", np)
+	if err := registry.AddHandlers(
+		logger.NewHandler(),
+		kp_iptables.NewSyncHandler(env.ClusterCidr, env.ServiceCidr, smClientset),
+	); err != nil {
 		klog.Fatalf("Error registering the handlers: %s", err.Error())
 	}