luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

fix: wan address isn't used by peering token

This commit is contained in:
cskh 2022-10-19 16:33:25 -04:00
parent 598670e376
commit c0dc93e5b8
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
agent/consul/peering_backend.go
View File

@ -205,6 +205,19 @@ func meshGatewayAdresses(state *state.Store, ws memdb.WatchSet, wan bool) ([]str
return addrs, nil return addrs, nil
} }
func parseNodeAddr(node *structs.ServiceNode) string {
// Prefer the wan address
if v, ok := node.TaggedAddresses[structs.TaggedAddressWANIPv4]; ok {
return v
}
if v, ok := node.TaggedAddresses[structs.TaggedAddressWAN]; ok {
return v
}
return node.Address
}
func serverAddresses(state *state.Store) ([]string, error) { func serverAddresses(state *state.Store) ([]string, error) {
_, nodes, err := state.ServiceNodes(nil, "consul", structs.DefaultEnterpriseMetaInDefaultPartition(), structs.DefaultPeerKeyword) _, nodes, err := state.ServiceNodes(nil, "consul", structs.DefaultEnterpriseMetaInDefaultPartition(), structs.DefaultPeerKeyword)
if err != nil { if err != nil {
@ -212,16 +225,18 @@ func serverAddresses(state *state.Store) ([]string, error) {
} }
var addrs []string var addrs []string
for _, node := range nodes { for _, node := range nodes {
addr := parseNodeAddr(node)
// Prefer the TLS port if it is defined. // Prefer the TLS port if it is defined.
grpcPortStr := node.ServiceMeta["grpc_tls_port"] grpcPortStr := node.ServiceMeta["grpc_tls_port"]
if v, err := strconv.Atoi(grpcPortStr); err == nil && v > 0 { if v, err := strconv.Atoi(grpcPortStr); err == nil && v > 0 {
addrs = append(addrs, node.Address+":"+grpcPortStr) addrs = append(addrs, addr+":"+grpcPortStr)
continue continue
} }
// Fallback to the standard port if TLS is not defined. // Fallback to the standard port if TLS is not defined.
grpcPortStr = node.ServiceMeta["grpc_port"] grpcPortStr = node.ServiceMeta["grpc_port"]
if v, err := strconv.Atoi(grpcPortStr); err == nil && v > 0 { if v, err := strconv.Atoi(grpcPortStr); err == nil && v > 0 {
addrs = append(addrs, node.Address+":"+grpcPortStr) addrs = append(addrs, addr+":"+grpcPortStr)
continue continue
} }
// Skip node if neither defined. // Skip node if neither defined.