Merge pull request #10 from hashicorp/chappie/NET-824/flags

Add ability to pass in flags for consul dataplane

Author: chapmanc

cmd/consul-dataplane/main.go

@@ -32,10 +32,11 @@ var (
 
 	useCentralTelemetryConfig bool
 
-	adminBindAddr string
-	adminBindPort int
-	readyBindAddr string
-	readyBindPort int
+	adminBindAddr    string
+	adminBindPort    int
+	readyBindAddr    string
+	readyBindPort    int
+	envoyConcurrency int
 
 	xdsBindAddr string
 	xdsBindPort int
@@ -72,6 +73,7 @@ func init() {
 	flag.IntVar(&adminBindPort, "envoy-admin-bind-port", 19000, "The port on which the Envoy admin server will be available.")
 	flag.StringVar(&readyBindAddr, "envoy-ready-bind-address", "", "The address on which Envoy's readiness probe will be available.")
 	flag.IntVar(&readyBindPort, "envoy-ready-bind-port", 0, "The port on which Envoy's readiness probe will be available.")
+	flag.IntVar(&envoyConcurrency, "envoy-concurrency", 2, "The envoy concurrency denotes the number of threads that envoy will use https://www.envoyproxy.io/docs/envoy/latest/operations/cli#cmdoption-concurrency.")
 
 	flag.StringVar(&xdsBindAddr, "xds-bind-addr", "127.0.0.1", "The address on which the Envoy xDS server will be available.")
 	flag.IntVar(&xdsBindPort, "xds-bind-port", 0, "The port on which the Envoy xDS server will be available.")
@@ -127,6 +129,8 @@ func main() {
 			AdminBindPort:    adminBindPort,
 			ReadyBindAddress: readyBindAddr,
 			ReadyBindPort:    readyBindPort,
+			EnvoyConcurrency: envoyConcurrency,
+			ExtraArgs:        flag.Args(),
 		},
 		XDSServer: &consuldp.XDSServer{
 			BindAddress: xdsBindAddr,

pkg/consuldp/config.go

@@ -74,6 +74,10 @@ type EnvoyConfig struct {
 	ReadyBindAddress string
 	// ReadyBindPort is the port on which the Envoy readiness probe will be available.
 	ReadyBindPort int
+	// EnvoyConcurrency is the envoy concurrency https://www.envoyproxy.io/docs/envoy/latest/operations/cli#cmdoption-concurrency
+	EnvoyConcurrency int
+	// ExtraArgs are the extra arguments passed to envoy at startup of the proxy
+	ExtraArgs []string
 }
 
 // XDSServer contains the configuration of the xDS server.

pkg/consuldp/consul_dataplane.go

@@ -177,11 +177,7 @@ func (cdp *ConsulDataplane) Run(ctx context.Context) error {
 	}
 	cdp.logger.Debug("generated envoy bootstrap config", "config", string(cfg))
 
-	proxy, err := envoy.NewProxy(envoy.ProxyConfig{
-		Logger:          cdp.logger,
-		LogJSON:         cdp.cfg.Logging.LogJSON,
-		BootstrapConfig: cfg,
-	})
+	proxy, err := envoy.NewProxy(cdp.envoyProxyConfig(cfg))
 	if err != nil {
 		cdp.logger.Error("failed to create new proxy", "error", err)
 		return fmt.Errorf("failed to create new proxy: %w", err)
@@ -210,3 +206,25 @@ func (cdp *ConsulDataplane) Run(ctx context.Context) error {
 	}()
 	return <-doneCh
 }
+
+func (cdp *ConsulDataplane) envoyProxyConfig(cfg []byte) envoy.ProxyConfig {
+	setConcurrency := true
+	extraArgs := cdp.cfg.Envoy.ExtraArgs
+	// Users could set the concurrency as an extra args. Take that as priority for best ux
+	// experience.
+	for _, v := range extraArgs {
+		if v == "--concurrency" {
+			setConcurrency = false
+		}
+	}
+	if setConcurrency {
+		extraArgs = append(extraArgs, fmt.Sprintf("--concurrency %v", cdp.cfg.Envoy.EnvoyConcurrency))
+	}
+
+	return envoy.ProxyConfig{
+		Logger:          cdp.logger,
+		LogJSON:         cdp.cfg.Logging.LogJSON,
+		BootstrapConfig: cfg,
+		ExtraArgs:       extraArgs,
+	}
+}