Skip to content

NETOBSERV-2227: plugin feature "multiNetworks", and promote NetworkName columns #1508

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

Merged
merged 3 commits into from
May 19, 2025
Merged

NETOBSERV-2227: plugin feature "multiNetworks", and promote NetworkName columns #1508

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7643db7
NETOBSERV-2227: plugin feature "multiNetworks", and promote NetworkNa…
jotak May 13, 2025
8d721ab
Fix issues related to pkt drop filters config
jotak May 14, 2025
8dca874
Add udn read role for FLP
jotak May 14, 2025
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
10 changes: 6 additions & 4 deletions controllers/consoleplugin/config/static-frontend-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,8 +175,9 @@ columns:
tooltip: Network name, such as Secondary network or UDN.
field: SrcK8S_NetworkName
filter: src_network
default: false
default: true
width: 15
feature: multiNetworks
- id: DstK8S_Name
group: Destination
name: Name
Expand Down Expand Up @@ -315,8 +316,9 @@ columns:
tooltip: Network name, such as Secondary network or UDN.
field: DstK8S_NetworkName
filter: dst_network
default: false
default: true
width: 15
feature: multiNetworks
- id: K8S_Name
name: Names
calculated: '[SrcK8S_Name,DstK8S_Name]'
Expand Down Expand Up @@ -458,7 +460,7 @@ columns:
tooltip: The list of User Defined Networks.
field: Udns
filter: udns
default: true
default: false
width: 15
feature: udnMapping
- id: FlowDirInts
Expand Down Expand Up @@ -1094,7 +1096,7 @@ scopes:
labels:
- SrcK8S_NetworkName
- DstK8S_NetworkName
feature: udnMapping
feature: multiNetworks
filters:
- src_network
- dst_network
Expand Down
4 changes: 4 additions & 0 deletions controllers/consoleplugin/consoleplugin_objects.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,6 +455,10 @@ func (b *builder) setFrontendConfig(fconf *cfg.FrontendConfig) error {
fconf.Features = append(fconf.Features, "udnMapping")
}

if helper.IsUDNMappingEnabled(&b.desired.Agent.EBPF) || helper.HasSecondaryIndexes(&b.desired.Processor) {
fconf.Features = append(fconf.Features, "multiNetworks")
}

if helper.IsIPSecEnabled(&b.desired.Agent.EBPF) {
fconf.Features = append(fconf.Features, "ipsec")
}
Expand Down
4 changes: 4 additions & 0 deletions pkg/helper/flowcollector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,10 @@ func IsEBPFFlowFilterEnabled(spec *flowslatest.FlowCollectorEBPF) bool {
return spec.FlowFilter != nil && spec.FlowFilter.Enable != nil && *spec.FlowFilter.Enable
}

func HasSecondaryIndexes(spec *flowslatest.FlowCollectorFLP) bool {
return spec.Advanced != nil && len(spec.Advanced.SecondaryNetworks) > 0
}

func GetEBPFMetricsPort(spec *flowslatest.FlowCollectorEBPF) int32 {
port := int32(constants.EBPFMetricPort)
if spec.Metrics.Server.Port != nil {
Expand Down