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

Backport of add a conditional around setting LANFilter.AllSegments to make sure it is valid into release/1.16.x #18146

Merged
merged 5 commits into from
Jul 17, 2023
Merged

Backport of add a conditional around setting LANFilter.AllSegments to make sure it is valid into release/1.16.x #18146

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0b202a7
no-op commit due to failed cherry-picking
Jul 14, 2023
713d067
add a conditional around setting LANFilter.AllSegments to make sure i…
jmurret Jul 14, 2023
d45c8d9
Merge branch 'release/1.16.x' into backport/jm/all-segments/apparentl…
jmurret Jul 17, 2023
68f6cdb
Merge branch 'release/1.16.x' into backport/jm/all-segments/apparentl…
jmurret Jul 17, 2023
2af38fa
Merge branch 'release/1.16.x' into backport/jm/all-segments/apparentl…
jmurret Jul 17, 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
6 changes: 5 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,11 @@ 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