Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add a conditional around setting LANFilter.AllSegments to make sure it is valid #18139

Merged
merged 2 commits into from
Jul 14, 2023
Merged

add a conditional around setting LANFilter.AllSegments to make sure it is valid #18139

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d714773
add a conditional around setting LANFilter.AllSegments to make sure i…
jmurret Jul 14, 2023
1a260c3
format file
jmurret Jul 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion agent/ui_endpoint.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,10 @@ func AgentMembersMapAddrVer(s *HTTPHandlers, req *http.Request) (map[string]stri
filter := consul.LANMemberFilter{
Partition: entMeta.PartitionOrDefault(),
}
filter.AllSegments = true
if acl.IsDefaultPartition(filter.Partition) {
filter.AllSegments = true
}

lanMembers, err := s.agent.delegate.LANMembers(filter)
if err != nil {
return nil, err
Expand Down