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

Fix the auto iptables detection if ip_tables.ko preloaded on RHEL/CentOS 8 #7111

Merged
merged 1 commit into from
Mar 8, 2023
+114 −34
Merged

Fix the auto iptables detection if ip_tables.ko preloaded on RHEL/CentOS 8 #7111

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
60 changes: 41 additions & 19 deletions felix/environment/feature_detect.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,34 +281,56 @@ func countRulesInIptableOutput(in []byte) int {
return count
}

// hasKubernetesChains tries to find in the output of the binary if the Kubernetes
// chains exists
func hasKubernetesChains(output []byte) bool {
return strings.Contains(string(output), "KUBE-IPTABLES-HINT") || strings.Contains(string(output), "KUBE-KUBELET-CANARY")
}

// GetIptablesBackend attempts to detect the iptables backend being used where Felix is running.
// This code is duplicating the detection method found at
// https://github.com/kubernetes/kubernetes/blob/623b6978866b5d3790d17ff13601ef9e7e4f4bf0/build/debian-iptables/iptables-wrapper#L28
// https://github.com/kubernetes-sigs/iptables-wrappers/blob/master/iptables-wrapper-installer.sh#L107
// If there is a specifiedBackend then it is used but if it does not match the detected
// backend then a warning is logged.
func DetectBackend(lookPath func(file string) (string, error), newCmd cmdshim.CmdFactory, specifiedBackend string) string {
ip6LgcySave := FindBestBinary(lookPath, 6, "legacy", "save")
ip4LgcySave := FindBestBinary(lookPath, 4, "legacy", "save")
ip6l, _ := newCmd(ip6LgcySave).Output()
ip4l, _ := newCmd(ip4LgcySave).Output()
log.WithField("ip6l", string(ip6l)).Debug("Ip6tables legacy save out")
log.WithField("ip4l", string(ip4l)).Debug("Iptables legacy save out")
legacyLines := countRulesInIptableOutput(ip6l) + countRulesInIptableOutput(ip4l)
ip6NftSave := FindBestBinary(lookPath, 6, "nft", "save")
ip4NftSave := FindBestBinary(lookPath, 4, "nft", "save")

ip6nm, _ := newCmd(ip6NftSave, "-t", "mangle").Output()
log.WithField("ip6n", string(ip6nm)).Debug("Ip6tables save out")
ip4nm, _ := newCmd(ip4NftSave, "-t", "mangle").Output()
log.WithField("ip4n", string(ip4nm)).Debug("Iptables save out")

var detectedBackend string
if legacyLines >= 10 {
detectedBackend = "legacy"
if hasKubernetesChains(ip6nm) || hasKubernetesChains(ip4nm) {
detectedBackend = "nft"
} else {
ip6NftSave := FindBestBinary(lookPath, 6, "nft", "save")
ip4NftSave := FindBestBinary(lookPath, 4, "nft", "save")
ip6n, _ := newCmd(ip6NftSave).Output()
log.WithField("ip6n", string(ip6n)).Debug("Ip6tables save out")
ip4n, _ := newCmd(ip4NftSave).Output()
log.WithField("ip4n", string(ip4n)).Debug("Iptables save out")
nftLines := countRulesInIptableOutput(ip6n) + countRulesInIptableOutput(ip4n)
if legacyLines >= nftLines {
ip6LgcySave := FindBestBinary(lookPath, 6, "legacy", "save")
ip4LgcySave := FindBestBinary(lookPath, 4, "legacy", "save")
ip6lm, _ := newCmd(ip6LgcySave, "-t", "mangle").Output()
log.WithField("ip6l", string(ip6lm)).Debug("Ip6tables legacy save -t mangle out")
ip4lm, _ := newCmd(ip4LgcySave, "-t", "mangle").Output()
log.WithField("ip4l", string(ip4lm)).Debug("Iptables legacy save -t mangle out")

if hasKubernetesChains(ip6lm) || hasKubernetesChains(ip4lm) {
detectedBackend = "legacy"
} else {
detectedBackend = "nft"
ip6l, _ := newCmd(ip6LgcySave).Output()
log.WithField("ip6l", string(ip6l)).Debug("Ip6tables legacy save out")
ip4l, _ := newCmd(ip4LgcySave).Output()
log.WithField("ip4l", string(ip4l)).Debug("Iptables legacy save out")
legacyLines := countRulesInIptableOutput(ip6l) + countRulesInIptableOutput(ip4l)

ip6n, _ := newCmd(ip6NftSave).Output()
log.WithField("ip6n", string(ip6n)).Debug("Ip6tables save out")
ip4n, _ := newCmd(ip4NftSave).Output()
log.WithField("ip4n", string(ip4n)).Debug("Iptables save out")
nftLines := countRulesInIptableOutput(ip6n) + countRulesInIptableOutput(ip4n)
if legacyLines >= nftLines {
detectedBackend = "legacy" // default to legacy mode
} else {
detectedBackend = "nft"
}
}
}
log.WithField("detectedBackend", detectedBackend).Debug("Detected Iptables backend")
Expand Down
88 changes: 73 additions & 15 deletions felix/environment/feature_detect_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,43 +241,43 @@ func TestIptablesBackendDetection(t *testing.T) {
{
"No output from cmds",
"auto",
ipOutputFactory{0, 0, 0, 0},
ipOutputFactory{0, 0, 0, 0, 0, 0, 0, 0},
"legacy",
},
{
"Output from legacy cmds",
"auto",
ipOutputFactory{10, 10, 0, 0},
ipOutputFactory{10, 10, 0, 0, 0, 0, 0, 0},
"legacy",
},
{
"Output from nft cmds",
"auto",
ipOutputFactory{0, 0, 10, 10},
ipOutputFactory{0, 0, 10, 10, 0, 0, 0, 0},
"nft",
},
{
"Detected and Specified backend of nft match",
"nft",
ipOutputFactory{0, 0, 10, 10},
ipOutputFactory{0, 0, 10, 10, 0, 0, 0, 0},
"nft",
},
{
"Detected and Specified backend of legacy match",
"legacy",
ipOutputFactory{10, 10, 0, 0},
ipOutputFactory{10, 10, 0, 0, 0, 0, 0, 0},
"legacy",
},
{
"Backend detected as nft does not match Specified legacy",
"legacy",
ipOutputFactory{0, 0, 10, 10},
ipOutputFactory{0, 0, 10, 10, 0, 0, 0, 0},
"legacy",
},
{
"Backend detected as legacy does not match Specified nft",
"nft",
ipOutputFactory{10, 10, 0, 0},
ipOutputFactory{10, 10, 0, 0, 0, 0, 0, 0},
"nft",
},
{
Expand All @@ -300,7 +300,7 @@ func TestIptablesBackendDetection(t *testing.T) {
Ip6Nft: 10,
Ip4Nft: 10,
},
"legacy",
"nft",
},
{
"Only ipv6 output from legacy cmds",
Expand All @@ -311,7 +311,7 @@ func TestIptablesBackendDetection(t *testing.T) {
Ip6Nft: 10,
Ip4Nft: 10,
},
"legacy",
"nft",
},
{
"Only ipv6 output from nft cmds still detects nft",
Expand All @@ -324,6 +324,50 @@ func TestIptablesBackendDetection(t *testing.T) {
},
"nft",
},
{
"Output from nft with kube chains",
"auto",
ipOutputFactory{
Ip6legacy: 0,
Ip4legacy: 0,
Ip6Nft: 64,
Ip4Nft: 123,
Ip6legacyKube: 0,
Ip4legacyKube: 0,
Ip6NftKube: 2,
Ip4NftKube: 2,
},
"nft",
},
{
"Output from nft with kube chains and has legacy chains",
"auto",
ipOutputFactory{
Ip6legacy: 20,
Ip4legacy: 20,
Ip6Nft: 2,
Ip4Nft: 2,
Ip6legacyKube: 0,
Ip4legacyKube: 0,
Ip6NftKube: 2,
Ip4NftKube: 2,
},
"nft",
}, {
"Output from legacy with kube chains and has nft chains",
"auto",
ipOutputFactory{
Ip6legacy: 20,
Ip4legacy: 20,
Ip6Nft: 30,
Ip4Nft: 30,
Ip6legacyKube: 2,
Ip4legacyKube: 2,
Ip6NftKube: 0,
Ip4NftKube: 0,
},
"legacy",
},
} {
tst := tst
t.Run("DetectingBackend, testing "+tst.name, func(t *testing.T) {
Expand All @@ -340,24 +384,30 @@ type ipOutputFactory struct {
Ip4legacy int
Ip6Nft int
Ip4Nft int

Ip6legacyKube int
Ip4legacyKube int
Ip6NftKube int
Ip4NftKube int
}

func (f *ipOutputFactory) NewCmd(name string, arg ...string) cmdshim.CmdIface {
switch name {
case "iptables-legacy-save":
return &ipOutputCmd{out: f.Ip4legacy}
return &ipOutputCmd{out: f.Ip4legacy, outKube: f.Ip4legacyKube}
case "ip6tables-legacy-save":
return &ipOutputCmd{out: f.Ip6legacy}
return &ipOutputCmd{out: f.Ip6legacy, outKube: f.Ip6legacyKube}
case "iptables-nft-save":
return &ipOutputCmd{out: f.Ip4Nft}
return &ipOutputCmd{out: f.Ip4Nft, outKube: f.Ip4NftKube}
case "ip6tables-nft-save":
return &ipOutputCmd{out: f.Ip6Nft}
return &ipOutputCmd{out: f.Ip6Nft, outKube: f.Ip6NftKube}
}
return nil
}

type ipOutputCmd struct {
out int
out int
outKube int
}

func (d *ipOutputCmd) String() string {
Expand Down Expand Up @@ -392,10 +442,18 @@ func (d *ipOutputCmd) Output() ([]byte, error) {
if d.out < 0 {
return nil, errors.New("iptables command failed")
}
if d.outKube > d.out {
return nil, errors.New("iptables command failed")
}

out := []byte{}
for i := 0; i < d.out; i++ {
for i := 0; i < d.outKube; i++ {
out = append(out, []byte(fmt.Sprintf("KUBE-IPTABLES-HINT - [0:0] %d\n", i))...)
}
for i := 0; i < d.out-d.outKube; i++ {
out = append(out, []byte(fmt.Sprintf("-Output line %d\n", i))...)
}

return out, nil
}

Expand Down