make xds port (18000) configurable

Author: Xetera

cmd/localproxyd/daemon.go

@@ -27,6 +27,7 @@ type Config struct {
 	HTTPSRedirect    bool
 	TraceProcessLogs bool
 	EnvoyAdminPort   int
+	XDSPort          int
 }
 
 type Daemon struct {
@@ -147,15 +148,15 @@ func (d *Daemon) initCerts() error {
 func (d *Daemon) initXDS() error {
 	d.xdsServer = xds.NewServer()
 	d.xdsServer.SetHTTPSRedirect(d.config.HTTPSRedirect)
-	if err := d.xdsServer.Start(":18000"); err != nil {
+	if err := d.xdsServer.Start(fmt.Sprintf(":%d", d.config.XDSPort)); err != nil {
 		return err
 	}
-	log.Printf("xds server listening on :18000")
+	log.Printf("xds server listening on :%d", d.config.XDSPort)
 	return nil
 }
 
 func (d *Daemon) initEnvoy() error {
-	d.envoyMgr = envoy.NewManager(d.dataDir, "127.0.0.1:18000", d.xdsServer.NodeID(), d.config.LogLevel, d.config.EnvoyAdminPort)
+	d.envoyMgr = envoy.NewManager(d.dataDir, fmt.Sprintf("127.0.0.1:%d", d.config.XDSPort), d.xdsServer.NodeID(), d.config.LogLevel, d.config.EnvoyAdminPort)
 	if err := d.envoyMgr.Start(); err != nil {
 		return err
 	}

cmd/localproxyd/main.go

@@ -14,13 +14,15 @@ var logLevel string
 var httpsRedirect bool
 var traceProcessLogs bool
 var envoyAdminPort int
+var xdsPort int
 
 func init() {
 	pflag.StringArrayVar(&watchPaths, "watch", []string{}, "Folders to watch for processes (can be specified multiple times)")
 	pflag.StringVar(&logLevel, "log-level", "info", "Envoy log level (trace, debug, info, warning, error, critical, off)")
 	pflag.BoolVar(&httpsRedirect, "https-redirect", false, "Redirect HTTP requests to HTTPS")
 	pflag.BoolVar(&traceProcessLogs, "trace-process-logs", false, "Trace logs from spawned process stdout/stderr. Requires SIP to be disabled on macos (Will probably cause your system to freeze if you're below Tahoe)")
 	pflag.IntVar(&envoyAdminPort, "envoy-admin-port", 9901, "Envoy admin interface port")
+	pflag.IntVar(&xdsPort, "xds-port", 18000, "XDS server port")
 	pflag.Parse()
 }
 
@@ -33,6 +35,7 @@ func main() {
 		HTTPSRedirect:    httpsRedirect,
 		TraceProcessLogs: traceProcessLogs,
 		EnvoyAdminPort:   envoyAdminPort,
+		XDSPort:          xdsPort,
 	}
 
 	daemon, err := NewDaemon(cfg)

internal/envoy/manager.go

@@ -5,9 +5,11 @@ import (
 	"encoding/json"
 	"fmt"
 	"log"
+	"net"
 	"os"
 	"os/exec"
 	"path/filepath"
+	"strconv"
 	"sync"
 	"time"
 )
@@ -136,6 +138,15 @@ func (m *Manager) spawn() error {
 }
 
 func (m *Manager) writeBootstrapConfig() error {
+	xdsHost, xdsPortStr, err := net.SplitHostPort(m.xdsAddress)
+	if err != nil {
+		return fmt.Errorf("invalid xds address: %w", err)
+	}
+	xdsPort, err := strconv.Atoi(xdsPortStr)
+	if err != nil {
+		return fmt.Errorf("invalid xds port: %w", err)
+	}
+
 	config := map[string]interface{}{
 		"node": map[string]interface{}{
 			"id":      m.nodeID,
@@ -181,8 +192,8 @@ func (m *Manager) writeBootstrapConfig() error {
 							"endpoint": map[string]interface{}{
 								"address": map[string]interface{}{
 									"socket_address": map[string]interface{}{
-										"address":    "127.0.0.1",
-										"port_value": 18000,
+										"address":    xdsHost,
+										"port_value": xdsPort,
 									},
 								},
 							},