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

Jump to bottom

[v1.14] iptables: Read CNI chaining mode from CNI config manager #31265

Merged
merged 1 commit into from
Mar 11, 2024
Merged

[v1.14] iptables: Read CNI chaining mode from CNI config manager #31265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion pkg/datapath/cells.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"log"
"path/filepath"

"github.com/cilium/cilium/daemon/cmd/cni"
"github.com/cilium/cilium/pkg/bpf"
"github.com/cilium/cilium/pkg/datapath/agentliveness"
"github.com/cilium/cilium/pkg/datapath/garp"
Expand Down Expand Up @@ -115,7 +116,7 @@ func newDatapath(params datapathParams) types.Datapath {
log.Fatalf("enabling IP forwarding via sysctl failed: %s", err)
}

iptablesManager.Init()
iptablesManager.Init(params.CniConfigManager)
return nil
}})

Expand All @@ -142,4 +143,6 @@ type datapathParams struct {
BpfMaps []bpf.BpfMap `group:"bpf-maps"`

NodeMap nodemap.Map

CniConfigManager cni.CNIConfigManager
}
8 changes: 5 additions & 3 deletions pkg/datapath/iptables/iptables.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import (
"github.com/mattn/go-shellwords"
"github.com/sirupsen/logrus"

"github.com/cilium/cilium/daemon/cmd/cni"
"github.com/cilium/cilium/pkg/backoff"
"github.com/cilium/cilium/pkg/byteorder"
"github.com/cilium/cilium/pkg/command/exec"
Expand Down Expand Up @@ -280,12 +281,13 @@ type IptablesManager struct {
haveSocketMatch bool
haveBPFSocketAssign bool
ipEarlyDemuxDisabled bool
CNIChainingMode string
cniConfigManager cni.CNIConfigManager
}

// Init initializes the iptables manager and checks for iptables kernel modules
// availability.
func (m *IptablesManager) Init() {
func (m *IptablesManager) Init(cniConfigManager cni.CNIConfigManager) {
m.cniConfigManager = cniConfigManager
modulesManager := &modules.ModulesManager{}
haveIp6tables := true
if err := modulesManager.Init(); err != nil {
Expand Down Expand Up @@ -1065,7 +1067,7 @@ func (m *IptablesManager) getDeliveryInterface(ifName string) string {
switch {
case option.Config.EnableEndpointRoutes:
// aws-cni creates container interfaces with names like eni621c0fc8425.
if m.CNIChainingMode == "aws-cni" {
if m.cniConfigManager.GetChainingMode() == "aws-cni" {
return "eni+"
}
return "lxc+"
Expand Down