From 233d03dbbd365dacb5a453cb0bae6d13ca96e4b7 Mon Sep 17 00:00:00 2001 From: Daniel Nephin Date: Mon, 12 Jul 2021 12:32:45 -0400 Subject: [PATCH] Apply suggestions from code review Co-authored-by: R.B. Boyer <4903+rboyer@users.noreply.github.com> --- agent/config/runtime.go | 6 +++--- command/agent/agent.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/agent/config/runtime.go b/agent/config/runtime.go index f3f9e6fb6d..65d3b0d4d4 100644 --- a/agent/config/runtime.go +++ b/agent/config/runtime.go @@ -718,8 +718,8 @@ type RuntimeConfig struct { // XDSPort is the port the xDS gRPC server listens on. This port only // exposes the xDS and ext_authz APIs for Envoy and it is disabled by default. // - // hcl: ports { grpc = int } - // flags: -grpc-port int + // hcl: ports { xds = int } + // flags: -xds-port int XDSPort int // XDSAddrs contains the list of TCP addresses and UNIX sockets the xDS gRPC @@ -734,7 +734,7 @@ type RuntimeConfig struct { // If 'addresses.xds' was not provided the 'client_addr' addresses are // used. // - // hcl: client_addr = string addresses { grpc = string } ports { grpc = int } + // hcl: client_addr = string addresses { xds = string } ports { xds = int } XDSAddrs []net.Addr // HTTPAddrs contains the list of TCP addresses and UNIX sockets the HTTP diff --git a/command/agent/agent.go b/command/agent/agent.go index 55c7e4725a..1291237a6a 100644 --- a/command/agent/agent.go +++ b/command/agent/agent.go @@ -200,7 +200,7 @@ func (c *cmd) run(args []string) int { } ui.Info(fmt.Sprintf(" Datacenter: '%s' (Segment: '%s')", config.Datacenter, segment)) ui.Info(fmt.Sprintf(" Server: %v (Bootstrap: %v)", config.ServerMode, config.Bootstrap)) - ui.Info(fmt.Sprintf(" Client Addr: %v (HTTP: %d, HTTPS: %d, gRPC: %d, DNS: %d)", config.ClientAddrs, + ui.Info(fmt.Sprintf(" Client Addr: %v (HTTP: %d, HTTPS: %d, xDS: %d, DNS: %d)", config.ClientAddrs, config.HTTPPort, config.HTTPSPort, config.XDSPort, config.DNSPort)) ui.Info(fmt.Sprintf(" Cluster Addr: %v (LAN: %d, WAN: %d)", config.AdvertiseAddrLAN, config.SerfPortLAN, config.SerfPortWAN))