Skip to content

Commit

Permalink
Downstreams stuff to think about
Browse files Browse the repository at this point in the history
Signed-off-by: Mark Anderson <[email protected]>
  • Loading branch information
markan committed Apr 14, 2021
1 parent cb2b4bc commit aa5d3b1
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
3 changes: 2 additions & 1 deletion agent/xds/listeners.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down Expand Up @@ -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)
}
Expand Down
4 changes: 2 additions & 2 deletions api/agent.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:"-"`
Expand Down

0 comments on commit aa5d3b1

Please sign in to comment.