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

Update filter chain creation for sidecar/ingress listeners #11245

Merged
merged 16 commits into from
Nov 9, 2021
Merged

Update filter chain creation for sidecar/ingress listeners #11245

Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
c4b75fd
Remove unused param
freddygv Oct 6, 2021
47c19c8
Extract function for disco target from tcp chain
freddygv Oct 6, 2021
4f91727
Consolidate RDS logic
freddygv Oct 6, 2021
79b8e00
Shuffle around coalescing of name/ns/dc/ap
freddygv Oct 6, 2021
6e427b9
Simplify filter name overriding logic
freddygv Oct 6, 2021
725d5a4
Rename function since it's not only used with discovery chains
freddygv Oct 6, 2021
ac79dc7
Extract RDS logic since it's only relevant to disco chains
freddygv Oct 6, 2021
b8f3a1a
Move ns/partition defaulting upstream
freddygv Oct 6, 2021
244f405
Extract cluster and filter name creation
freddygv Oct 6, 2021
deb9e79
Migrate ingress listener gen away from old fn
freddygv Oct 6, 2021
8bb3597
Add test for upstream defaults
freddygv Oct 7, 2021
d76faa1
Update test
freddygv Oct 7, 2021
2c2160e
Minor changes to useRDS
freddygv Oct 7, 2021
e62cbd1
PR comments
freddygv Nov 9, 2021
0c97455
Regen golden files
freddygv Nov 9, 2021
b4c2d5c
Add changelog entry
freddygv Nov 9, 2021
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
3 changes: 2 additions & 1 deletion agent/proxycfg/state.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,11 +114,12 @@ func copyProxyConfig(ns *structs.NodeService) (structs.ConnectProxyConfig, error
for idx := range proxyCfg.Upstreams {
us := &proxyCfg.Upstreams[idx]
if us.DestinationType != structs.UpstreamDestTypePreparedQuery && us.DestinationNamespace == "" {
// default the upstreams target namespace to the namespace of the proxy
// default the upstreams target namespace and partition to those of the proxy
// doing this here prevents needing much more complex logic a bunch of other
// places and makes tracking these upstreams simpler as we can dedup them
// with the maps tracking upstream ids being watched.
proxyCfg.Upstreams[idx].DestinationNamespace = ns.EnterpriseMeta.NamespaceOrDefault()
proxyCfg.Upstreams[idx].DestinationPartition = ns.EnterpriseMeta.PartitionOrDefault()
}
}

Expand Down
1 change: 1 addition & 0 deletions agent/proxycfg/state_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1686,6 +1686,7 @@ func TestState_WatchesAndUpdates(t *testing.T) {
db.String(): {
DestinationName: "db",
DestinationNamespace: structs.IntentionDefaultNamespace,
DestinationPartition: structs.IntentionDefaultNamespace,
},
}
require.Equal(t, expectUpstreams, snap.ConnectProxy.UpstreamConfig)
Expand Down
Loading