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

segments: ensure that the serf_lan_allowed_cidrs applies to network segments (#11495)

This commit is contained in:
R.B. Boyer 2021-11-04 17:17:19 -05:00 committed by GitHub
parent b7932cc39c
commit 7fbf749bc4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.changelog/11495.txt Normal file
View File

@ -0,0 +1,3 @@
```release-note:improvement
segments: **(Enterprise only)** ensure that the serf_lan_allowed_cidrs applies to network segments
```

12
agent/agent.go
View File

@ -1270,6 +1270,7 @@ func segmentConfig(config *config.RuntimeConfig) ([]consul.NetworkSegment, error
serfConf.MemberlistConfig.BindPort = s.Bind.Port serfConf.MemberlistConfig.BindPort = s.Bind.Port
serfConf.MemberlistConfig.AdvertiseAddr = s.Advertise.IP.String() serfConf.MemberlistConfig.AdvertiseAddr = s.Advertise.IP.String()
serfConf.MemberlistConfig.AdvertisePort = s.Advertise.Port serfConf.MemberlistConfig.AdvertisePort = s.Advertise.Port
serfConf.MemberlistConfig.CIDRsAllowed = config.SerfAllowedCIDRsLAN
if config.ReconnectTimeoutLAN != 0 { if config.ReconnectTimeoutLAN != 0 {
serfConf.ReconnectTimeout = config.ReconnectTimeoutLAN serfConf.ReconnectTimeout = config.ReconnectTimeoutLAN
@ -1565,6 +1566,17 @@ func (a *Agent) LANMembersInAgentPartition() []serf.Member {
return a.delegate.LANMembersInAgentPartition() return a.delegate.LANMembersInAgentPartition()
} }
// LANMembers returns the LAN members for one of:
//
// - the requested partition
// - the requested segment
// - all segments
//
// This is limited to segments and partitions that the node is a member of.
func (a *Agent) LANMembers(f consul.LANMemberFilter) ([]serf.Member, error) {
return a.delegate.LANMembers(f)
}
// WANMembers is used to retrieve the WAN members // WANMembers is used to retrieve the WAN members
func (a *Agent) WANMembers() []serf.Member { func (a *Agent) WANMembers() []serf.Member {
if srv, ok := a.delegate.(*consul.Server); ok { if srv, ok := a.delegate.(*consul.Server); ok {