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

Always check for random-fully support #6629

Merged
merged 1 commit into from
Aug 26, 2024
Merged

Always check for random-fully support #6629

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 20 additions & 12 deletions pkg/agent/route/route_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,14 +105,15 @@ var (

// Client takes care of routing container packets in host network, coordinating ip route, ip rule, iptables and ipset.
type Client struct {
nodeConfig *config.NodeConfig
networkConfig *config.NetworkConfig
noSNAT bool
nodeSNATRandomFully bool
egressSNATRandomFully bool
iptables iptables.Interface
ipset ipset.Interface
netlink utilnetlink.Interface
nodeConfig *config.NodeConfig
networkConfig *config.NetworkConfig
noSNAT bool
nodeSNATRandomFully bool
egressSNATRandomFully bool
iptablesHasRandomFully bool
iptables iptables.Interface
ipset ipset.Interface
netlink utilnetlink.Interface
// nodeRoutes caches ip routes to remote Pods. It's a map of podCIDR to routes.
nodeRoutes sync.Map
// nodeNeighbors caches IPv6 Neighbors to remote host gateway
Expand Down Expand Up @@ -211,7 +212,8 @@ func (c *Client) Initialize(nodeConfig *config.NodeConfig, done func()) error {
if err != nil {
return fmt.Errorf("error creating IPTables instance: %v", err)
}
if (c.nodeSNATRandomFully || c.egressSNATRandomFully) && !c.iptables.HasRandomFully() {
c.iptablesHasRandomFully = c.iptables.HasRandomFully()
if (c.nodeSNATRandomFully || c.egressSNATRandomFully) && !c.iptablesHasRandomFully {
return fmt.Errorf("iptables does not support --random-fully for SNAT / MASQUERADE rules")
}

Expand Down Expand Up @@ -1009,14 +1011,18 @@ func (c *Client) restoreIptablesData(podCIDR *net.IPNet,
// that ARP requests may advertise a different source IP address, in which case they will be
// dropped by the SpoofGuard table in the OVS pipeline. See description for the arp_announce
// sysctl parameter.
writeLine(iptablesData, []string{
rule := []string{
"-A", antreaPostRoutingChain,
"-m", "comment", "--comment", `"Antrea: masquerade LOCAL traffic"`,
"-o", c.nodeConfig.GatewayConfig.Name,
"-m", "addrtype", "!", "--src-type", "LOCAL", "--limit-iface-out",
"-m", "addrtype", "--src-type", "LOCAL",
"-j", iptables.MasqueradeTarget, "--random-fully",
}...)
"-j", iptables.MasqueradeTarget,
}
if c.iptablesHasRandomFully {
rule = append(rule, "--random-fully")
}
writeLine(iptablesData, rule...)

// If AntreaProxy full support is enabled, it SNATs the packets whose source IP is VirtualServiceIPv4/VirtualServiceIPv6
// so the packets can be routed back to this Node.
Expand Down Expand Up @@ -1048,6 +1054,8 @@ func (c *Client) restoreIptablesData(podCIDR *net.IPNet,
// 01. AntreaIPAM VLAN Pod -- hostPort [request] --> AntreaIPAM VLAN Pod (same subnet)
// 02. Regular Pod (local) -- hostPort [request] --> AntreaIPAM VLAN Pod
if c.connectUplinkToBridge {
// We do not use --random-fully for this rule for consistency with the portmap CNI plugin.
// https://github.com/containernetworking/plugins/blob/c29dc79f96cd50452a247a4591443d2aac033429/plugins/meta/portmap/portmap.go#L321-L345
writeLine(iptablesData, []string{
"-A", antreaPostRoutingChain,
"-m", "comment", "--comment", `"Antrea: masquerade traffic to local AntreaIPAM hostPort Pod"`,
Expand Down
1 change: 1 addition & 0 deletions pkg/agent/route/route_linux_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -642,6 +642,7 @@ COMMIT
connectUplinkToBridge: tt.connectUplinkToBridge,
nodeNetworkPolicyEnabled: tt.nodeNetworkPolicyEnabled,
nodeSNATRandomFully: tt.nodeSNATRandomFully,
iptablesHasRandomFully: true,
deterministic: true,
}
for mark, snatIP := range tt.markToSNATIP {
Expand Down