Initial commit for adding support for -- envoy flags

Author: Chris Chapman

cmd/consul-dataplane/main.go

@@ -86,6 +86,8 @@ func main() {
 
 	validateFlags()
 
+	extraEnvoyArgs := flag.Args()
+
 	consuldpCfg := &consuldp.Config{
 		Consul: &consuldp.ConsulConfig{
 			Addresses: addresses,
@@ -116,6 +118,7 @@ func main() {
 			AdminBindPort:    adminBindPort,
 			ReadyBindAddress: readyBindAddr,
 			ReadyBindPort:    readyBindPort,
+			ExtraArgs:        extraEnvoyArgs,
 		},
 		XDSServer: &consuldp.XDSServer{
 			BindAddress: xdsBindAddr,

pkg/consuldp/config.go

@@ -74,6 +74,8 @@ type EnvoyConfig struct {
 	ReadyBindAddress string
 	// ReadyBindPort is the port on which the Envoy readiness probe will be available.
 	ReadyBindPort 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

@@ -181,6 +181,7 @@ func (cdp *ConsulDataplane) Run(ctx context.Context) error {
 		Logger:          cdp.logger,
 		LogJSON:         cdp.cfg.Logging.LogJSON,
 		BootstrapConfig: cfg,
+		ExtraArgs:       cdp.cfg.Envoy.ExtraArgs,
 	})
 	if err != nil {
 		cdp.logger.Error("failed to create new proxy", "error", err)