refactor fsm-connector

charts/fsm/templates/fsm-consul-connector-deployment.yaml

@@ -58,7 +58,8 @@ spec:
             "-trust-domain", "{{.Values.fsm.trustDomain}}",
             "-derive-namespace={{.Values.fsm.cloudConnector.consul.deriveNamespace}}",
             "-with-gateway-api={{.Values.fsm.fsmGateway.enabled}}",
-            "-http-addr={{.Values.fsm.cloudConnector.consul.httpAddr}}",
+            "-sdr-provider=consul",
+            "-sdr-http-addr={{.Values.fsm.cloudConnector.consul.httpAddr}}",
             "-passing-only={{.Values.fsm.cloudConnector.consul.passingOnly}}",
             "-filter-tag={{.Values.fsm.cloudConnector.consul.filterTag}}",
             "-prefix-tag={{.Values.fsm.cloudConnector.consul.prefixTag}}",

charts/fsm/templates/fsm-eureka-connector-deployment.yaml

@@ -58,7 +58,8 @@ spec:
             "-trust-domain", "{{.Values.fsm.trustDomain}}",
             "-derive-namespace={{.Values.fsm.cloudConnector.eureka.deriveNamespace}}",
             "-with-gateway-api={{.Values.fsm.fsmGateway.enabled}}",
-            "-http-addr={{.Values.fsm.cloudConnector.eureka.httpAddr}}",
+            "-sdr-provider=eureka",
+            "-sdr-http-addr={{.Values.fsm.cloudConnector.eureka.httpAddr}}",
             "-passing-only={{.Values.fsm.cloudConnector.eureka.passingOnly}}",
             "-filter-tag={{.Values.fsm.cloudConnector.eureka.filterMetadata}}",
             "-prefix-tag={{.Values.fsm.cloudConnector.eureka.prefixMetadata}}",

cmd/fsm-connector/fsm-connector.go

@@ -14,6 +14,7 @@ import (
 	_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
 	"k8s.io/client-go/tools/clientcmd"
 
+	"github.com/flomesh-io/fsm/pkg/connector"
 	"github.com/flomesh-io/fsm/pkg/connector/cli"
 	"github.com/flomesh-io/fsm/pkg/connector/ctok"
 	"github.com/flomesh-io/fsm/pkg/connector/provider"
@@ -82,10 +83,21 @@ func main() {
 
 	msgBroker := messaging.NewBroker(stop)
 
-	discClient, err := provider.GetEurekaDiscoveryClient(cli.Cfg.HttpAddr)
-	if err != nil {
-		events.GenericEventRecorder().FatalEvent(err, events.InitializationError, "Error creating cloud client")
-		log.Fatal().Msg("Error creating cloud client")
+	var discClient provider.ServiceDiscoveryClient = nil
+	if connector.EurekaDiscoveryService == cli.Cfg.SdrProvider {
+		discClient, err = provider.GetEurekaDiscoveryClient(cli.Cfg.HttpAddr)
+		if err != nil {
+			events.GenericEventRecorder().FatalEvent(err, events.InitializationError, "Error creating cloud client")
+			log.Fatal().Msg("Error creating cloud client")
+		}
+	} else if connector.ConsulDiscoveryService == cli.Cfg.SdrProvider {
+		discClient, err = provider.GetConsulDiscoveryClient(cli.Cfg.HttpAddr)
+		if err != nil {
+			events.GenericEventRecorder().FatalEvent(err, events.InitializationError, "Error creating cloud client")
+			log.Fatal().Msg("Error creating cloud client")
+		}
+	} else {
+		log.Fatal().Msg("Unsupported service discovery and registration provider")
 	}
 
 	gatewayClient := gwapi.NewForConfigOrDie(kubeConfig)

pkg/connector/cli/flags.go

@@ -9,6 +9,8 @@ import (
 
 	mapset "github.com/deckarep/golang-set"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	"github.com/flomesh-io/fsm/pkg/connector"
 )
 
 var (
@@ -87,6 +89,7 @@ type Config struct {
 	FsmVersion        string
 	TrustDomain       string
 	DeriveNamespace   string
+	SdrProvider       string
 	HttpAddr          string
 
 	C2K C2KCfg
@@ -102,7 +105,8 @@ func init() {
 	flags.StringVar(&Cfg.FsmVersion, "fsm-version", "", "Version of FSM")
 	flags.StringVar(&Cfg.TrustDomain, "trust-domain", "cluster.local", "The trust domain to use as part of the common name when requesting new certificates")
 	flags.StringVar(&Cfg.DeriveNamespace, "derive-namespace", "", "derive namespace")
-	flags.StringVar(&Cfg.HttpAddr, "http-addr", "", "http addr")
+	flags.StringVar(&Cfg.SdrProvider, "sdr-provider", "", "service discovery and registration (eureka, consul)")
+	flags.StringVar(&Cfg.HttpAddr, "sdr-http-addr", "", "http addr")
 
 	flags.StringVar(&Cfg.C2K.FlagFilterTag, "filter-tag", "", "filter tag")
 	flags.StringVar(&Cfg.C2K.FlagPrefixTag, "prefix-tag", "", "prefix tag")
@@ -183,6 +187,14 @@ func ValidateCLIParams() error {
 		return fmt.Errorf("please specify the cloud derive namespace using -derive-namespace")
 	}
 
+	if Cfg.SdrProvider == "" || (connector.EurekaDiscoveryService != Cfg.SdrProvider && connector.ConsulDiscoveryService != Cfg.SdrProvider) {
+		return fmt.Errorf("please specify service discovery and registration provider using -sdr-provider")
+	}
+
+	if Cfg.HttpAddr == "" {
+		return fmt.Errorf("please specify service discovery and registration server address using -sdr-http-addr")
+	}
+
 	return nil
 }