diff --git a/agent/xds/listeners.go b/agent/xds/listeners.go index 83adedb6bdb0..978960da4834 100644 --- a/agent/xds/listeners.go +++ b/agent/xds/listeners.go @@ -76,7 +76,7 @@ func (s *Server) listenersFromSnapshotConnectProxy(cInfo connectionInfo, cfgSnap port = cfgSnap.Proxy.TransparentProxy.OutboundListenerPort } - // TODO markan Investigate UDS for TransparentProxy, probably should not be part of first pass. + // TODO markan This shouldn't ever use a unix domain socket. outboundListener = makePortListener(OutboundListenerName, "127.0.0.1", port, envoy_core_v3.TrafficDirection_OUTBOUND) outboundListener.FilterChains = make([]*envoy_listener_v3.FilterChain, 0) outboundListener.ListenerFilters = []*envoy_listener_v3.ListenerFilter{ @@ -293,6 +293,7 @@ func (s *Server) listenersFromSnapshotConnectProxy(cInfo connectionInfo, cfgSnap // Configure additional listener for exposed check paths for _, path := range paths { clusterName := LocalAppClusterName + // TODO markan look through this code in more detail if path.LocalPathPort != cfgSnap.Proxy.LocalServicePort { clusterName = makeExposeClusterName(path.LocalPathPort) } diff --git a/api/agent.go b/api/agent.go index fef36117ee57..32bc31ab836a 100644 --- a/api/agent.go +++ b/api/agent.go @@ -81,7 +81,7 @@ type AgentService struct { Tags []string Meta map[string]string Port int - Address string + Address string // TODO markan SocketPath? TaggedAddresses map[string]ServiceAddress `json:",omitempty"` Weights AgentWeights EnableTagOverride bool @@ -117,7 +117,7 @@ type AgentServiceConnectProxyConfig struct { DestinationServiceName string `json:",omitempty"` DestinationServiceID string `json:",omitempty"` LocalServiceAddress string `json:",omitempty"` - LocalServicePort int `json:",omitempty"` + LocalServicePort int `json:",omitempty"` // TODO markan LocalSocketPath? Mode ProxyMode `json:",omitempty"` TransparentProxy TransparentProxyConfig `json:",omitempty"` Config map[string]interface{} `json:",omitempty" bexpr:"-"`